1 files changed, 32 insertions, 11 deletions
diff --git a/spec/ruby/core/range/step_spec.rb b/spec/ruby/core/range/step_spec.rb
index d83868a0fb..e284551ab3 100644
--- a/spec/ruby/core/range/step_spec.rb
+++ b/spec/ruby/core/range/step_spec.rb
@@ -297,7 +297,7 @@ describe "Range#step" do
 
         it "yields Float values incremented by a Float step" do
           eval("(-2..)").step(1.5) { |x| break if x > 1.0; ScratchPad << x }
-          ScratchPad.recorded.should eql([-2.0, -0.5, 1.0])\
+          ScratchPad.recorded.should eql([-2.0, -0.5, 1.0])
 
           ScratchPad.record []
           eval("(-2..)").step(1.5) { |x| break if x > 1.0; ScratchPad << x }
@@ -371,20 +371,41 @@ describe "Range#step" do
   end
 
   describe "when no block is given" do
+    ruby_version_is "3.0" do
+      it "raises an ArgumentError if step is 0" do
+        -> { (-1..1).step(0) }.should raise_error(ArgumentError)
+      end
+    end
+
     describe "returned Enumerator" do
       describe "size" do
-        it "raises a TypeError if step does not respond to #to_int" do
-          obj = mock("Range#step non-integer")
-          enum = (1..2).step(obj)
-          -> { enum.size }.should raise_error(TypeError)
+        ruby_version_is ""..."3.0" do
+          it "raises a TypeError if step does not respond to #to_int" do
+            obj = mock("Range#step non-integer")
+            enum = (1..2).step(obj)
+            -> { enum.size }.should raise_error(TypeError)
+          end
+
+          it "raises a TypeError if #to_int does not return an Integer" do
+            obj = mock("Range#step non-integer")
+            obj.should_receive(:to_int).and_return("1")
+            enum = (1..2).step(obj)
+
+            -> { enum.size }.should raise_error(TypeError)
+          end
         end
 
-        it "raises a TypeError if #to_int does not return an Integer" do
-          obj = mock("Range#step non-integer")
-          obj.should_receive(:to_int).and_return("1")
-          enum = (1..2).step(obj)
+        ruby_version_is "3.0" do
+          it "raises a TypeError if step does not respond to #to_int" do
+            obj = mock("Range#step non-integer")
+            -> { (1..2).step(obj) }.should raise_error(TypeError)
+          end
 
-          -> { enum.size }.should raise_error(TypeError)
+          it "raises a TypeError if #to_int does not return an Integer" do
+            obj = mock("Range#step non-integer")
+            obj.should_receive(:to_int).and_return("1")
+            -> { (1..2).step(obj) }.should raise_error(TypeError)
+          end
         end
 
         ruby_version_is ""..."2.6" do
@@ -404,7 +425,7 @@ describe "Range#step" do
           end
         end
 
-        ruby_version_is "2.6" do
+        ruby_version_is "2.6"..."3.0" do
           it "returns Float::INFINITY for zero step" do
             (-1..1).step(0).size.should == Float::INFINITY
             (-1..1).step(0.0).size.should == Float::INFINITY