37 files changed, 279 insertions, 308 deletions

diff --git a/spec/ruby/core/numeric/abs2_spec.rb b/spec/ruby/core/numeric/abs2_spec.rb
index 0e60cd0ae7..12866f9c47 100644
--- a/spec/ruby/core/numeric/abs2_spec.rb
+++ b/spec/ruby/core/numeric/abs2_spec.rb
@@ -18,7 +18,7 @@ describe "Numeric#abs2" do
 
   it "returns the square of the absolute value of self" do
     @numbers.each do |number|
-      number.abs2.should eql(number.abs ** 2)
+      number.abs2.should.eql?(number.abs ** 2)
     end
   end
 
@@ -29,6 +29,6 @@ describe "Numeric#abs2" do
   end
 
   it "returns NaN when self is NaN" do
-    nan_value.abs2.nan?.should be_true
+    nan_value.abs2.nan?.should == true
   end
 end
diff --git a/spec/ruby/core/numeric/abs_spec.rb b/spec/ruby/core/numeric/abs_spec.rb
index 8bec50e337..4b16e06c97 100644
--- a/spec/ruby/core/numeric/abs_spec.rb
+++ b/spec/ruby/core/numeric/abs_spec.rb
@@ -1,6 +1,19 @@
 require_relative '../../spec_helper'
-require_relative 'shared/abs'
+require_relative 'fixtures/classes'
 
 describe "Numeric#abs" do
-  it_behaves_like :numeric_abs, :abs
+  before :each do
+    @obj = NumericSpecs::Subclass.new
+  end
+
+  it "returns self when self is greater than 0" do
+    @obj.should_receive(:<).with(0).and_return(false)
+    @obj.abs.should == @obj
+  end
+
+  it "returns self\#@- when self is less than 0" do
+    @obj.should_receive(:<).with(0).and_return(true)
+    @obj.should_receive(:-@).and_return(:absolute_value)
+    @obj.abs.should == :absolute_value
+  end
 end
diff --git a/spec/ruby/core/numeric/angle_spec.rb b/spec/ruby/core/numeric/angle_spec.rb
index bb38165777..25d2834a52 100644
--- a/spec/ruby/core/numeric/angle_spec.rb
+++ b/spec/ruby/core/numeric/angle_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
-require_relative 'shared/arg'
 
 describe "Numeric#angle" do
-  it_behaves_like :numeric_arg, :angle
+  it "is an alias of Numeric#arg" do
+    Numeric.instance_method(:angle).should == Numeric.instance_method(:arg)
+  end
 end
diff --git a/spec/ruby/core/numeric/arg_spec.rb b/spec/ruby/core/numeric/arg_spec.rb
index ba3b57c687..4fd059d7fc 100644
--- a/spec/ruby/core/numeric/arg_spec.rb
+++ b/spec/ruby/core/numeric/arg_spec.rb
@@ -1,6 +1,38 @@
 require_relative '../../spec_helper'
-require_relative 'shared/arg'
 
 describe "Numeric#arg" do
-  it_behaves_like :numeric_arg, :arg
+  before :each do
+    @numbers = [
+      20,
+      Rational(3, 4),
+      bignum_value,
+      infinity_value
+    ]
+  end
+
+  it "returns 0 if positive" do
+    @numbers.each do |number|
+      number.arg.should == 0
+    end
+  end
+
+  it "returns Pi if negative" do
+    @numbers.each do |number|
+      (0-number).arg.should == Math::PI
+    end
+  end
+
+  describe "with a Numeric subclass" do
+    it "returns 0 if self#<(0) returns false" do
+      numeric = mock_numeric('positive')
+      numeric.should_receive(:<).with(0).and_return(false)
+      numeric.arg.should == 0
+    end
+
+    it "returns Pi if self#<(0) returns true" do
+      numeric = mock_numeric('positive')
+      numeric.should_receive(:<).with(0).and_return(true)
+      numeric.arg.should == Math::PI
+    end
+  end
 end
diff --git a/spec/ruby/core/numeric/clone_spec.rb b/spec/ruby/core/numeric/clone_spec.rb
index 423cec85dd..1d06fdb050 100644
--- a/spec/ruby/core/numeric/clone_spec.rb
+++ b/spec/ruby/core/numeric/clone_spec.rb
@@ -3,11 +3,11 @@ require_relative '../../spec_helper'
 describe "Numeric#clone" do
   it "returns self" do
     value = 1
-    value.clone.should equal(value)
+    value.clone.should.equal?(value)
 
     subclass = Class.new(Numeric)
     value = subclass.new
-    value.clone.should equal(value)
+    value.clone.should.equal?(value)
   end
 
   it "does not change frozen status" do
@@ -16,15 +16,15 @@ describe "Numeric#clone" do
 
   it "accepts optional keyword argument :freeze" do
     value = 1
-    value.clone(freeze: true).should equal(value)
+    value.clone(freeze: true).should.equal?(value)
   end
 
   it "raises ArgumentError if passed freeze: false" do
