17 files changed, 50 insertions, 62 deletions
diff --git a/spec/ruby/core/file/stat/atime_spec.rb b/spec/ruby/core/file/stat/atime_spec.rb
index 9f1111ced1..2fecaed300 100644
--- a/spec/ruby/core/file/stat/atime_spec.rb
+++ b/spec/ruby/core/file/stat/atime_spec.rb
@@ -12,7 +12,7 @@ describe "File::Stat#atime" do
 
   it "returns the atime of a File::Stat object" do
     st = File.stat(@file)
-    st.atime.should be_kind_of(Time)
+    st.atime.should.is_a?(Time)
     st.atime.should <= Time.now
   end
 end
diff --git a/spec/ruby/core/file/stat/birthtime_spec.rb b/spec/ruby/core/file/stat/birthtime_spec.rb
index a727bbe566..728f635397 100644
--- a/spec/ruby/core/file/stat/birthtime_spec.rb
+++ b/spec/ruby/core/file/stat/birthtime_spec.rb
@@ -1,27 +1,29 @@
 require_relative '../../../spec_helper'
 
-describe "File::Stat#birthtime" do
-  before :each do
-    @file = tmp('i_exist')
-    touch(@file) { |f| f.write "rubinius" }
-  end
+platform_is(:windows, :darwin, :freebsd, :netbsd,
+            *ruby_version_is("4.0") { :linux },
+           ) do
+  not_implemented_messages = [
+    "birthtime() function is unimplemented", # unsupported OS/version
+    "birthtime is unimplemented",            # unsupported filesystem
+  ]
 
-  after :each do
-    rm_r @file
-  end
+  describe "File::Stat#birthtime" do
+    before :each do
+      @file = tmp('i_exist')
+      touch(@file) { |f| f.write "rubinius" }
+    end
 
-  platform_is :windows, :darwin, :freebsd, :netbsd do
-    it "returns the birthtime of a File::Stat object" do
-      st = File.stat(@file)
-      st.birthtime.should be_kind_of(Time)
-      st.birthtime.should <= Time.now
+    after :each do
+      rm_r @file
     end
-  end
 
-  platform_is :linux, :openbsd do
-    it "raises an NotImplementedError" do
+    it "returns the birthtime of a File::Stat object" do
       st = File.stat(@file)
-      -> { st.birthtime }.should raise_error(NotImplementedError)
+      st.birthtime.should.is_a?(Time)
+      st.birthtime.should <= Time.now
+    rescue NotImplementedError => e
+      e.message.should.start_with?(*not_implemented_messages)
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/blocks_spec.rb b/spec/ruby/core/file/stat/blocks_spec.rb
index f3f903d0f7..5e0efc8bc2 100644
--- a/spec/ruby/core/file/stat/blocks_spec.rb
+++ b/spec/ruby/core/file/stat/blocks_spec.rb
@@ -21,7 +21,7 @@ describe "File::Stat#blocks" do
   platform_is :windows do
     it "returns nil" do
       st = File.stat(@file)
-      st.blocks.should be_nil
+      st.blocks.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/ctime_spec.rb b/spec/ruby/core/file/stat/ctime_spec.rb
index fd50487a0a..dbf43a7453 100644
--- a/spec/ruby/core/file/stat/ctime_spec.rb
+++ b/spec/ruby/core/file/stat/ctime_spec.rb
@@ -12,7 +12,7 @@ describe "File::Stat#ctime" do
 
   it "returns the ctime of a File::Stat object" do
     st = File.stat(@file)
-    st.ctime.should be_kind_of(Time)
+    st.ctime.should.is_a?(Time)
     st.ctime.should <= Time.now
   end
 end
diff --git a/spec/ruby/core/file/stat/dev_major_spec.rb b/spec/ruby/core/file/stat/dev_major_spec.rb
index 4966d609e2..a199eaaa11 100644
--- a/spec/ruby/core/file/stat/dev_major_spec.rb
+++ b/spec/ruby/core/file/stat/dev_major_spec.rb
@@ -11,13 +11,13 @@ describe "File::Stat#dev_major" do
 
   platform_is_not :windows do
     it "returns the major part of File::Stat#dev" do
-      File.stat(@name).dev_major.should be_kind_of(Integer)
+      File.stat(@name).dev_major.should.is_a?(Integer)
     end
   end
 
   platform_is :windows do
     it "returns nil" do
-      File.stat(@name).dev_major.should be_nil
+      File.stat(@name).dev_major.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/dev_minor_spec.rb b/spec/ruby/core/file/stat/dev_minor_spec.rb
index ea79c12b99..8ce94778ca 100644
--- a/spec/ruby/core/file/stat/dev_minor_spec.rb
+++ b/spec/ruby/core/file/stat/dev_minor_spec.rb
@@ -11,13 +11,13 @@ describe "File::Stat#dev_minor" do
 
   platform_is_not :windows do
     it "returns the minor part of File::Stat#dev" do
