spec/merge_helpers_spec.rb in simplecov-0.11.2 vs spec/merge_helpers_spec.rb in simplecov-0.12.0

@@ -7,17 +7,19 @@
       @resultset1 = {
         source_fixture("sample.rb") => [nil, 1, 1, 1, nil, nil, 1, 1, nil, nil],
         source_fixture("app/models/user.rb") => [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil],
         source_fixture("app/controllers/sample_controller.rb") => [nil, 1, 1, 1, nil, nil, 1, 0, nil, nil],
         source_fixture("resultset1.rb") => [1, 1, 1, 1],
+        source_fixture("parallel_tests.rb") => [nil, 0, nil, 0],
       }.extend(SimpleCov::HashMergeHelper)
 
       @resultset2 = {
         source_fixture("sample.rb") => [1, nil, 1, 1, nil, nil, 1, 1, nil, nil],
         source_fixture("app/models/user.rb") => [nil, 1, 5, 1, nil, nil, 1, 0, nil, nil],
         source_fixture("app/controllers/sample_controller.rb") => [nil, 3, 1, nil, nil, nil, 1, 0, nil, nil],
         source_fixture("resultset2.rb") => [nil, 1, 1, nil],
+        source_fixture("parallel_tests.rb") => [nil, nil, 0, 0],
       }
     end
 
     context "a merge" do
       subject do
@@ -40,9 +42,13 @@
         expect(subject[source_fixture("resultset1.rb")]).to eq([1, 1, 1, 1])
       end
 
       it "has proper results for resultset2.rb" do
         expect(subject[source_fixture("resultset2.rb")]).to eq([nil, 1, 1, nil])
+      end
+
+      it "has proper results for parallel_tests.rb" do
+        expect(subject[source_fixture("parallel_tests.rb")]).to eq([nil, nil, nil, 0])
       end
     end
 
     # See Github issue #6
     it "returns an empty hash when the resultset cache file is empty" do