1 files changed, 28 insertions, 42 deletions

diff --git a/spec/ruby/core/integer/coerce_spec.rb b/spec/ruby/core/integer/coerce_spec.rb
index 1bc30fe9ce..c0e642da03 100644
--- a/spec/ruby/core/integer/coerce_spec.rb
+++ b/spec/ruby/core/integer/coerce_spec.rb
@@ -5,13 +5,13 @@ describe "Integer#coerce" do
     describe "when given a Fixnum" do
       it "returns an array containing two Fixnums" do
         1.coerce(2).should == [2, 1]
-        1.coerce(2).map { |i| i.class }.should == [Fixnum, Fixnum]
+        1.coerce(2).map { |i| i.class }.should == [Integer, Integer]
       end
     end
 
     describe "when given a String" do
       it "raises an ArgumentError when trying to coerce with a non-number String" do
-        lambda { 1.coerce(":)") }.should raise_error(ArgumentError)
+        -> { 1.coerce(":)") }.should.raise(ArgumentError)
       end
 
       it "returns  an array containing two Floats" do
@@ -21,7 +21,7 @@ describe "Integer#coerce" do
     end
 
     it "raises a TypeError when trying to coerce with nil" do
-      lambda { 1.coerce(nil) }.should raise_error(TypeError)
+      -> { 1.coerce(nil) }.should.raise(TypeError)
     end
 
     it "tries to convert the given Object into a Float by using #to_f" do
@@ -29,13 +29,13 @@ describe "Integer#coerce" do
       2.coerce(obj).should == [1.0, 2.0]
 
       (obj = mock('0')).should_receive(:to_f).and_return('0')
-      lambda { 2.coerce(obj).should == [1.0, 2.0] }.should raise_error(TypeError)
+      -> { 2.coerce(obj).should == [1.0, 2.0] }.should.raise(TypeError)
     end
 
     it "raises a TypeError when given an Object that does not respond to #to_f" do
-      lambda { 1.coerce(mock('x'))  }.should raise_error(TypeError)
-      lambda { 1.coerce(1..4)       }.should raise_error(TypeError)
-      lambda { 1.coerce(:test)      }.should raise_error(TypeError)
+      -> { 1.coerce(mock('x'))  }.should.raise(TypeError)
+      -> { 1.coerce(1..4)       }.should.raise(TypeError)
+      -> { 1.coerce(:test)      }.should.raise(TypeError)
     end
   end
 
@@ -44,8 +44,8 @@ describe "Integer#coerce" do
       a = bignum_value
       ary = a.coerce(2)
 
-      ary[0].should be_kind_of(Bignum)
-      ary[1].should be_kind_of(Bignum)
+      ary[0].should.is_a?(Integer)
+      ary[1].should.is_a?(Integer)
       ary.should == [2, a]
     end
 
@@ -54,52 +54,38 @@ describe "Integer#coerce" do
       b = bignum_value
       ary = a.coerce(b)
 
-      ary[0].should be_kind_of(Bignum)
-      ary[1].should be_kind_of(Bignum)
+      ary[0].should.is_a?(Integer)
+      ary[1].should.is_a?(Integer)
       ary.should == [b, a]
     end
 
     it "raises a TypeError when not passed a Fixnum or Bignum" do
       a = bignum_value
 
-      lambda { a.coerce(nil)         }.should raise_error(TypeError)
-      lambda { a.coerce(mock('str')) }.should raise_error(TypeError)
-      lambda { a.coerce(1..4)        }.should raise_error(TypeError)
-      lambda { a.coerce(:test)       }.should raise_error(TypeError)
+      -> { a.coerce(nil)         }.should.raise(TypeError)
+      -> { a.coerce(mock('str')) }.should.raise(TypeError)
+      -> { a.coerce(1..4)        }.should.raise(TypeError)
+      -> { a.coerce(:test)       }.should.raise(TypeError)
     end
 
-    ruby_version_is ""..."2.4" do
-      it "raises a TypeError when passed a String" do
-        a = bignum_value
-        lambda { a.coerce("123") }.should raise_error(TypeError)
-      end
-
-      it "raises a TypeError when passed a Float" do
-        a = bignum_value
-        lambda { a.coerce(12.3) }.should raise_error(TypeError)
-      end
+    it "coerces both values to Floats and returns [other, self] when passed a Float" do
+      a = bignum_value
+      a.coerce(1.2).should == [1.2, a.to_f]
     end
 
-    ruby_version_is "2.4" do
-      it "coerces both values to Floats and returns [other, self] when passed a Float" do
-        a = bignum_value
-        a.coerce(1.2).should == [1.2, a.to_f]
-      end
-
-      it "coerces both values to Floats and returns [other, self] when passed a String" do
-        a = bignum_value
-        a.coerce("123").should == [123.0, a.to_f]
-      end
+    it "coerces both values to Floats and returns [other, self] when passed a String" do
+      a = bignum_value
+      a.coerce("123").should == [123.0, a.to_f]
+    end
 
-      it "calls #to_f to coerce other to a Float" do
-        b = mock("bignum value")
-        b.should_receive(:to_f).and_return(1.2)
+    it "calls #to_f to coerce other to a Float" do
+      b = mock("bignum value")
+      b.should_receive(:to_f).and_return(1.2)
 
-        a = bignum_value
-        ary = a.coerce(b)
+      a = bignum_value
+      ary = a.coerce(b)
 
-        ary.should == [1.2, a.to_f]
-      end
+      ary.should == [1.2, a.to_f]
     end
   end
 end