Update to ruby/spec@3fc4444

2 files changed, 78 insertions, 72 deletions

diff --git a/spec/ruby/core/integer/coerce_spec.rb b/spec/ruby/core/integer/coerce_spec.rb
index c967b0dea3..13fe7b3321 100644
--- a/spec/ruby/core/integer/coerce_spec.rb
+++ b/spec/ruby/core/integer/coerce_spec.rb
@@ -1,98 +1,96 @@
 require_relative '../../spec_helper'
 
-ruby_version_is ""..."3.4" do
-
-  require 'bigdecimal'
-
-  describe "Integer#coerce" do
-    context "fixnum" 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 == [Integer, Integer]
-        end
+describe "Integer#coerce" do
+  context "fixnum" 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 == [Integer, Integer]
       end
+    end
 
-      describe "when given a String" do
-        it "raises an ArgumentError when trying to coerce with a non-number String" do
-          -> { 1.coerce(":)") }.should raise_error(ArgumentError)
-        end
-
-        it "returns  an array containing two Floats" do
-          1.coerce("2").should == [2.0, 1.0]
-          1.coerce("-2").should == [-2.0, 1.0]
-        end
+    describe "when given a String" do
+      it "raises an ArgumentError when trying to coerce with a non-number String" do
+        -> { 1.coerce(":)") }.should raise_error(ArgumentError)
       end
 
-      it "raises a TypeError when trying to coerce with nil" do
-        -> { 1.coerce(nil) }.should raise_error(TypeError)
+      it "returns  an array containing two Floats" do
+        1.coerce("2").should == [2.0, 1.0]
+        1.coerce("-2").should == [-2.0, 1.0]
       end
+    end
 
-      it "tries to convert the given Object into a Float by using #to_f" do
-        (obj = mock('1.0')).should_receive(:to_f).and_return(1.0)
-        2.coerce(obj).should == [1.0, 2.0]
+    it "raises a TypeError when trying to coerce with nil" do
+      -> { 1.coerce(nil) }.should raise_error(TypeError)
+    end
 
-        (obj = mock('0')).should_receive(:to_f).and_return('0')
-        -> { 2.coerce(obj).should == [1.0, 2.0] }.should raise_error(TypeError)
-      end
+    it "tries to convert the given Object into a Float by using #to_f" do
+      (obj = mock('1.0')).should_receive(:to_f).and_return(1.0)
+      2.coerce(obj).should == [1.0, 2.0]
 
-      it "raises a TypeError when given an Object that does not respond to #to_f" do
-        -> { 1.coerce(mock('x'))  }.should raise_error(TypeError)
-        -> { 1.coerce(1..4)       }.should raise_error(TypeError)
-        -> { 1.coerce(:test)      }.should raise_error(TypeError)
-      end
+      (obj = mock('0')).should_receive(:to_f).and_return('0')
+      -> { 2.coerce(obj).should == [1.0, 2.0] }.should raise_error(TypeError)
     end
 
-    context "bignum" do
-      it "coerces other to a Bignum and returns [other, self] when passed a Fixnum" do
-        a = bignum_value
-        ary = a.coerce(2)
+    it "raises a TypeError when given an Object that does not respond to #to_f" do
+      -> { 1.coerce(mock('x'))  }.should raise_error(TypeError)
+      -> { 1.coerce(1..4)       }.should raise_error(TypeError)
+      -> { 1.coerce(:test)      }.should raise_error(TypeError)
+    end
+  end
 
-        ary[0].should be_kind_of(Integer)
-        ary[1].should be_kind_of(Integer)
-        ary.should == [2, a]
-      end
+  context "bignum" do
+    it "coerces other to a Bignum and returns [other, self] when passed a Fixnum" do
+      a = bignum_value
+      ary = a.coerce(2)
 
-      it "returns [other, self] when passed a Bignum" do
-        a = bignum_value
-        b = bignum_value
-        ary = a.coerce(b)
+      ary[0].should be_kind_of(Integer)
+      ary[1].should be_kind_of(Integer)
+      ary.should == [2, a]
+    end
 
-        ary[0].should be_kind_of(Integer)
-        ary[1].should be_kind_of(Integer)
-        ary.should == [b, a]
-      end
+    it "returns [other, self] when passed a Bignum" do
+      a = bignum_value
+      b = bignum_value
+      ary = a.coerce(b)
 
-      it "raises a TypeError when not passed a Fixnum or Bignum" do
-        a = bignum_value
+      ary[0].should be_kind_of(Integer)
+      ary[1].should be_kind_of(Integer)
+      ary.should == [b, a]
+    end
 
-        -> { a.coerce(nil)         }.should raise_error(TypeError)
-        -> { a.coerce(mock('str')) }.should raise_error(TypeError)
-        -> { a.coerce(1..4)        }.should raise_error(TypeError)
-        -> { a.coerce(:test)       }.should raise_error(TypeError)
-      end
+    it "raises a TypeError when not passed a Fixnum or Bignum" do
+      a = bignum_value
 
-      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
+      -> { a.coerce(nil)         }.should raise_error(TypeError)
+      -> { a.coerce(mock('str')) }.should raise_error(TypeError)
+      -> { a.coerce(1..4)        }.should raise_error(TypeError)
+      -> { a.coerce(:test)       }.should raise_error(TypeError)
+    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 Float" do
+      a = bignum_value
+      a.coerce(1.2).should == [1.2, 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 "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
 
-        a = bignum_value
-        ary = a.coerce(b)
+    it "calls #to_f to coerce other to a Float" do
+      b = mock("bignum value")
+      b.should_receive(:to_f).and_return(1.2)
 
-        ary.should == [1.2, a.to_f]
-      end
+      a = bignum_value
+      ary = a.coerce(b)
+
+      ary.should == [1.2, a.to_f]
     end
+  end
 
+  ruby_version_is ""..."3.4" do
+    require 'bigdecimal'
     context "bigdecimal" do
       it "produces Floats" do
         x, y = 3.coerce(BigDecimal("3.4"))
@@ -102,6 +100,6 @@ ruby_version_is ""..."3.4" do
         y.should == 3.0
       end
     end
-
   end
+
 end
diff --git a/spec/ruby/core/integer/div_spec.rb b/spec/ruby/core/integer/div_spec.rb
index 344e095179..2eb9c0623b 100644
--- a/spec/ruby/core/integer/div_spec.rb
+++ b/spec/ruby/core/integer/div_spec.rb
@@ -143,4 +143,12 @@ describe "Integer#div" do
       -> { @bignum.div(-0) }.should raise_error(ZeroDivisionError)
     end
   end
+
+  context "rational" do
+    it "returns self divided by the given argument as an Integer" do
+      2.div(6/5r).should == 1
+      1.div(6/5r).should == 0
+      5.div(6/5r).should == 4
+    end
+  end
 end