1 files changed, 33 insertions, 53 deletions
diff --git a/spec/ruby/core/integer/round_spec.rb b/spec/ruby/core/integer/round_spec.rb
index feb6d475d3..a3f11e7a76 100644
--- a/spec/ruby/core/integer/round_spec.rb
+++ b/spec/ruby/core/integer/round_spec.rb
@@ -6,49 +6,39 @@ 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)
-    -249.round(-2).should eql(-200)
-    (+25 * 10**70 - 1).round(-71).should eql(+20 * 10**70)
-    (-25 * 10**70 + 1).round(-71).should eql(-20 * 10**70)
+    +249.round(-2).should.eql?(+200)
+    -249.round(-2).should.eql?(-200)
+    (+25 * 10**70 - 1).round(-71).should.eql?(+20 * 10**70)
+    (-25 * 10**70 + 1).round(-71).should.eql?(-20 * 10**70)
   end
 
   it "returns itself rounded to nearest if passed a negative value" do
-    +250.round(-2).should eql(+300)
-    -250.round(-2).should eql(-300)
-    (+25 * 10**70).round(-71).should eql(+30 * 10**70)
-    (-25 * 10**70).round(-71).should eql(-30 * 10**70)
+    +250.round(-2).should.eql?(+300)
+    -250.round(-2).should.eql?(-300)
+    (+25 * 10**70).round(-71).should.eql?(+30 * 10**70)
+    (-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
-      -> { 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(RangeError)
   end
 
   it "raises a RangeError when passed Float::INFINITY" do
-    -> { 42.round(Float::INFINITY) }.should raise_error(RangeError)
+    -> { 42.round(Float::INFINITY) }.should.raise(RangeError)
   end
 
   it "raises a RangeError when passed a beyond signed int" do
-    -> { 42.round(1<<31) }.should raise_error(RangeError)
+    -> { 42.round(1<<31) }.should.raise(RangeError)
   end
 
   it "raises a TypeError when passed a String" do
-    -> { 42.round("4") }.should raise_error(TypeError)
+    -> { 42.round("4") }.should.raise(TypeError)
   end
 
   it "raises a TypeError when its argument cannot be converted to an Integer" do
-    -> { 42.round(nil) }.should raise_error(TypeError)
+    -> { 42.round(nil) }.should.raise(TypeError)
   end
 
   it "calls #to_int on the argument to convert it to an Integer" do
@@ -60,42 +50,32 @@ 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([])
-    -> { 42.round(obj) }.should raise_error(TypeError)
+    -> { 42.round(obj) }.should.raise(TypeError)
   end
 
   it "returns different rounded values depending on the half option" do
-    25.round(-1, half: :up).should      eql(30)
-    25.round(-1, half: :down).should    eql(20)
-    25.round(-1, half: :even).should    eql(20)
-    25.round(-1, half: nil).should      eql(30)
-    35.round(-1, half: :up).should      eql(40)
-    35.round(-1, half: :down).should    eql(30)
-    35.round(-1, half: :even).should    eql(40)
-    35.round(-1, half: nil).should      eql(40)
-    (-25).round(-1, half: :up).should   eql(-30)
-    (-25).round(-1, half: :down).should eql(-20)
-    (-25).round(-1, half: :even).should eql(-20)
-    (-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
+    25.round(-1, half: :up).should.eql?(30)
+    25.round(-1, half: :down).should.eql?(20)
+    25.round(-1, half: :even).should.eql?(20)
+    25.round(-1, half: nil).should.eql?(30)
+    35.round(-1, half: :up).should.eql?(40)
+    35.round(-1, half: :down).should.eql?(30)
+    35.round(-1, half: :even).should.eql?(40)
+    35.round(-1, half: nil).should.eql?(40)
+    (-25).round(-1, half: :up).should.eql?(-30)
+    (-25).round(-1, half: :down).should.eql?(-20)
+    (-25).round(-1, half: :even).should.eql?(-20)
+    (-25).round(-1, half: nil).should.eql?(-30)
   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
-    -> { 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(ArgumentError, /invalid rounding mode: foo/)
+    -> { 42.round(1, half: :foo) }.should.raise(ArgumentError, /invalid rounding mode: foo/)
   end
 end