1 files changed, 29 insertions, 29 deletions

diff --git a/spec/ruby/core/integer/left_shift_spec.rb b/spec/ruby/core/integer/left_shift_spec.rb
index 135af90421..7eedb91228 100644
--- a/spec/ruby/core/integer/left_shift_spec.rb
+++ b/spec/ruby/core/integer/left_shift_spec.rb
@@ -58,13 +58,13 @@ describe "Integer#<< (with n << m)" do
 
     it "returns a Bignum == fixnum_max * 2 when fixnum_max << 1 and n > 0" do
       result = fixnum_max << 1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_max * 2
     end
 
     it "returns a Bignum == fixnum_min * 2 when fixnum_min << 1 and n < 0" do
       result = fixnum_min << 1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_min * 2
     end
 
@@ -82,15 +82,15 @@ describe "Integer#<< (with n << m)" do
       obj = mock("a string")
       obj.should_receive(:to_int).and_return("asdf")
 
-      -> { 3 << obj }.should raise_error(TypeError)
+      -> { 3 << obj }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed nil" do
-      -> { 3 << nil }.should raise_error(TypeError)
+      -> { 3 << nil }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed a String" do
-      -> { 3 << "4" }.should raise_error(TypeError)
+      -> { 3 << "4" }.should.raise(TypeError)
     end
   end
 
@@ -129,13 +129,13 @@ describe "Integer#<< (with n << m)" do
 
     it "returns a Fixnum == fixnum_max when (fixnum_max * 2) << -1 and n > 0" do
       result = (fixnum_max * 2) << -1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_max
     end
 
     it "returns a Fixnum == fixnum_min when (fixnum_min * 2) << -1 and n < 0" do
       result = (fixnum_min * 2) << -1
-      result.should be_an_instance_of(Integer)
+      result.should.instance_of?(Integer)
       result.should == fixnum_min
     end
 
@@ -150,15 +150,15 @@ describe "Integer#<< (with n << m)" do
       obj = mock("a string")
       obj.should_receive(:to_int).and_return("asdf")
 
-      -> { @bignum << obj }.should raise_error(TypeError)
+      -> { @bignum << obj }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed nil" do
-      -> { @bignum << nil }.should raise_error(TypeError)
+      -> { @bignum << nil }.should.raise(TypeError)
     end
 
     it "raises a TypeError when passed a String" do
-      -> { @bignum << "4" }.should raise_error(TypeError)
+      -> { @bignum << "4" }.should.raise(TypeError)
     end
   end
 
@@ -181,31 +181,31 @@ describe "Integer#<< (with n << m)" do
       (bignum_value << -(2**40)).should == 0
     end
 
-    ruby_bug "#18517", ""..."3.2" do
-      it "returns 0 when m > 0 long and n == 0" do
-        (0 << (2**40)).should == 0
-      end
+    it "returns 0 when m > 0 long and n == 0" do
+      (0 << (2**40)).should == 0
     end
 
     it "returns 0 when m > 0 bignum and n == 0" do
       (0 << bignum_value).should == 0
     end
 
-    ruby_bug "#18518", ""..."3.3" do
-      it "raises NoMemoryError when m > 0 and n != 0" do
-        coerce_long = mock("long")
-        coerce_long.stub!(:to_int).and_return(2**40)
-        coerce_bignum = mock("bignum")
-        coerce_bignum.stub!(:to_int).and_return(bignum_value)
-        exps = [2**40, bignum_value, coerce_long, coerce_bignum]
-
-        exps.each { |exp|
-          -> { (1 << exp) }.should raise_error(NoMemoryError)
-          -> { (-1 << exp) }.should raise_error(NoMemoryError)
-          -> { (bignum_value << exp) }.should raise_error(NoMemoryError)
-          -> { (-bignum_value << exp) }.should raise_error(NoMemoryError)
-        }
-      end
+    it "raises RangeError when m > 0 and n != 0" do
+      # https://bugs.ruby-lang.org/issues/18518#note-9
+      limit = RUBY_ENGINE == 'ruby' ? 2**67 : 2**32
+
+      coerce_long = mock("long")
+      coerce_long.stub!(:to_int).and_return(limit)
+      coerce_bignum = mock("bignum")
+      coerce_bignum.stub!(:to_int).and_return(bignum_value)
+      exps = [limit, coerce_long]
+      exps << bignum_value << coerce_bignum if bignum_value >= limit
+
+      exps.each { |exp|
+        -> { (1 << exp) }.should.raise(RangeError, 'shift width too big')
+        -> { (-1 << exp) }.should.raise(RangeError, 'shift width too big')
+        -> { (bignum_value << exp) }.should.raise(RangeError, 'shift width too big')
+        -> { (-bignum_value << exp) }.should.raise(RangeError, 'shift width too big')
+      }
     end
   end
 end