-    -> { 1.clone(freeze: false) }.should raise_error(ArgumentError, /can't unfreeze/)
+    -> { 1.clone(freeze: false) }.should.raise(ArgumentError, /can't unfreeze/)
   end
 
   it "does not change frozen status if passed freeze: nil" do
     value = 1
-    value.clone(freeze: nil).should equal(value)
+    value.clone(freeze: nil).should.equal?(value)
   end
 end
diff --git a/spec/ruby/core/numeric/coerce_spec.rb b/spec/ruby/core/numeric/coerce_spec.rb
index 4c4416d30b..9344d99ee6 100644
--- a/spec/ruby/core/numeric/coerce_spec.rb
+++ b/spec/ruby/core/numeric/coerce_spec.rb
@@ -25,7 +25,7 @@ describe "Numeric#coerce" do
       class << a; true; end
 
       # watch it explode
-      -> { a.coerce(b) }.should raise_error(TypeError)
+      -> { a.coerce(b) }.should.raise(TypeError)
     end
   end
 
@@ -38,22 +38,22 @@ describe "Numeric#coerce" do
 
   it "raise TypeError if they are instances of different classes and other does not respond to #to_f" do
     other = mock("numeric")
-    -> { @obj.coerce(other)   }.should raise_error(TypeError)
+    -> { @obj.coerce(other)   }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed nil" do
-    -> { @obj.coerce(nil)     }.should raise_error(TypeError)
+    -> { @obj.coerce(nil)     }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a boolean" do
-    -> { @obj.coerce(false)   }.should raise_error(TypeError)
+    -> { @obj.coerce(false)   }.should.raise(TypeError)
   end
 
   it "raises a TypeError when passed a Symbol" do
-    -> { @obj.coerce(:symbol) }.should raise_error(TypeError)
+    -> { @obj.coerce(:symbol) }.should.raise(TypeError)
   end
 
   it "raises an ArgumentError when passed a non-numeric String" do
-    -> { @obj.coerce("test")  }.should raise_error(ArgumentError)
+    -> { @obj.coerce("test")  }.should.raise(ArgumentError)
   end
 end
diff --git a/spec/ruby/core/numeric/comparison_spec.rb b/spec/ruby/core/numeric/comparison_spec.rb
index 4b4d52501a..b0a9390cc0 100644
--- a/spec/ruby/core/numeric/comparison_spec.rb
+++ b/spec/ruby/core/numeric/comparison_spec.rb
@@ -26,22 +26,22 @@ describe "Numeric#<=>" do
     end
 
     it "is called when instances are compared with #<" do
-      (@a < @b).should be_false
+      (@a < @b).should == false
       ScratchPad.recorded.should == :numeric_comparison
     end
 
     it "is called when instances are compared with #<=" do
-      (@a <= @b).should be_false
+      (@a <= @b).should == false
       ScratchPad.recorded.should == :numeric_comparison
     end
 
     it "is called when instances are compared with #>" do
-      (@a > @b).should be_true
+      (@a > @b).should == true
       ScratchPad.recorded.should == :numeric_comparison
     end
 
     it "is called when instances are compared with #>=" do
-      (@a >= @b).should be_true
+      (@a >= @b).should == true
       ScratchPad.recorded.should == :numeric_comparison
     end
   end
diff --git a/spec/ruby/core/numeric/conj_spec.rb b/spec/ruby/core/numeric/conj_spec.rb
index 7d4777ca60..f376a0d4b1 100644
--- a/spec/ruby/core/numeric/conj_spec.rb
+++ b/spec/ruby/core/numeric/conj_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
-require_relative 'shared/conj'
 
 describe "Numeric#conj" do
-  it_behaves_like :numeric_conj, :conj
+  it "is an alias of Numeric#conjugate" do
+    Numeric.instance_method(:conj).should == Numeric.instance_method(:conjugate)
+  end
 end
diff --git a/spec/ruby/core/numeric/conjugate_spec.rb b/spec/ruby/core/numeric/conjugate_spec.rb
index 99854766e7..ea4731991d 100644
--- a/spec/ruby/core/numeric/conjugate_spec.rb
+++ b/spec/ruby/core/numeric/conjugate_spec.rb
@@ -1,6 +1,20 @@
 require_relative '../../spec_helper'
-require_relative 'shared/conj'
 
 describe "Numeric#conjugate" do
-  it_behaves_like :numeric_conj, :conjugate
+  before :each do
+    @numbers = [
+      20,             # Integer
+      398.72,         # Float
+      Rational(3, 4), # Rational
+      bignum_value,
+      infinity_value,
+      nan_value
+    ]
+  end
+
+  it "returns self" do
+    @numbers.each do |number|
+      number.conjugate.should.equal?(number)
+    end
+  end
 end
diff --git a/spec/ruby/core/numeric/div_spec.rb b/spec/ruby/core/numeric/div_spec.rb
index 53917b84c9..a17961850c 100644
--- a/spec/ruby/core/numeric/div_spec.rb
+++ b/spec/ruby/core/numeric/div_spec.rb
@@ -15,8 +15,8 @@ describe "Numeric#div" do
   end
 
   it "raises ZeroDivisionError for 0" do
-    -> { @obj.div(0) }.should raise_error(ZeroDivisionError)
-    -> { @obj.div(0.0) }.should raise_error(ZeroDivisionError)
-    -> { @obj.div(Complex(0,0)) }.should raise_error(ZeroDivisionError)
+    -> { @obj.div(0) }.should.raise(ZeroDivisionError)
+    -> { @obj.div(0.0) }.should.raise(ZeroDivisionError)
+    -> { @obj.div(Complex(0,0)) }.should.raise(ZeroDivisionError)
   end
 end
diff --git a/spec/ruby/core/numeric/dup_spec.rb b/spec/ruby/core/numeric/dup_spec.rb
index 189a7ef44d..c158c618de 100644
--- a/spec/ruby/core/numeric/dup_spec.rb
+++ b/spec/ruby/core/numeric/dup_spec.rb
@@ -3,11 +3,11 @@ require_relative '../../spec_helper'
 describe "Numeric#dup" do
   it "returns self" do
     value = 1
-    value.dup.should equal(value)
+    value.dup.should.equal?(value)
 
     subclass = Class.new(Numeric)
     value = subclass.new
-    value.dup.should equal(value)
+    value.dup.should.equal?(value)
   end
 
   it "does not change frozen status" do
diff --git a/spec/ruby/core/numeric/eql_spec.rb b/spec/ruby/core/numeric/eql_spec.rb
index b33e00e51f..80c58caef4 100644
--- a/spec/ruby/core/numeric/eql_spec.rb
+++ b/spec/ruby/core/numeric/eql_spec.rb
@@ -7,16 +7,16 @@ describe "Numeric#eql?" do
   end
 
   it "returns false if self's and other's types don't match" do
-    @obj.should_not eql(1)
-    @obj.should_not eql(-1.5)
-    @obj.should_not eql(bignum_value)
-    @obj.should_not eql(:sym)
+    @obj.should_not.eql?(1)
+    @obj.should_not.eql?(-1.5)
+    @obj.should_not.eql?(bignum_value)
+    @obj.should_not.eql?(:sym)
   end
 
   it "returns the result of calling self#== with other when self's and other's types match" do
     other = NumericSpecs::Subclass.new
     @obj.should_receive(:==).with(other).and_return("result", nil)
-    @obj.should eql(other)
-    @obj.should_not eql(other)
+    @obj.should.eql?(other)
+    @obj.should_not.eql?(other)
   end
 end
diff --git a/spec/ruby/core/numeric/fdiv_spec.rb b/spec/ruby/core/numeric/fdiv_spec.rb
index e97fa77f79..2c22c6a86a 100644
--- a/spec/ruby/core/numeric/fdiv_spec.rb
+++ b/spec/ruby/core/numeric/fdiv_spec.rb
@@ -18,7 +18,7 @@ describe "Numeric#fdiv" do
   end
 
   it "returns a Float" do
-    bignum_value.fdiv(Float::MAX).should be_an_instance_of(Float)
+    bignum_value.fdiv(Float::MAX).should.instance_of?(Float)
   end
 
   it "returns Infinity if other is 0" do
@@ -26,6 +26,6 @@ describe "Numeric#fdiv" do
   end
 
   it "returns NaN if other is NaN" do
-    3334.fdiv(nan_value).nan?.should be_true
+    3334.fdiv(nan_value).nan?.should == true
   end
 end
diff --git a/spec/ruby/core/numeric/finite_spec.rb b/spec/ruby/core/numeric/finite_spec.rb
index 05b5eebbd6..2c18c89466 100644
--- a/spec/ruby/core/numeric/finite_spec.rb
+++ b/spec/ruby/core/numeric/finite_spec.rb
@@ -3,6 +3,6 @@ require_relative '../../spec_helper'
 describe "Numeric#finite?" do
   it "returns true by default" do
     o = mock_numeric("finite")
-    o.finite?.should be_true
+    o.finite?.should == true
   end
 end
diff --git a/spec/ruby/core/numeric/i_spec.rb b/spec/ruby/core/numeric/i_spec.rb
index 621ecc09ec..f5fb99dfd3 100644
--- a/spec/ruby/core/numeric/i_spec.rb
+++ b/spec/ruby/core/numeric/i_spec.rb
@@ -2,7 +2,7 @@ require_relative '../../spec_helper'
 
 describe "Numeric#i" do
   it "returns a Complex object" do
-    34.i.should be_an_instance_of(Complex)
+    34.i.should.instance_of?(Complex)
   end
 
   it "sets the real part to 0" do
diff --git a/spec/ruby/core/numeric/imag_spec.rb b/spec/ruby/core/numeric/imag_spec.rb
index b9e343cee9..761d6b0dbe 100644
--- a/spec/ruby/core/numeric/imag_spec.rb
+++ b/spec/ruby/core/numeric/imag_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
-require_relative 'shared/imag'
 
 describe "Numeric#imag" do
-  it_behaves_like :numeric_imag, :imag
+  it "is an alias of Numeric#imaginary" do
+    Numeric.instance_method(:imag).should == Numeric.instance_method(:imaginary)
+  end
 end
diff --git a/spec/ruby/core/numeric/imaginary_spec.rb b/spec/ruby/core/numeric/imaginary_spec.rb
index ec708cb505..7b5d94cc75 100644
--- a/spec/ruby/core/numeric/imaginary_spec.rb
+++ b/spec/ruby/core/numeric/imaginary_spec.rb
@@ -1,6 +1,26 @@
 require_relative '../../spec_helper'
-require_relative 'shared/imag'
 
 describe "Numeric#imaginary" do
-  it_behaves_like :numeric_imag, :imaginary
+  before :each do
+    @numbers = [
+      20,             # Integer
+      398.72,         # Float
+      Rational(3, 4), # Rational
+      bignum_value, # Bignum
+      infinity_value,
+      nan_value
+    ].map{|n| [n,-n]}.flatten
+  end
+
+  it "returns 0" do
+    @numbers.each do |number|
+      number.imaginary.should == 0
+    end
+  end
+
+  it "raises an ArgumentError if given any arguments" do
+    @numbers.each do |number|
+      -> { number.imaginary(number) }.should.raise(ArgumentError)
+    end
+  end
 end
diff --git a/spec/ruby/core/numeric/magnitude_spec.rb b/spec/ruby/core/numeric/magnitude_spec.rb
index 1371dff21f..ea4dbd166f 100644
--- a/spec/ruby/core/numeric/magnitude_spec.rb
+++ b/spec/ruby/core/numeric/magnitude_spec.rb
@@ -1,6 +1,7 @@
 require_relative "../../spec_helper"
-require_relative 'shared/abs'
 
 describe "Numeric#magnitude" do
-  it_behaves_like :numeric_abs, :magnitude
+  it "is an alias of Numeric#abs" do
+    Numeric.instance_method(:magnitude).should == Numeric.instance_method(:abs)
+  end
 end
diff --git a/spec/ruby/core/numeric/modulo_spec.rb b/spec/ruby/core/numeric/modulo_spec.rb
index e3dc7e56f3..0baf96dc18 100644
--- a/spec/ruby/core/numeric/modulo_spec.rb
+++ b/spec/ruby/core/numeric/modulo_spec.rb
@@ -1,7 +1,12 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
 
-describe :numeric_modulo_19, shared: true do
+describe "Numeric#modulo" do
+  it "is an alias of Numeric#%" do
+    Numeric.instance_method(:modulo).should == Numeric.instance_method(:%)
+  end
+end
+
+describe "Numeric#%" do
   it "returns self - other * self.div(other)" do
     s = mock_numeric('self')
     o = mock_numeric('other')
@@ -11,14 +16,6 @@ describe :numeric_modulo_19, shared: true do
     s.should_receive(:div).with(o).and_return(n3)
     o.should_receive(:*).with(n3).and_return(n4)
     s.should_receive(:-).with(n4).and_return(n5)
-    s.send(@method, o).should == n5
+    (s % o).should == n5
   end
 end
-
-describe "Numeric#modulo" do
-  it_behaves_like :numeric_modulo_19, :modulo
-end
-
-describe "Numeric#%" do
-  it_behaves_like :numeric_modulo_19, :%
-end
diff --git a/spec/ruby/core/numeric/negative_spec.rb b/spec/ruby/core/numeric/negative_spec.rb
index 9c6f95fd87..f2d8a847da 100644
--- a/spec/ruby/core/numeric/negative_spec.rb
+++ b/spec/ruby/core/numeric/negative_spec.rb
@@ -4,22 +4,22 @@ require_relative 'fixtures/classes'
 describe "Numeric#negative?" do
   describe "on positive numbers" do
     it "returns false" do
-      1.negative?.should be_false
-      0.1.negative?.should be_false
+      1.negative?.should == false
+      0.1.negative?.should == false
     end
   end
 
   describe "on zero" do
     it "returns false" do
-      0.negative?.should be_false
-      0.0.negative?.should be_false
+      0.negative?.should == false
+      0.0.negative?.should == false
     end
   end
 
   describe "on negative numbers" do
     it "returns true" do
-      -1.negative?.should be_true
-      -0.1.negative?.should be_true
+      -1.negative?.should == true
+      -0.1.negative?.should == true
     end
   end
 end
diff --git a/spec/ruby/core/numeric/phase_spec.rb b/spec/ruby/core/numeric/phase_spec.rb
index bc1995303f..3abe8f2e02 100644
--- a/spec/ruby/core/numeric/phase_spec.rb
+++ b/spec/ruby/core/numeric/phase_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
-require_relative 'shared/arg'
 
 describe "Numeric#phase" do
-  it_behaves_like :numeric_arg, :phase
+  it "is an alias of Numeric#arg" do
+    Numeric.instance_method(:phase).should == Numeric.instance_method(:arg)
+  end
 end
diff --git a/spec/ruby/core/numeric/polar_spec.rb b/spec/ruby/core/numeric/polar_spec.rb
index b594e408b2..0695d7afb2 100644
--- a/spec/ruby/core/numeric/polar_spec.rb
+++ b/spec/ruby/core/numeric/polar_spec.rb
@@ -17,7 +17,7 @@ describe "Numeric#polar" do
 
   it "returns a two-element Array" do
     @numbers.each do |number|
-      number.polar.should be_an_instance_of(Array)
+      number.polar.should.instance_of?(Array)
       number.polar.size.should == 2
     end
   end
@@ -44,7 +44,7 @@ describe "Numeric#polar" do
 
   it "returns [NaN, NaN] if self is NaN" do
     nan_value.polar.size.should == 2
-    nan_value.polar.first.nan?.should be_true
-    nan_value.polar.last.nan?.should be_true
+    nan_value.polar.first.nan?.should == true
+    nan_value.polar.last.nan?.should == true
   end
 end
diff --git a/spec/ruby/core/numeric/positive_spec.rb b/spec/ruby/core/numeric/positive_spec.rb
index 3b831b4d34..7c8d15cd9f 100644
--- a/spec/ruby/core/numeric/positive_spec.rb
+++ b/spec/ruby/core/numeric/positive_spec.rb
@@ -4,22 +4,22 @@ require_relative 'fixtures/classes'
 describe "Numeric#positive?" do
   describe "on positive numbers" do
     it "returns true" do
-      1.positive?.should be_true
-      0.1.positive?.should be_true
+      1.positive?.should == true
+      0.1.positive?.should == true
     end
   end
 
   describe "on zero" do
     it "returns false" do
-      0.positive?.should be_false
-      0.0.positive?.should be_false
+      0.positive?.should == false
+      0.0.positive?.should == false
     end
   end
 
   describe "on negative numbers" do
     it "returns false" do
-      -1.positive?.should be_false
-      -0.1.positive?.should be_false
+      -1.positive?.should == false
+      -0.1.positive?.should == false
     end
   end
 end
diff --git a/spec/ruby/core/numeric/quo_spec.rb b/spec/ruby/core/numeric/quo_spec.rb
index 6e3ce7a374..66ff019231 100644
--- a/spec/ruby/core/numeric/quo_spec.rb
+++ b/spec/ruby/core/numeric/quo_spec.rb
@@ -3,11 +3,11 @@ require_relative 'fixtures/classes'
 
 describe "Numeric#quo" do
   it "returns the result of self divided by the given Integer as a Rational" do
-    5.quo(2).should eql(Rational(5,2))
+    5.quo(2).should.eql?(Rational(5,2))
   end
 
   it "returns the result of self divided by the given Float as a Float" do
-    2.quo(2.5).should eql(0.8)
+    2.quo(2.5).should.eql?(0.8)
   end
 
   it "returns the result of self divided by the given Bignum as a Float" do
@@ -15,11 +15,11 @@ describe "Numeric#quo" do
   end
 
   it "raises a ZeroDivisionError when the given Integer is 0" do
-    -> { 0.quo(0) }.should raise_error(ZeroDivisionError)
-    -> { 10.quo(0) }.should raise_error(ZeroDivisionError)
-    -> { -10.quo(0) }.should raise_error(ZeroDivisionError)
-    -> { bignum_value.quo(0) }.should raise_error(ZeroDivisionError)
-    -> { (-bignum_value).quo(0) }.should raise_error(ZeroDivisionError)
+    -> { 0.quo(0) }.should.raise(ZeroDivisionError)
+    -> { 10.quo(0) }.should.raise(ZeroDivisionError)
+    -> { -10.quo(0) }.should.raise(ZeroDivisionError)
+    -> { bignum_value.quo(0) }.should.raise(ZeroDivisionError)
+    -> { (-bignum_value).quo(0) }.should.raise(ZeroDivisionError)
   end
 
   it "calls #to_r to convert the object to a Rational" do
@@ -33,16 +33,16 @@ describe "Numeric#quo" do
     obj = NumericSpecs::Subclass.new
     obj.should_receive(:to_r).and_return(1)
 
-    -> { obj.quo(19) }.should raise_error(TypeError)
+    -> { obj.quo(19) }.should.raise(TypeError)
   end
 
   it "raises a TypeError when given a non-Integer" do
     -> {
       (obj = mock('x')).should_not_receive(:to_int)
       13.quo(obj)
-    }.should raise_error(TypeError)
-    -> { 13.quo("10")    }.should raise_error(TypeError)
-    -> { 13.quo(:symbol) }.should raise_error(TypeError)
+    }.should.raise(TypeError)
+    -> { 13.quo("10")    }.should.raise(TypeError)
+    -> { 13.quo(:symbol) }.should.raise(TypeError)
   end
 
   it "returns the result of calling self#/ with other" do
@@ -53,7 +53,7 @@ describe "Numeric#quo" do
   end
 
   it "raises a ZeroDivisionError if the given argument is zero and not a Float" do
-    -> { 1.quo(0) }.should raise_error(ZeroDivisionError)
+    -> { 1.quo(0) }.should.raise(ZeroDivisionError)
   end
 
   it "returns infinity if the given argument is zero and is a Float" do
diff --git a/spec/ruby/core/numeric/real_spec.rb b/spec/ruby/core/numeric/real_spec.rb
index 2d2499bcce..09d482a691 100644
--- a/spec/ruby/core/numeric/real_spec.rb
+++ b/spec/ruby/core/numeric/real_spec.rb
@@ -16,7 +16,7 @@ describe "Numeric#real" do
   it "returns self" do
     @numbers.each do |number|
       if number.to_f.nan?
-        number.real.nan?.should be_true
+        number.real.nan?.should == true
       else
         number.real.should == number
       end
@@ -25,7 +25,7 @@ describe "Numeric#real" do
 
   it "raises an ArgumentError if given any arguments" do
     @numbers.each do |number|
-      -> { number.real(number) }.should raise_error(ArgumentError)
+      -> { number.real(number) }.should.raise(ArgumentError)
     end
   end
 end
diff --git a/spec/ruby/core/numeric/rect_spec.rb b/spec/ruby/core/numeric/rect_spec.rb
index 79a144c5a4..65cdcc5229 100644
--- a/spec/ruby/core/numeric/rect_spec.rb
+++ b/spec/ruby/core/numeric/rect_spec.rb
@@ -1,6 +1,7 @@
 require_relative '../../spec_helper'
-require_relative 'shared/rect'
 
 describe "Numeric#rect" do
-  it_behaves_like :numeric_rect, :rect
+  it "is an alias of Numeric#rectangular" do
+    Numeric.instance_method(:rect).should == Numeric.instance_method(:rectangular)
+  end
 end
diff --git a/spec/ruby/core/numeric/rectangular_spec.rb b/spec/ruby/core/numeric/rectangular_spec.rb
index 2c68985a16..81afccc12d 100644
--- a/spec/ruby/core/numeric/rectangular_spec.rb
+++ b/spec/ruby/core/numeric/rectangular_spec.rb
@@ -1,6 +1,48 @@
 require_relative '../../spec_helper'
-require_relative 'shared/rect'
 
 describe "Numeric#rectangular" do
-  it_behaves_like :numeric_rect, :rectangular
+  before :each do
+    @numbers = [
+      20,             # Integer
+      398.72,         # Float
+      Rational(3, 4), # Rational
+      99999999**99, # Bignum
+      infinity_value,
+      nan_value
+    ]
+  end
+
+  it "returns an Array" do
+    @numbers.each do |number|
+      number.rectangular.should.instance_of?(Array)
+    end
+  end
+
+  it "returns a two-element Array" do
+    @numbers.each do |number|
+      number.rectangular.size.should == 2
+    end
+  end
+
+  it "returns self as the first element" do
+    @numbers.each do |number|
+      if Float === number and number.nan?
+        number.rectangular.first.nan?.should == true
+      else
+        number.rectangular.first.should == number
+      end
+    end
+  end
+
+  it "returns 0 as the last element" do
+    @numbers.each do |number|
+      number.rectangular.last.should == 0
+    end
+  end
+
+  it "raises an ArgumentError if given any arguments" do
+    @numbers.each do |number|
+      -> { number.rectangular(number) }.should.raise(ArgumentError)
+    end
+  end
 end
diff --git a/spec/ruby/core/numeric/remainder_spec.rb b/spec/ruby/core/numeric/remainder_spec.rb
index 674fa22d8e..bdf7358b21 100644
--- a/spec/ruby/core/numeric/remainder_spec.rb
+++ b/spec/ruby/core/numeric/remainder_spec.rb
@@ -6,16 +6,14 @@ describe "Numeric#remainder" do
     @obj    = NumericSpecs::Subclass.new
     @result = mock("Numeric#% result")
     @other  = mock("Passed Object")
-    ruby_version_is "3.3" do
-      @other.should_receive(:coerce).with(@obj).and_return([@obj, @other])
-    end
+    @other.should_receive(:coerce).with(@obj).and_return([@obj, @other])
   end
 
   it "returns the result of calling self#% with other if self is 0" do
     @obj.should_receive(:%).with(@other).and_return(@result)
     @result.should_receive(:==).with(0).and_return(true)
 
-    @obj.remainder(@other).should equal(@result)
+    @obj.remainder(@other).should.equal?(@result)
   end
 
   it "returns the result of calling self#% with other if self and other are greater than 0" do
@@ -27,7 +25,7 @@ describe "Numeric#remainder" do
     @obj.should_receive(:>).with(0).and_return(true)
     @other.should_receive(:<).with(0).and_return(false)
 
-    @obj.remainder(@other).should equal(@result)
+    @obj.remainder(@other).should.equal?(@result)
   end
 
   it "returns the result of calling self#% with other if self and other are less than 0" do
@@ -39,7 +37,7 @@ describe "Numeric#remainder" do
 
     @obj.should_receive(:>).with(0).and_return(false)
 
-    @obj.remainder(@other).should equal(@result)
+    @obj.remainder(@other).should.equal?(@result)
   end
 
   it "returns the result of calling self#% with other - other if self is greater than 0 and other is less than 0" do
diff --git a/spec/ruby/core/numeric/shared/abs.rb b/spec/ruby/core/numeric/shared/abs.rb
deleted file mode 100644
index c3dadccfd6..0000000000
--- a/spec/ruby/core/numeric/shared/abs.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require_relative '../../../spec_helper'
-require_relative '../fixtures/classes'
-
-describe :numeric_abs, shared: true do
-  before :each do
-    @obj = NumericSpecs::Subclass.new
-  end
-
-  it "returns self when self is greater than 0" do
-    @obj.should_receive(:<).with(0).and_return(false)
-    @obj.send(@method).should == @obj
-  end
-
-  it "returns self\#@- when self is less than 0" do
-    @obj.should_receive(:<).with(0).and_return(true)
-    @obj.should_receive(:-@).and_return(:absolute_value)
-    @obj.send(@method).should == :absolute_value
-  end
-end
diff --git a/spec/ruby/core/numeric/shared/arg.rb b/spec/ruby/core/numeric/shared/arg.rb
deleted file mode 100644
index c8e7ad8333..0000000000
--- a/spec/ruby/core/numeric/shared/arg.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-require_relative '../../../spec_helper'
-
-describe :numeric_arg, shared: true do
-  before :each do
-    @numbers = [
-      20,
-      Rational(3, 4),
-      bignum_value,
-      infinity_value
-    ]
-  end
-
-  it "returns 0 if positive" do
-    @numbers.each do |number|
-      number.send(@method).should == 0
-    end
-  end
-
-  it "returns Pi if negative" do
-    @numbers.each do |number|
-      (0-number).send(@method).should == Math::PI
-    end
-  end
-
-  describe "with a Numeric subclass" do
-    it "returns 0 if self#<(0) returns false" do
-      numeric = mock_numeric('positive')
-      numeric.should_receive(:<).with(0).and_return(false)
-      numeric.send(@method).should == 0
-    end
-
-    it "returns Pi if self#<(0) returns true" do
-      numeric = mock_numeric('positive')
-      numeric.should_receive(:<).with(0).and_return(true)
-      numeric.send(@method).should == Math::PI
-    end
-  end
-end
diff --git a/spec/ruby/core/numeric/shared/conj.rb b/spec/ruby/core/numeric/shared/conj.rb
deleted file mode 100644
index 6d5197ecab..0000000000
--- a/spec/ruby/core/numeric/shared/conj.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require_relative '../../../spec_helper'
-
-describe :numeric_conj, shared: true do
-  before :each do
-    @numbers = [
-      20,             # Integer
-      398.72,         # Float
-      Rational(3, 4), # Rational
-      bignum_value,
-      infinity_value,
-      nan_value
-    ]
-  end
-
-  it "returns self" do
-    @numbers.each do |number|
-      number.send(@method).should equal(number)
-    end
-  end
-end
diff --git a/spec/ruby/core/numeric/shared/imag.rb b/spec/ruby/core/numeric/shared/imag.rb
deleted file mode 100644
index ac2da40a3b..0000000000
--- a/spec/ruby/core/numeric/shared/imag.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require_relative '../../../spec_helper'
-
-describe :numeric_imag, shared: true do
-  before :each do
-    @numbers = [
-      20,             # Integer
-      398.72,         # Float
-      Rational(3, 4), # Rational
-      bignum_value, # Bignum
-      infinity_value,
-      nan_value
-    ].map{|n| [n,-n]}.flatten
-  end
-
-  it "returns 0" do
-    @numbers.each do |number|
-      number.send(@method).should == 0
-    end
-  end
-
-  it "raises an ArgumentError if given any arguments" do
-   @numbers.each do |number|
-     -> { number.send(@method, number) }.should raise_error(ArgumentError)
-   end
-  end
-end
diff --git a/spec/ruby/core/numeric/shared/rect.rb b/spec/ruby/core/numeric/shared/rect.rb
deleted file mode 100644
index 9cde19a398..0000000000
--- a/spec/ruby/core/numeric/shared/rect.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require_relative '../../../spec_helper'
-
-describe :numeric_rect, shared: true do
-  before :each do
-    @numbers = [
-      20,             # Integer
-      398.72,         # Float
-      Rational(3, 4), # Rational
-      99999999**99, # Bignum
-      infinity_value,
-      nan_value
-    ]
-  end
-
-  it "returns an Array" do
-    @numbers.each do |number|
-      number.send(@method).should be_an_instance_of(Array)
-    end
-  end
-
-  it "returns a two-element Array" do
-    @numbers.each do |number|
-      number.send(@method).size.should == 2
-    end
-  end
-
-  it "returns self as the first element" do
-   @numbers.each do |number|
-     if Float === number and number.nan?
-       number.send(@method).first.nan?.should be_true
-     else
-       number.send(@method).first.should == number
-     end
-   end
-  end
-
-  it "returns 0 as the last element" do
-   @numbers.each do |number|
-     number.send(@method).last.should == 0
-   end
-  end
-
-  it "raises an ArgumentError if given any arguments" do
-   @numbers.each do |number|
-     -> { number.send(@method, number) }.should raise_error(ArgumentError)
-   end
-  end
-end
diff --git a/spec/ruby/core/numeric/shared/step.rb b/spec/ruby/core/numeric/shared/step.rb
index 977ec6de02..66b8c1af0d 100644
--- a/spec/ruby/core/numeric/shared/step.rb
+++ b/spec/ruby/core/numeric/shared/step.rb
@@ -13,7 +13,7 @@ describe :numeric_step, shared: true do
 
   it "defaults to step = 1" do
     @step.call(1, 5, &@prc)
-    ScratchPad.recorded.should eql [1, 2, 3, 4, 5]
+    ScratchPad.recorded.should.eql? [1, 2, 3, 4, 5]
   end
 
   it "defaults to an infinite limit with a step size of 1 for Integers" do
@@ -26,35 +26,35 @@ describe :numeric_step, shared: true do
 
   describe "when self, stop and step are Integers" do
     it "yields only Integers" do
-      @step.call(1, 5, 1) { |x| x.should be_an_instance_of(Integer) }
+      @step.call(1, 5, 1) { |x| x.should.instance_of?(Integer) }
     end
 
     describe "with a positive step" do
       it "yields while increasing self by step until stop is reached" do
         @step.call(1, 5, 1, &@prc)
-        ScratchPad.recorded.should eql [1, 2, 3, 4, 5]
+        ScratchPad.recorded.should.eql? [1, 2, 3, 4, 5]
       end
 
       it "yields once when self equals stop" do
         @step.call(1, 1, 1, &@prc)
-        ScratchPad.recorded.should eql [1]
+        ScratchPad.recorded.should.eql? [1]
       end
 
       it "does not yield when self is greater than stop" do
         @step.call(2, 1, 1, &@prc)
-        ScratchPad.recorded.should eql []
+        ScratchPad.recorded.should.eql? []
       end
     end
 
     describe "with a negative step" do
       it "yields while decreasing self by step until stop is reached" do
         @step.call(5, 1, -1, &@prc)
-        ScratchPad.recorded.should eql [5, 4, 3, 2, 1]
+        ScratchPad.recorded.should.eql? [5, 4, 3, 2, 1]
       end
 
       it "yields once when self equals stop" do
         @step.call(5, 5, -1, &@prc)
-        ScratchPad.recorded.should eql [5]
+        ScratchPad.recorded.should.eql? [5]
       end
 
       it "does not yield when self is less than stop" do
@@ -66,26 +66,26 @@ describe :numeric_step, shared: true do
 
   describe "when at least one of self, stop or step is a Float" do
     it "yields Floats even if only self is a Float" do
-      @step.call(1.5, 5, 1) { |x| x.should be_an_instance_of(Float) }
+      @step.call(1.5, 5, 1) { |x| x.should.instance_of?(Float) }
     end
 
     it "yields Floats even if only stop is a Float" do
-      @step.call(1, 5.0, 1) { |x| x.should be_an_instance_of(Float) }
+      @step.call(1, 5.0, 1) { |x| x.should.instance_of?(Float) }
     end
 
     it "yields Floats even if only step is a Float" do
-      @step.call(1, 5, 1.0) { |x| x.should be_an_instance_of(Float) }
+      @step.call(1, 5, 1.0) { |x| x.should.instance_of?(Float) }
     end
 
     describe "with a positive step" do
       it "yields while increasing self by step while < stop" do
         @step.call(1.5, 5, 1, &@prc)
-        ScratchPad.recorded.should eql [1.5, 2.5, 3.5, 4.5]
+        ScratchPad.recorded.should.eql? [1.5, 2.5, 3.5, 4.5]
       end
 
       it "yields once when self equals stop" do
         @step.call(1.5, 1.5, 1, &@prc)
-        ScratchPad.recorded.should eql [1.5]
+        ScratchPad.recorded.should.eql? [1.5]
       end
 
       it "does not yield when self is greater than stop" do
@@ -96,19 +96,19 @@ describe :numeric_step, shared: true do
       it "is careful about not yielding a value greater than limit" do
         # As 9*1.3+1.0 == 12.700000000000001 > 12.7, we test:
         @step.call(1.0, 12.7, 1.3, &@prc)
-        ScratchPad.recorded.should eql [1.0, 2.3, 3.6, 4.9, 6.2, 7.5, 8.8, 10.1, 11.4, 12.7]
+        ScratchPad.recorded.should.eql? [1.0, 2.3, 3.6, 4.9, 6.2, 7.5, 8.8, 10.1, 11.4, 12.7]
       end
     end
 
     describe "with a negative step" do
       it "yields while decreasing self by step while self > stop" do
         @step.call(5, 1.5, -1, &@prc)
-        ScratchPad.recorded.should eql [5.0, 4.0, 3.0, 2.0]
+        ScratchPad.recorded.should.eql? [5.0, 4.0, 3.0, 2.0]
       end
 
       it "yields once when self equals stop" do
         @step.call(1.5, 1.5, -1, &@prc)
-        ScratchPad.recorded.should eql [1.5]
+        ScratchPad.recorded.should.eql? [1.5]
       end
 
       it "does not yield when self is less than stop" do
@@ -119,24 +119,24 @@ describe :numeric_step, shared: true do
       it "is careful about not yielding a value smaller than limit" do
         # As -9*1.3-1.0 == -12.700000000000001 < -12.7, we test:
         @step.call(-1.0, -12.7, -1.3, &@prc)
-        ScratchPad.recorded.should eql [-1.0, -2.3, -3.6, -4.9, -6.2, -7.5, -8.8, -10.1, -11.4, -12.7]
+        ScratchPad.recorded.should.eql? [-1.0, -2.3, -3.6, -4.9, -6.2, -7.5, -8.8, -10.1, -11.4, -12.7]
       end
     end
 
     describe "with a positive Infinity step" do
       it "yields once if self < stop" do
         @step.call(42, 100, infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once when stop is Infinity" do
         @step.call(42, infinity_value, infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once when self equals stop" do
         @step.call(42, 42, infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once when self and stop are Infinity" do
@@ -159,17 +159,17 @@ describe :numeric_step, shared: true do
     describe "with a negative Infinity step" do
       it "yields once if self > stop" do
         @step.call(42, 6, -infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once if stop is -Infinity" do
         @step.call(42, -infinity_value, -infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once when self equals stop" do
         @step.call(42, 42, -infinity_value, &@prc)
-        ScratchPad.recorded.should eql [42.0]
+        ScratchPad.recorded.should.eql? [42.0]
       end
 
       it "yields once when self and stop are Infinity" do
@@ -226,60 +226,60 @@ describe :numeric_step, shared: true do
   describe "when step is a String" do
     describe "with self and stop as Integers" do
       it "raises an ArgumentError when step is a numeric representation" do
-        -> { @step.call(1, 5, "1") {} }.should raise_error(ArgumentError)
-        -> { @step.call(1, 5, "0.1") {} }.should raise_error(ArgumentError)
-        -> { @step.call(1, 5, "1/3") {} }.should raise_error(ArgumentError)
+        -> { @step.call(1, 5, "1") {} }.should.raise(ArgumentError)
+        -> { @step.call(1, 5, "0.1") {} }.should.raise(ArgumentError)
+        -> { @step.call(1, 5, "1/3") {} }.should.raise(ArgumentError)
       end
       it "raises an ArgumentError with step as an alphanumeric string" do
-        -> { @step.call(1, 5, "foo") {} }.should raise_error(ArgumentError)
+        -> { @step.call(1, 5, "foo") {} }.should.raise(ArgumentError)
       end
     end
 
     describe "with self and stop as Floats" do
       it "raises an ArgumentError when step is a numeric representation" do
-        -> { @step.call(1.1, 5.1, "1") {} }.should raise_error(ArgumentError)
-        -> { @step.call(1.1, 5.1, "0.1") {} }.should raise_error(ArgumentError)
-        -> { @step.call(1.1, 5.1, "1/3") {} }.should raise_error(ArgumentError)
+        -> { @step.call(1.1, 5.1, "1") {} }.should.raise(ArgumentError)
+        -> { @step.call(1.1, 5.1, "0.1") {} }.should.raise(ArgumentError)
+        -> { @step.call(1.1, 5.1, "1/3") {} }.should.raise(ArgumentError)
       end
       it "raises an ArgumentError with step as an alphanumeric string" do
-        -> { @step.call(1.1, 5.1, "foo") {} }.should raise_error(ArgumentError)
+        -> { @step.call(1.1, 5.1, "foo") {} }.should.raise(ArgumentError)
       end
     end
   end
 
   it "does not rescue ArgumentError exceptions" do
-    -> { @step.call(1, 2) { raise ArgumentError, "" }}.should raise_error(ArgumentError)
+    -> { @step.call(1, 2) { raise ArgumentError, "" }}.should.raise(ArgumentError)
   end
 
   it "does not rescue TypeError exceptions" do
-    -> { @step.call(1, 2) { raise TypeError, "" } }.should raise_error(TypeError)
+    -> { @step.call(1, 2) { raise TypeError, "" } }.should.raise(TypeError)
   end
 
   describe "when no block is given" do
     step_enum_class = Enumerator::ArithmeticSequence
 
     it "returns an #{step_enum_class} when not passed a block and self > stop" do
-      @step.call(1, 0, 2).should be_an_instance_of(step_enum_class)
+      @step.call(1, 0, 2).should.instance_of?(step_enum_class)
     end
 
     it "returns an #{step_enum_class} when not passed a block and self < stop" do
-      @step.call(1, 2, 3).should be_an_instance_of(step_enum_class)
+      @step.call(1, 2, 3).should.instance_of?(step_enum_class)
     end
 
     it "returns an #{step_enum_class} that uses the given step" do
-      @step.call(0, 5, 2).to_a.should eql [0, 2, 4]
+      @step.call(0, 5, 2).to_a.should.eql? [0, 2, 4]
     end
 
     describe "when step is a String" do
       describe "with self and stop as Integers" do
         it "returns an Enumerator" do
-          @step.call(1, 5, "foo").should be_an_instance_of(Enumerator)
+          @step.call(1, 5, "foo").should.instance_of?(Enumerator)
         end
       end
 
       describe "with self and stop as Floats" do
         it "returns an Enumerator" do
-          @step.call(1.1, 5.1, "foo").should be_an_instance_of(Enumerator)
+          @step.call(1.1, 5.1, "foo").should.instance_of?(Enumerator)
         end
       end
     end
@@ -289,23 +289,23 @@ describe :numeric_step, shared: true do
         describe "when step is a String" do
           describe "with self and stop as Integers" do
             it "raises an ArgumentError when step is a numeric representation" do
-              -> { @step.call(1, 5, "1").size }.should raise_error(ArgumentError)
-              -> { @step.call(1, 5, "0.1").size }.should raise_error(ArgumentError)
-              -> { @step.call(1, 5, "1/3").size }.should raise_error(ArgumentError)
+              -> { @step.call(1, 5, "1").size }.should.raise(ArgumentError)
+              -> { @step.call(1, 5, "0.1").size }.should.raise(ArgumentError)
+              -> { @step.call(1, 5, "1/3").size }.should.raise(ArgumentError)
             end
             it "raises an ArgumentError with step as an alphanumeric string" do
-              -> { @step.call(1, 5, "foo").size }.should raise_error(ArgumentError)
+              -> { @step.call(1, 5, "foo").size }.should.raise(ArgumentError)
             end
           end
 
           describe "with self and stop as Floats" do
             it "raises an ArgumentError when step is a numeric representation" do
-              -> { @step.call(1.1, 5.1, "1").size }.should raise_error(ArgumentError)
-              -> { @step.call(1.1, 5.1, "0.1").size }.should raise_error(ArgumentError)
-              -> { @step.call(1.1, 5.1, "1/3").size }.should raise_error(ArgumentError)
+              -> { @step.call(1.1, 5.1, "1").size }.should.raise(ArgumentError)
+              -> { @step.call(1.1, 5.1, "0.1").size }.should.raise(ArgumentError)
+              -> { @step.call(1.1, 5.1, "1/3").size }.should.raise(ArgumentError)
             end
             it "raises an ArgumentError with step as an alphanumeric string" do
-              -> { @step.call(1.1, 5.1, "foo").size }.should raise_error(ArgumentError)
+              -> { @step.call(1.1, 5.1, "foo").size }.should.raise(ArgumentError)
             end
           end
         end
diff --git a/spec/ruby/core/numeric/singleton_method_added_spec.rb b/spec/ruby/core/numeric/singleton_method_added_spec.rb
index 2091398e5d..327bb5662a 100644
--- a/spec/ruby/core/numeric/singleton_method_added_spec.rb
+++ b/spec/ruby/core/numeric/singleton_method_added_spec.rb
@@ -21,21 +21,21 @@ describe "Numeric#singleton_method_added" do
     -> do
       a = NumericSpecs::Subclass.new
       def a.test; end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
 
     -> do
       a = 1
       def a.test; end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
 
     -> do
       a = 1.5
       def a.test; end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
 
     -> do
       a = bignum_value
       def a.test; end
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/core/numeric/step_spec.rb b/spec/ruby/core/numeric/step_spec.rb
index 1705fb1b4e..6896009eb6 100644
--- a/spec/ruby/core/numeric/step_spec.rb
+++ b/spec/ruby/core/numeric/step_spec.rb
@@ -6,11 +6,11 @@ describe "Numeric#step" do
 
   describe 'with positional args' do
     it "raises an ArgumentError when step is 0" do
-      -> { 1.step(5, 0) {} }.should raise_error(ArgumentError)
+      -> { 1.step(5, 0) {} }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when step is 0.0" do
-      -> { 1.step(2, 0.0) {} }.should raise_error(ArgumentError)
+      -> { 1.step(2, 0.0) {} }.should.raise(ArgumentError)
     end
 
     before :all do
@@ -81,19 +81,19 @@ describe "Numeric#step" do
 
   describe 'with mixed arguments' do
     it " raises an ArgumentError when step is 0" do
-      -> { 1.step(5, by: 0) { break } }.should raise_error(ArgumentError)
+      -> { 1.step(5, by: 0) { break } }.should.raise(ArgumentError)
     end
 
     it "raises an ArgumentError when step is 0.0" do
-      -> { 1.step(2, by: 0.0) { break } }.should raise_error(ArgumentError)
+      -> { 1.step(2, by: 0.0) { break } }.should.raise(ArgumentError)
     end
 
     it "raises a ArgumentError when limit and to are defined" do
-      -> { 1.step(5, 1, to: 5) { break } }.should raise_error(ArgumentError)
+      -> { 1.step(5, 1, to: 5) { break } }.should.raise(ArgumentError)
     end
 
     it "raises a ArgumentError when step and by are defined" do
-      -> { 1.step(5, 1, by: 5) { break } }.should raise_error(ArgumentError)
+      -> { 1.step(5, 1, by: 5) { break } }.should.raise(ArgumentError)
     end
 
     describe "when no block is given" do
diff --git a/spec/ruby/core/numeric/to_c_spec.rb b/spec/ruby/core/numeric/to_c_spec.rb
index 75245a612e..70b7a9dd0c 100644
--- a/spec/ruby/core/numeric/to_c_spec.rb
+++ b/spec/ruby/core/numeric/to_c_spec.rb
@@ -22,7 +22,7 @@ describe "Numeric#to_c" do
 
   it "returns a Complex object" do
     @numbers.each do |number|
-      number.to_c.should be_an_instance_of(Complex)
+      number.to_c.should.instance_of?(Complex)
     end
   end
 
@@ -30,7 +30,7 @@ describe "Numeric#to_c" do
     @numbers.each do |number|
       real = number.to_c.real
       if Float === number and number.nan?
-        real.nan?.should be_true
+        real.nan?.should == true
       else
         real.should == number
       end