Fix usages of deprecated matchers

Author: eregon

core/encoding/converter/asciicompat_encoding_spec.rb

@@ -1,21 +1,15 @@
 require_relative '../../../spec_helper'
 
 describe "Encoding::Converter.asciicompat_encoding" do
-  it "accepts an encoding name as a String argument" do
-    -> { Encoding::Converter.asciicompat_encoding('UTF-8') }.
-      should_not raise_error
-  end
-
   it "coerces non-String/Encoding objects with #to_str" do
     str = mock('string')
     str.should_receive(:to_str).at_least(1).times.and_return('string')
     Encoding::Converter.asciicompat_encoding(str)
   end
 
   it "accepts an Encoding object as an argument" do
-    Encoding::Converter.
-      asciicompat_encoding(Encoding.find("ISO-2022-JP")).
-      should == Encoding::Converter.asciicompat_encoding("ISO-2022-JP")
+    Encoding::Converter.asciicompat_encoding(Encoding.find("ISO-2022-JP")).should ==
+      Encoding::Converter.asciicompat_encoding("ISO-2022-JP")
   end
 
   it "returns a corresponding ASCII compatible encoding for ASCII-incompatible encodings" do

core/file/sticky_spec.rb

@@ -41,7 +41,7 @@
       touch(filename)
       stat = File.stat(filename)
       mode = stat.mode
-      raise_error(Errno::EFTYPE){File.chmod(mode|01000, filename)}
+      -> { File.chmod(mode|01000, filename) }.should.raise(Errno::EFTYPE)
       File.sticky?(filename).should == false
 
       rm_r filename

core/kernel/require_relative_spec.rb

@@ -109,9 +109,9 @@
 
     -> {
       require_relative(path)
-    }.should(raise_error(LoadError) { |e|
+    }.should.raise(LoadError) { |e|
       e.path.should == File.expand_path(path, @abs_dir)
-    })
+    }
   end
 
   it "calls #to_str on non-String objects" do
@@ -311,9 +311,9 @@
 
     -> {
       require_relative(path)
-    }.should(raise_error(LoadError) { |e|
+    }.should.raise(LoadError) { |e|
       e.path.should == File.expand_path(path, @abs_dir)
-    })
+    }
   end
 
   it "calls #to_str on non-String objects" do

language/def_spec.rb

@@ -306,32 +306,21 @@ def obj.==(other)
 describe "Redefining a singleton method" do
   it "does not inherit a previously set visibility" do
     o = Object.new
+    sc = o.singleton_class
 
-    class << o; private; def foo; end; end;
-
-    class << o; should have_private_instance_method(:foo); end
-
-    class << o; def foo; end; end;
-
-    class << o; should_not have_private_instance_method(:foo); end
-    class << o; should have_instance_method(:foo); end
-
-  end
-end
-
-describe "Redefining a singleton method" do
-  it "does not inherit a previously set visibility" do
-    o = Object.new
-
-    class << o; private; def foo; end; end;
-
-    class << o; should have_private_instance_method(:foo); end
+    class << o
+      private
+      def foo; end
+    end
 
-    class << o; def foo; end; end;
+    sc.private_instance_methods(false).should.include?(:foo)
 
-    class << o; should_not have_private_instance_method(:foo); end
-    class << o; should have_instance_method(:foo); end
+    class << o
+      def foo; end
+    end
 
+    sc.private_instance_methods(false).should_not.include?(:foo)
+    sc.should.method_defined?(:foo)
   end
 end
 

library/datetime/hour_spec.rb

@@ -35,8 +35,7 @@
   end
 
   it "raises an error for hour fractions smaller than -24" do
-    -> { new_datetime(hour: -24 - Rational(1,2)) }.should(
-      raise_error(ArgumentError))
+    -> { new_datetime(hour: -24 - Rational(1,2)) }.should.raise(ArgumentError)
   end
 
   it "adds 1 to day, when 24 hours given" do

library/datetime/minute_spec.rb

@@ -35,7 +35,6 @@
   end
 
   it "raises an error for minute fractions smaller than -60" do
-    -> { new_datetime(minute: -60 - Rational(1,2))}.should(
-      raise_error(ArgumentError))
+    -> { new_datetime(minute: -60 - Rational(1,2))}.should.raise(ArgumentError)
   end
 end

library/datetime/second_spec.rb

@@ -36,8 +36,7 @@
   end
 
   it "raises an error for second fractions smaller than -60" do
-    -> { new_datetime(second: -60 - Rational(1,2))}.should(
-      raise_error(ArgumentError))
+    -> { new_datetime(second: -60 - Rational(1,2))}.should.raise(ArgumentError)
   end
 
   it "takes a second fraction near 60" do

optional/capi/io_spec.rb

@@ -142,7 +142,7 @@
 
   describe "rb_io_check_closed" do
     it "does not raise an exception if the IO is not closed" do
-      # The MRI function is void, so we use should_not raise_error
+      # The MRI function is void, so we use should_not.raise
       -> { @o.rb_io_check_closed(@io) }.should_not.raise
     end
 
@@ -221,7 +221,7 @@
 
   describe "rb_io_check_readable" do
     it "does not raise an exception if the IO is opened for reading" do
-      # The MRI function is void, so we use should_not raise_error
+      # The MRI function is void, so we use should_not.raise
       -> { @o.rb_io_check_readable(@r_io) }.should_not.raise
     end
 
@@ -237,7 +237,7 @@
 
   describe "rb_io_check_writable" do
     it "does not raise an exception if the IO is opened for writing" do
-      # The MRI function is void, so we use should_not raise_error
+      # The MRI function is void, so we use should_not.raise
       -> { @o.rb_io_check_writable(@w_io) }.should_not.raise
     end