1 files changed, 16 insertions, 5 deletions
diff --git a/spec/ruby/core/exception/errno_spec.rb b/spec/ruby/core/exception/errno_spec.rb
index 095a926e09..36beae9976 100644
--- a/spec/ruby/core/exception/errno_spec.rb
+++ b/spec/ruby/core/exception/errno_spec.rb
@@ -4,21 +4,21 @@ require_relative 'fixtures/common'
 describe "Errno::EINVAL.new" do
   it "can be called with no arguments" do
     exc = Errno::EINVAL.new
-    exc.should be_an_instance_of(Errno::EINVAL)
+    exc.should.instance_of?(Errno::EINVAL)
     exc.errno.should == Errno::EINVAL::Errno
     exc.message.should == "Invalid argument"
   end
 
   it "accepts an optional custom message" do
     exc = Errno::EINVAL.new('custom message')
-    exc.should be_an_instance_of(Errno::EINVAL)
+    exc.should.instance_of?(Errno::EINVAL)
     exc.errno.should == Errno::EINVAL::Errno
     exc.message.should == "Invalid argument - custom message"
   end
 
   it "accepts an optional custom message and location" do
     exc = Errno::EINVAL.new('custom message', 'location')
-    exc.should be_an_instance_of(Errno::EINVAL)
+    exc.should.instance_of?(Errno::EINVAL)
     exc.errno.should == Errno::EINVAL::Errno
     exc.message.should == "Invalid argument @ location - custom message"
   end
@@ -28,7 +28,9 @@ describe "Errno::EMFILE" do
   it "can be subclassed" do
     ExceptionSpecs::EMFILESub = Class.new(Errno::EMFILE)
     exc = ExceptionSpecs::EMFILESub.new
-    exc.should be_an_instance_of(ExceptionSpecs::EMFILESub)
+    exc.should.instance_of?(ExceptionSpecs::EMFILESub)
+  ensure
+    ExceptionSpecs.send(:remove_const, :EMFILESub)
   end
 end
 
@@ -45,7 +47,7 @@ end
 
 describe "Errno::ENOTSUP" do
   it "is defined" do
-    Errno.should have_constant(:ENOTSUP)
+    Errno.should.const_defined?(:ENOTSUP, false)
   end
 
   it "is the same class as Errno::EOPNOTSUPP if they represent the same errno value" do
@@ -56,3 +58,12 @@ describe "Errno::ENOTSUP" do
     end
   end
 end
+
+describe "Errno::ENOENT" do
+  it "lets subclasses inherit the default error message" do
+    c = Class.new(Errno::ENOENT)
+    raise c, "custom message"
+  rescue => e
+    e.message.should == "No such file or directory - custom message"
+  end
+end