1 files changed, 37 insertions, 41 deletions
diff --git a/spec/ruby/core/integer/to_s_spec.rb b/spec/ruby/core/integer/to_s_spec.rb
index c980be535a..4970a2a12f 100644
--- a/spec/ruby/core/integer/to_s_spec.rb
+++ b/spec/ruby/core/integer/to_s_spec.rb
@@ -13,10 +13,10 @@ describe "Integer#to_s" do
       end
 
       it "raises an ArgumentError if the base is less than 2 or higher than 36" do
-        lambda { 123.to_s(-1) }.should raise_error(ArgumentError)
-        lambda { 123.to_s(0)  }.should raise_error(ArgumentError)
-        lambda { 123.to_s(1)  }.should raise_error(ArgumentError)
-        lambda { 123.to_s(37) }.should raise_error(ArgumentError)
+        -> { 123.to_s(-1) }.should.raise(ArgumentError)
+        -> { 123.to_s(0)  }.should.raise(ArgumentError)
+        -> { 123.to_s(1)  }.should.raise(ArgumentError)
+        -> { 123.to_s(37) }.should.raise(ArgumentError)
       end
     end
 
@@ -29,24 +29,22 @@ describe "Integer#to_s" do
       end
     end
 
-    with_feature :encoding do
-      before :each do
-        @internal = Encoding.default_internal
-      end
+    before :each do
+      @internal = Encoding.default_internal
+    end
 
-      after :each do
-        Encoding.default_internal = @internal
-      end
+    after :each do
+      Encoding.default_internal = @internal
+    end
 
-      it "returns a String in US-ASCII encoding when Encoding.default_internal is nil" do
-        Encoding.default_internal = nil
-        1.to_s.encoding.should equal(Encoding::US_ASCII)
-      end
+    it "returns a String in US-ASCII encoding when Encoding.default_internal is nil" do
+      Encoding.default_internal = nil
+      1.to_s.encoding.should.equal?(Encoding::US_ASCII)
+    end
 
-      it "returns a String in US-ASCII encoding when Encoding.default_internal is not nil" do
-        Encoding.default_internal = Encoding::IBM437
-        1.to_s.encoding.should equal(Encoding::US_ASCII)
-      end
+    it "returns a String in US-ASCII encoding when Encoding.default_internal is not nil" do
+      Encoding.default_internal = Encoding::IBM437
+      1.to_s.encoding.should.equal?(Encoding::US_ASCII)
     end
   end
 
@@ -61,39 +59,37 @@ describe "Integer#to_s" do
       end
 
       it "raises an ArgumentError if the base is less than 2 or higher than 36" do
-        lambda { 123.to_s(-1) }.should raise_error(ArgumentError)
-        lambda { 123.to_s(0) }.should raise_error(ArgumentError)
-        lambda { 123.to_s(1) }.should raise_error(ArgumentError)
-        lambda { 123.to_s(37) }.should raise_error(ArgumentError)
+        -> { 123.to_s(-1) }.should.raise(ArgumentError)
+        -> { 123.to_s(0) }.should.raise(ArgumentError)
+        -> { 123.to_s(1) }.should.raise(ArgumentError)
+        -> { 123.to_s(37) }.should.raise(ArgumentError)
       end
     end
 
     describe "when given no base" do
       it "returns self converted to a String using base 10" do
-        bignum_value(9).to_s.should == "9223372036854775817"
-        bignum_value.to_s.should == "9223372036854775808"
-        (-bignum_value(675)).to_s.should == "-9223372036854776483"
+        bignum_value(9).to_s.should == "18446744073709551625"
+        bignum_value.to_s.should == "18446744073709551616"
+        (-bignum_value(675)).to_s.should == "-18446744073709552291"
       end
     end
 
-    with_feature :encoding do
-      before :each do
-        @internal = Encoding.default_internal
-      end
+    before :each do
+      @internal = Encoding.default_internal
+    end
 
-      after :each do
-        Encoding.default_internal = @internal
-      end
+    after :each do
+      Encoding.default_internal = @internal
+    end
 
-      it "returns a String in US-ASCII encoding when Encoding.default_internal is nil" do
-        Encoding.default_internal = nil
-        bignum_value.to_s.encoding.should equal(Encoding::US_ASCII)
-      end
+    it "returns a String in US-ASCII encoding when Encoding.default_internal is nil" do
+      Encoding.default_internal = nil
+      bignum_value.to_s.encoding.should.equal?(Encoding::US_ASCII)
+    end
 
-      it "returns a String in US-ASCII encoding when Encoding.default_internal is not nil" do
-        Encoding.default_internal = Encoding::IBM437
-        bignum_value.to_s.encoding.should equal(Encoding::US_ASCII)
-      end
+    it "returns a String in US-ASCII encoding when Encoding.default_internal is not nil" do
+      Encoding.default_internal = Encoding::IBM437
+      bignum_value.to_s.encoding.should.equal?(Encoding::US_ASCII)
     end
   end
 end