Ensure branches Hash is present when supported

simplecov-ruby · Jan 13, 2025 · 99ef976 · 99ef976
1 parent f167f76
commit 99ef976
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/simplecov/combine/files_combiner.rb b/lib/simplecov/combine/files_combiner.rb
@@ -16,7 +16,7 @@ module FilesCombiner
       #
       def combine(coverage_a, coverage_b)
         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["branches"] = Combine.combine(BranchesCombiner, coverage_a["branches"], coverage_b["branches"]) || {} if SimpleCov.branch_coverage?
         combination
       end
     end

diff --git a/spec/combine/results_combiner_spec.rb b/spec/combine/results_combiner_spec.rb
@@ -101,6 +101,10 @@
       it "has proper results for three.rb" do
         expect(subject[source_fixture("three.rb")]["lines"]).to eq([nil, 3, 7])
       end
+
+      it "always returns a Hash object for branches" do
+        expect(subject[source_fixture("three.rb")]["branches"]).to eq({}) if SimpleCov.branch_coverage_supported?
+      end
     end
   end