Don't combine branches if branch coverage not enabled

simplecov-ruby · Jan 14, 2020 · 93c771d · 93c771d
1 parent 9c60411
commit 93c771d
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/lib/simplecov/combine/files_combiner.rb b/lib/simplecov/combine/files_combiner.rb
@@ -15,10 +15,9 @@ module FilesCombiner
       # @return [Hash]
       #
       def combine(coverage_a, coverage_b)
-        {
-          lines: Combine.combine(LinesCombiner, coverage_a[:lines], coverage_b[:lines]),
-          branches: Combine.combine(BranchesCombiner, coverage_a[:branches], coverage_b[:branches])
-        }
+        combination = {lines: Combine.combine(LinesCombiner, coverage_a[:lines], coverage_b[:lines])}
+        combination[:branches] = Combine.combine(BranchesCombiner, coverage_a[:branches], coverage_b[:branches]) if SimpleCov.branch_coverage?
+        combination
       end
     end
   end