-      File.stat(@name).dev_minor.should be_kind_of(Integer)
+      File.stat(@name).dev_minor.should.is_a?(Integer)
     end
   end
 
   platform_is :windows do
     it "returns nil" do
-      File.stat(@name).dev_minor.should be_nil
+      File.stat(@name).dev_minor.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/dev_spec.rb b/spec/ruby/core/file/stat/dev_spec.rb
index e953fcaa58..cd5e3d175e 100644
--- a/spec/ruby/core/file/stat/dev_spec.rb
+++ b/spec/ruby/core/file/stat/dev_spec.rb
@@ -10,6 +10,6 @@ describe "File::Stat#dev" do
   end
 
   it "returns the number of the device on which the file exists" do
-    File.stat(@name).dev.should be_kind_of(Integer)
+    File.stat(@name).dev.should.is_a?(Integer)
   end
 end
diff --git a/spec/ruby/core/file/stat/ftype_spec.rb b/spec/ruby/core/file/stat/ftype_spec.rb
index eb892eae5f..df2e3ada1e 100644
--- a/spec/ruby/core/file/stat/ftype_spec.rb
+++ b/spec/ruby/core/file/stat/ftype_spec.rb
@@ -8,7 +8,7 @@ describe "File::Stat#ftype" do
 
   it "returns a String" do
     FileSpecs.normal_file do |file|
-      File.lstat(file).ftype.should be_kind_of(String)
+      File.lstat(file).ftype.should.is_a?(String)
     end
   end
 
diff --git a/spec/ruby/core/file/stat/ino_spec.rb b/spec/ruby/core/file/stat/ino_spec.rb
index 42370aecb7..c09b6448c7 100644
--- a/spec/ruby/core/file/stat/ino_spec.rb
+++ b/spec/ruby/core/file/stat/ino_spec.rb
@@ -13,7 +13,7 @@ describe "File::Stat#ino" do
   platform_is_not :windows do
     it "returns the ino of a File::Stat object" do
       st = File.stat(@file)
-      st.ino.should be_kind_of(Integer)
+      st.ino.should.is_a?(Integer)
       st.ino.should > 0
     end
   end
@@ -21,7 +21,7 @@ describe "File::Stat#ino" do
   platform_is :windows do
     it "returns BY_HANDLE_FILE_INFORMATION.nFileIndexHigh/Low of a File::Stat object" do
       st = File.stat(@file)
-      st.ino.should be_kind_of(Integer)
+      st.ino.should.is_a?(Integer)
       st.ino.should > 0
     end
   end
diff --git a/spec/ruby/core/file/stat/mtime_spec.rb b/spec/ruby/core/file/stat/mtime_spec.rb
index 08a2b83463..7844491212 100644
--- a/spec/ruby/core/file/stat/mtime_spec.rb
+++ b/spec/ruby/core/file/stat/mtime_spec.rb
@@ -12,7 +12,7 @@ describe "File::Stat#mtime" do
 
   it "returns the mtime of a File::Stat object" do
     st = File.stat(@file)
-    st.mtime.should be_kind_of(Time)
+    st.mtime.should.is_a?(Time)
     st.mtime.should <= Time.now
   end
 end
diff --git a/spec/ruby/core/file/stat/new_spec.rb b/spec/ruby/core/file/stat/new_spec.rb
index c0d9432ac8..b8c3600028 100644
--- a/spec/ruby/core/file/stat/new_spec.rb
+++ b/spec/ruby/core/file/stat/new_spec.rb
@@ -15,12 +15,12 @@ describe "File::Stat#initialize" do
   it "raises an exception if the file doesn't exist" do
     -> {
       File::Stat.new(tmp("i_am_a_dummy_file_that_doesnt_exist"))
-    }.should raise_error(Errno::ENOENT)
+    }.should.raise(Errno::ENOENT)
   end
 
   it "creates a File::Stat object for the given file" do
     st = File::Stat.new(@file)
-    st.should be_kind_of(File::Stat)
+    st.should.is_a?(File::Stat)
     st.ftype.should == 'file'
   end
 
diff --git a/spec/ruby/core/file/stat/nlink_spec.rb b/spec/ruby/core/file/stat/nlink_spec.rb
index 2dd0bff124..7143923cfc 100644
--- a/spec/ruby/core/file/stat/nlink_spec.rb
+++ b/spec/ruby/core/file/stat/nlink_spec.rb
@@ -11,7 +11,7 @@ describe "File::Stat#nlink" do
     rm_r @link, @file
   end
 
-  platform_is_not :windows do
+  platform_is_not :windows, :android do
     it "returns the number of links to a file" do
       File::Stat.new(@file).nlink.should == 1
       File.link(@file, @link)
