1 files changed, 62 insertions, 76 deletions
diff --git a/spec/ruby/library/coverage/result_spec.rb b/spec/ruby/library/coverage/result_spec.rb
index 33276778e8..2e7d598bb8 100644
--- a/spec/ruby/library/coverage/result_spec.rb
+++ b/spec/ruby/library/coverage/result_spec.rb
@@ -6,6 +6,7 @@ describe 'Coverage.result' do
     @class_file = fixture __FILE__, 'some_class.rb'
     @config_file = fixture __FILE__, 'start_coverage.rb'
     @eval_code_file = fixture __FILE__, 'eval_code.rb'
+    @with_begin_file = fixture __FILE__, 'code_with_begin.rb'
   end
 
   before :each do
@@ -16,6 +17,7 @@ describe 'Coverage.result' do
     $LOADED_FEATURES.delete(@class_file)
     $LOADED_FEATURES.delete(@config_file)
     $LOADED_FEATURES.delete(@eval_code_file)
+    $LOADED_FEATURES.delete(@with_begin_file)
 
     Coverage.result if Coverage.running?
   end
@@ -32,39 +34,37 @@ describe 'Coverage.result' do
     }
   end
 
-  ruby_version_is "3.2" do
-    it 'returns results for each mode separately when enabled :all modes' do
-      Coverage.start(:all)
-      require @class_file.chomp('.rb')
-      result = Coverage.result
+  it 'returns results for each mode separately when enabled :all modes' do
+    Coverage.start(:all)
+    require @class_file.chomp('.rb')
+    result = Coverage.result
+
+    result.should == {
+      @class_file => {
+        lines: [
+          nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
+        ],
+        branches: {},
+        methods: {
+          [SomeClass, :some_method, 6, 2, 11, 5] => 0
+        }
+      }
+    }
+  end
+
+  it 'returns results for each mode separately when enabled any mode explicitly' do
+    Coverage.start(lines: true)
+    require @class_file.chomp('.rb')
+    result = Coverage.result
 
-      result.should == {
-        @class_file => {
+    result.should == {
+      @class_file =>
+        {
           lines: [
             nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
-          ],
-          branches: {},
-          methods: {
-            [SomeClass, :some_method, 6, 2, 11, 5] => 0
-          }
+          ]
         }
-      }
-    end
-
-    it 'returns results for each mode separately when enabled any mode explicitly' do
-      Coverage.start(lines: true)
-      require @class_file.chomp('.rb')
-      result = Coverage.result
-
-      result.should == {
-        @class_file =>
-          {
-            lines: [
-              nil, nil, 1, nil, nil, 1, nil, nil, 0, nil, nil, nil, nil, nil, nil, nil
-            ]
-          }
-      }
-    end
+    }
   end
 
   it 'no requires/loads should give empty hash' do
@@ -80,7 +80,7 @@ describe 'Coverage.result' do
     Coverage.result
     -> {
       Coverage.result
-    }.should raise_error(RuntimeError, 'coverage measurement is not enabled')
+    }.should.raise(RuntimeError, 'coverage measurement is not enabled')
   end
 
   it 'second run should give same result' do
@@ -106,63 +106,37 @@ describe 'Coverage.result' do
     result.should == {}
   end
 
-  ruby_version_is ''...'3.1' do
-    it 'second Coverage.start does nothing' do
-      Coverage.start
-      require @config_file.chomp('.rb')
-      result = Coverage.result
-
-      result.should == { @config_file => [1, 1, 1] }
-    end
-  end
-
   it 'does not include the file starting coverage since it is not tracked' do
     require @config_file.chomp('.rb')
-    Coverage.result.should_not include(@config_file)
+    Coverage.result.should_not.include?(@config_file)
   end
 
-  ruby_version_is '3.1'...'3.2' do
-    it 'returns the correct results when eval is used' do
-      Coverage.start
-      require @eval_code_file.chomp('.rb')
-      result = Coverage.result
+  it 'returns the correct results when eval coverage is enabled' do
+    Coverage.supported?(:eval).should == true
 
-      result.should == {
-        @eval_code_file => [
-          1, nil, 1, nil, 1, nil, nil, nil, nil, nil, 1
-        ]
-      }
-    end
-  end
-
-  ruby_version_is '3.2' do
-    it 'returns the correct results when eval coverage is enabled' do
-      Coverage.supported?(:eval).should == true
-
-      Coverage.start(lines: true, eval: true)
-      require @eval_code_file.chomp('.rb')
-      result = Coverage.result
+    Coverage.start(lines: true, eval: true)
+    require @eval_code_file.chomp('.rb')
+    result = Coverage.result
 
-      result.should == {
-        @eval_code_file => {
-          lines: [1, nil, 1, nil, 1, 1, nil, nil, nil, nil, 1]
-        }
+    result.should == {
+      @eval_code_file => {
+        lines: [1, nil, 1, nil, 1, 1, nil, nil, nil, nil, 1]
       }
-    end
+    }
+  end
 
-    it 'returns the correct results when eval coverage is disabled' do
-      Coverage.supported?(:eval).should == true
+  it 'returns the correct results when eval coverage is disabled' do
+    Coverage.supported?(:eval).should == true
 
-      Coverage.start(lines: true, eval: false)
-      require @eval_code_file.chomp('.rb')
-      result = Coverage.result
+    Coverage.start(lines: true, eval: false)
+    require @eval_code_file.chomp('.rb')
+    result = Coverage.result
 
-      result.should == {
-        @eval_code_file => {
-          lines: [1, nil, 1, nil, 1, nil, nil, nil, nil, nil, 1]
-        }
+    result.should == {
+      @eval_code_file => {
+        lines: [1, nil, 1, nil, 1, nil, nil, nil, nil, nil, 1]
       }
-    end
+    }
   end
 
   it "disables coverage measurement when stop option is not specified" do
@@ -354,4 +328,16 @@ describe 'Coverage.result' do
 
     Coverage.peek_result.should == result
   end
+
+  it 'covers 100% lines with begin' do
+    Coverage.start
+    require @with_begin_file.chomp('.rb')
+    result = Coverage.result
+
+    result.should == {
+      @with_begin_file => [
+        nil, 1, nil
+      ]
+    }
+  end
 end