1 files changed, 13 insertions, 33 deletions
diff --git a/spec/ruby/core/integer/round_spec.rb b/spec/ruby/core/integer/round_spec.rb
index a45a7b5fb3..189384f11a 100644
--- a/spec/ruby/core/integer/round_spec.rb
+++ b/spec/ruby/core/integer/round_spec.rb
@@ -6,14 +6,6 @@ describe "Integer#round" do
   it_behaves_like :integer_to_i, :round
   it_behaves_like :integer_rounding_positive_precision, :round
 
-  ruby_version_is ""..."2.5" do # Not just since 2.4
-    it "rounds itself as a float if passed a positive precision" do
-      [2, -4, 10**70, -10**100].each do |v|
-        v.round(42).should eql(v.to_f)
-      end
-    end
-  end
-
   # redmine:5228
   it "returns itself rounded if passed a negative value" do
     +249.round(-2).should eql(+200)
@@ -29,26 +21,24 @@ describe "Integer#round" do
     (-25 * 10**70).round(-71).should eql(-30 * 10**70)
   end
 
-  platform_is_not wordsize: 32 do
-    it "raises a RangeError when passed a big negative value" do
-      lambda { 42.round(fixnum_min) }.should raise_error(RangeError)
-    end
+  it "raises a RangeError when passed a big negative value" do
+    -> { 42.round(min_long - 1) }.should raise_error(RangeError)
   end
 
   it "raises a RangeError when passed Float::INFINITY" do
-    lambda { 42.round(Float::INFINITY) }.should raise_error(RangeError)
+    -> { 42.round(Float::INFINITY) }.should raise_error(RangeError)
   end
 
   it "raises a RangeError when passed a beyond signed int" do
-    lambda { 42.round(1<<31) }.should raise_error(RangeError)
+    -> { 42.round(1<<31) }.should raise_error(RangeError)
   end
 
   it "raises a TypeError when passed a String" do
-    lambda { 42.round("4") }.should raise_error(TypeError)
+    -> { 42.round("4") }.should raise_error(TypeError)
   end
 
   it "raises a TypeError when its argument cannot be converted to an Integer" do
-    lambda { 42.round(nil) }.should raise_error(TypeError)
+    -> { 42.round(nil) }.should raise_error(TypeError)
   end
 
   it "calls #to_int on the argument to convert it to an Integer" do
@@ -60,7 +50,7 @@ describe "Integer#round" do
   it "raises a TypeError when #to_int does not return an Integer" do
     obj = mock("Object")
     obj.stub!(:to_int).and_return([])
-    lambda { 42.round(obj) }.should raise_error(TypeError)
+    -> { 42.round(obj) }.should raise_error(TypeError)
   end
 
   it "returns different rounded values depending on the half option" do
@@ -78,24 +68,14 @@ describe "Integer#round" do
     (-25).round(-1, half: nil).should   eql(-30)
   end
 
-  ruby_version_is "2.4"..."2.5" do
-    it "returns itself as a float if passed a positive precision and the half option" do
-      35.round(1, half: :up).should      eql(35.0)
-      35.round(1, half: :down).should    eql(35.0)
-      35.round(1, half: :even).should    eql(35.0)
-    end
-  end
-
-  ruby_version_is "2.5" do
-    it "returns itself if passed a positive precision and the half option" do
-      35.round(1, half: :up).should      eql(35)
-      35.round(1, half: :down).should    eql(35)
-      35.round(1, half: :even).should    eql(35)
-    end
+  it "returns itself if passed a positive precision and the half option" do
+    35.round(1, half: :up).should      eql(35)
+    35.round(1, half: :down).should    eql(35)
+    35.round(1, half: :even).should    eql(35)
   end
 
   it "raises ArgumentError for an unknown rounding mode" do
-    lambda { 42.round(-1, half: :foo) }.should raise_error(ArgumentError, /invalid rounding mode: foo/)
-    lambda { 42.round(1, half: :foo) }.should raise_error(ArgumentError, /invalid rounding mode: foo/)
+    -> { 42.round(-1, half: :foo) }.should raise_error(ArgumentError, /invalid rounding mode: foo/)
+    -> { 42.round(1, half: :foo) }.should raise_error(ArgumentError, /invalid rounding mode: foo/)
   end
 end