diff --git a/spec/ruby/core/file/stat/owned_spec.rb b/spec/ruby/core/file/stat/owned_spec.rb
index 6f0c250f88..a23ad850c5 100644
--- a/spec/ruby/core/file/stat/owned_spec.rb
+++ b/spec/ruby/core/file/stat/owned_spec.rb
@@ -18,15 +18,15 @@ describe "File::Stat#owned?" do
 
   it "returns true if the file is owned by the user" do
     st = File.stat(@file)
-    st.owned?.should == true
+    st.should.owned?
   end
 
-  platform_is_not :windows do
+  platform_is_not :windows, :android do
     as_user do
       it "returns false if the file is not owned by the user" do
         system_file = '/etc/passwd'
         st = File.stat(system_file)
-        st.owned?.should == false
+        st.should_not.owned?
       end
     end
   end
diff --git a/spec/ruby/core/file/stat/pipe_spec.rb b/spec/ruby/core/file/stat/pipe_spec.rb
index 7abb6c742a..692dfbf42a 100644
--- a/spec/ruby/core/file/stat/pipe_spec.rb
+++ b/spec/ruby/core/file/stat/pipe_spec.rb
@@ -12,7 +12,7 @@ describe "File::Stat#pipe?" do
     touch(filename)
 
     st = File.stat(filename)
-    st.pipe?.should == false
+    st.should_not.pipe?
 
     rm_r filename
   end
@@ -23,7 +23,7 @@ describe "File::Stat#pipe?" do
       File.mkfifo(filename)
 
       st = File.stat(filename)
-      st.pipe?.should == true
+      st.should.pipe?
 
       rm_r filename
     end
diff --git a/spec/ruby/core/file/stat/rdev_major_spec.rb b/spec/ruby/core/file/stat/rdev_major_spec.rb
index f8a8d1b107..e1b44fc2d0 100644
--- a/spec/ruby/core/file/stat/rdev_major_spec.rb
+++ b/spec/ruby/core/file/stat/rdev_major_spec.rb
@@ -2,30 +2,23 @@ require_relative '../../../spec_helper'
 
 describe "File::Stat#rdev_major" do
   before :each do
-    platform_is :solaris do
-      @name = "/dev/zfs"
-    end
-    platform_is_not :solaris do
-      @name = tmp("file.txt")
-      touch(@name)
-    end
+    @name = tmp("file.txt")
+    touch(@name)
   end
 
   after :each do
-    platform_is_not :solaris do
-      rm_r @name
-    end
+    rm_r @name
   end
 
   platform_is_not :windows do
     it "returns the major part of File::Stat#rdev" do
-      File.stat(@name).rdev_major.should be_kind_of(Integer)
+      File.stat(@name).rdev_major.should.is_a?(Integer)
     end
   end
 
   platform_is :windows do
     it "returns nil" do
-      File.stat(@name).rdev_major.should be_nil
+      File.stat(@name).rdev_major.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/rdev_minor_spec.rb b/spec/ruby/core/file/stat/rdev_minor_spec.rb
index dc30c1f56c..8af3b9f587 100644
--- a/spec/ruby/core/file/stat/rdev_minor_spec.rb
+++ b/spec/ruby/core/file/stat/rdev_minor_spec.rb
@@ -2,30 +2,23 @@ require_relative '../../../spec_helper'
 
 describe "File::Stat#rdev_minor" do
   before :each do
-    platform_is :solaris do
-      @name = "/dev/zfs"
-    end
-    platform_is_not :solaris do
-      @name = tmp("file.txt")
-      touch(@name)
-    end
+    @name = tmp("file.txt")
+    touch(@name)
   end
 
   after :each do
-    platform_is_not :solaris do
-      rm_r @name
-    end
+    rm_r @name
   end
 
   platform_is_not :windows do
     it "returns the minor part of File::Stat#rdev" do
-      File.stat(@name).rdev_minor.should be_kind_of(Integer)
+      File.stat(@name).rdev_minor.should.is_a?(Integer)
     end
   end
 
   platform_is :windows do
     it "returns nil" do
-      File.stat(@name).rdev_minor.should be_nil
+      File.stat(@name).rdev_minor.should == nil
     end
   end
 end
diff --git a/spec/ruby/core/file/stat/rdev_spec.rb b/spec/ruby/core/file/stat/rdev_spec.rb
index 9e1aee692d..7e4252fcc6 100644
--- a/spec/ruby/core/file/stat/rdev_spec.rb
+++ b/spec/ruby/core/file/stat/rdev_spec.rb
@@ -10,6 +10,6 @@ describe "File::Stat#rdev" do
   end
 
   it "returns the number of the device this file represents which the file exists" do
-    File.stat(@name).rdev.should be_kind_of(Integer)
+    File.stat(@name).rdev.should.is_a?(Integer)
   end
 end