15 files changed, 360 insertions, 194 deletions

diff --git a/spec/ruby/core/dir/chdir_spec.rb b/spec/ruby/core/dir/chdir_spec.rb
index 729ac403e3..015386a902 100644
--- a/spec/ruby/core/dir/chdir_spec.rb
+++ b/spec/ruby/core/dir/chdir_spec.rb
@@ -19,14 +19,14 @@ describe "Dir.chdir" do
   end
 
   it "defaults to $HOME with no arguments" do
-    if ENV['HOME']
-      Dir.chdir
-      current_dir = Dir.pwd
+    skip "$HOME not valid directory" unless ENV['HOME'] && File.directory?(ENV['HOME'])
 
-      Dir.chdir(ENV['HOME'])
-      home = Dir.pwd
-      current_dir.should == home
-    end
+    Dir.chdir
+    current_dir = Dir.pwd
+
+    Dir.chdir(ENV['HOME'])
+    home = Dir.pwd
+    current_dir.should == home
   end
 
   it "changes to the specified directory" do
@@ -70,6 +70,8 @@ describe "Dir.chdir" do
   end
 
   it "defaults to the home directory when given a block but no argument" do
+    skip "$HOME not valid directory" unless ENV['HOME'] && File.directory?(ENV['HOME'])
+
     # Windows will return a path with forward slashes for ENV["HOME"] so we have
     # to compare the route representations returned by Dir.chdir.
     current_dir = ""
@@ -93,10 +95,10 @@ describe "Dir.chdir" do
   end
 
   it "raises an Errno::ENOENT if the original directory no longer exists" do
-    dir1 = tmp('/testdir1')
-    dir2 = tmp('/testdir2')
-    File.should_not.exist?(dir1)
-    File.should_not.exist?(dir2)
+    dir1 = tmp('testdir1')
+    dir2 = tmp('testdir2')
+    Dir.should_not.exist?(dir1)
+    Dir.should_not.exist?(dir2)
     Dir.mkdir dir1
     Dir.mkdir dir2
     begin
@@ -106,8 +108,8 @@ describe "Dir.chdir" do
         end
       }.should raise_error(Errno::ENOENT)
     ensure
-      Dir.unlink dir1 if File.exist?(dir1)
-      Dir.unlink dir2 if File.exist?(dir2)
+      Dir.unlink dir1 if Dir.exist?(dir1)
+      Dir.unlink dir2 if Dir.exist?(dir2)
     end
   end
 
@@ -122,3 +124,97 @@ describe "Dir.chdir" do
     Dir.pwd.should == @original
   end
 end
+
+ruby_version_is '3.3' do
+  describe "Dir#chdir" do
+    before :all do
+      DirSpecs.create_mock_dirs
+    end
+
+    after :all do
+      DirSpecs.delete_mock_dirs
+    end
+
+    before :each do
+      @original = Dir.pwd
+    end
+
+    after :each do
+      Dir.chdir(@original)
+    end
+
+    it "changes the current working directory to self" do
+      dir = Dir.new(DirSpecs.mock_dir)
+      dir.chdir
+      Dir.pwd.should == DirSpecs.mock_dir
+    ensure
+      dir.close
+    end
+
+    it "changes the current working directory to self for duration of the block when a block is given" do
+      dir = Dir.new(DirSpecs.mock_dir)
+      pwd_in_block = nil
+
+      dir.chdir { pwd_in_block = Dir.pwd }
+
+      pwd_in_block.should == DirSpecs.mock_dir
+      Dir.pwd.should == @original
+    ensure
+      dir.close
+    end
+
+    it "returns 0 when successfully changing directory" do
+      dir = Dir.new(DirSpecs.mock_dir)
+      dir.chdir.should == 0
+    ensure
+      dir.close
+    end
+
+    it "returns the value of the block when a block is given" do
+      dir = Dir.new(DirSpecs.mock_dir)
+      dir.chdir { :block_value }.should == :block_value
+    ensure
+      dir.close
+    end
+
+    platform_is_not :windows do
+      it "does not raise an Errno::ENOENT if the original directory no longer exists" do
+        dir_name1 = tmp('testdir1')
+        dir_name2 = tmp('testdir2')
+        Dir.should_not.exist?(dir_name1)
+        Dir.should_not.exist?(dir_name2)
+        Dir.mkdir dir_name1
+        Dir.mkdir dir_name2
+
+        dir2 = Dir.new(dir_name2)
+
+        begin
+          Dir.chdir(dir_name1) do
+            dir2.chdir { Dir.unlink dir_name1 }
+          end
+          Dir.pwd.should == @original
+        ensure
+          Dir.unlink dir_name1 if Dir.exist?(dir_name1)
+          Dir.unlink dir_name2 if Dir.exist?(dir_name2)
+        end
+      ensure
+        dir2.close
+      end
+    end
+
+    it "always returns to the original directory when given a block" do
+      dir = Dir.new(DirSpecs.mock_dir)
+
+      begin
+        dir.chdir do
+          raise StandardError, "something bad happened"
+        end
+      rescue StandardError
+      end
+
+      Dir.pwd.should == @original
+    ensure
+      dir.close
+    end
+  end
+end
diff --git a/spec/ruby/core/dir/children_spec.rb b/spec/ruby/core/dir/children_spec.rb
index 03698cc246..0ad3df4669 100644
--- a/spec/ruby/core/dir/children_spec.rb
+++ b/spec/ruby/core/dir/children_spec.rb
@@ -47,7 +47,7 @@ describe "Dir.children" do
     encoding = Encoding.find("filesystem")
     encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      children.should include("こんにちは.txt".force_encoding(encoding))
+      children.should include("こんにちは.txt".dup.force_encoding(encoding))
     end
     children.first.encoding.should equal(Encoding.find("filesystem"))
   end
@@ -113,7 +113,7 @@ describe "Dir#children" do
     encoding = Encoding.find("filesystem")
     encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      children.should include("こんにちは.txt".force_encoding(encoding))
+      children.should include("こんにちは.txt".dup.force_encoding(encoding))
     end
     children.first.encoding.should equal(Encoding.find("filesystem"))
   end
@@ -131,4 +131,17 @@ describe "Dir#children" do
     children = @dir.children.sort
     children.first.encoding.should equal(Encoding::EUC_KR)
   end
+
+  it "returns the same result when called repeatedly" do
+    @dir = Dir.open DirSpecs.mock_dir
+
+    a = []
+    @dir.each {|dir| a << dir}
+
+    b = []
+    @dir.each {|dir| b << dir}
+
+    a.sort.should == b.sort
+    a.sort.should == DirSpecs.expected_paths
+  end
 end
diff --git a/spec/ruby/core/dir/close_spec.rb b/spec/ruby/core/dir/close_spec.rb
index 5fad5eecfb..f7cce318b8 100644
--- a/spec/ruby/core/dir/close_spec.rb
+++ b/spec/ruby/core/dir/close_spec.rb
@@ -11,9 +11,43 @@ describe "Dir#close" do
 
   it "does not raise an IOError even if the Dir instance is closed" do
     dir = Dir.open DirSpecs.mock_dir
-    dir.close
-    -> {
-      dir.close
-    }.should_not raise_error(IOError)
+    dir.close.should == nil
+    dir.close.should == nil
+
+    platform_is_not :windows do
+      -> { dir.fileno }.should raise_error(IOError, /closed directory/)
+    end
+  end
+
+  it "returns nil" do
+    dir = Dir.open DirSpecs.mock_dir
+    dir.close.should == nil
+  end
+
+  ruby_version_is '3.3'...'3.4' do
+    platform_is_not :windows do
+      it "does not raise an error even if the file descriptor is closed with another Dir instance" do
+        dir = Dir.open DirSpecs.mock_dir
+        dir_new = Dir.for_fd(dir.fileno)
+
+        dir.close
+        dir_new.close
+
+        -> { dir.fileno }.should raise_error(IOError, /closed directory/)
+        -> { dir_new.fileno }.should raise_error(IOError, /closed directory/)
+      end
+    end
+  end
+
+  ruby_version_is '3.4' do
+    platform_is_not :windows do
+      it "raises an error if the file descriptor is closed with another Dir instance" do
+        dir = Dir.open DirSpecs.mock_dir
+        dir_new = Dir.for_fd(dir.fileno)
+        dir.close
+
+        -> { dir_new.close }.should raise_error(Errno::EBADF, 'Bad file descriptor - closedir')
+      end
+    end
   end
 end
diff --git a/spec/ruby/core/dir/each_child_spec.rb b/spec/ruby/core/dir/each_child_spec.rb
index 520186e79e..7194273b95 100644
--- a/spec/ruby/core/dir/each_child_spec.rb
+++ b/spec/ruby/core/dir/each_child_spec.rb
@@ -86,6 +86,19 @@ describe "Dir#each_child" do
     @dir.each_child { |f| f }.should == @dir
   end
 
+  it "returns the same result when called repeatedly" do
+    @dir = Dir.open DirSpecs.mock_dir
+
+    a = []
+    @dir.each {|dir| a << dir}
+
+    b = []
+    @dir.each {|dir| b << dir}
+
+    a.sort.should == b.sort
+    a.sort.should == DirSpecs.expected_paths
+  end
+
   describe "when no block is given" do
     it "returns an Enumerator" do
       @dir = Dir.new(DirSpecs.mock_dir)
diff --git a/spec/ruby/core/dir/each_spec.rb b/spec/ruby/core/dir/each_spec.rb
index 8c69a7212b..7674663d82 100644
--- a/spec/ruby/core/dir/each_spec.rb
+++ b/spec/ruby/core/dir/each_spec.rb
@@ -35,6 +35,17 @@ describe "Dir#each" do
     ls.should include(@dir.read)
   end
 
+  it "returns the same result when called repeatedly" do
+    a = []
+    @dir.each {|dir| a << dir}
+
+    b = []
+    @dir.each {|dir| b << dir}
+
+    a.sort.should == b.sort
+    a.sort.should == DirSpecs.expected_paths
+  end
+
   describe "when no block is given" do
     it "returns an Enumerator" do
       @dir.each.should be_an_instance_of(Enumerator)
diff --git a/spec/ruby/core/dir/entries_spec.rb b/spec/ruby/core/dir/entries_spec.rb
index 91c30fccae..7462542acf 100644
--- a/spec/ruby/core/dir/entries_spec.rb
+++ b/spec/ruby/core/dir/entries_spec.rb
@@ -47,7 +47,7 @@ describe "Dir.entries" do
     encoding = Encoding.find("filesystem")
     encoding = Encoding::BINARY if encoding == Encoding::US_ASCII
     platform_is_not :windows do
-      entries.should include("こんにちは.txt".force_encoding(encoding))
+      entries.should include("こんにちは.txt".dup.force_encoding(encoding))
     end
     entries.first.encoding.should equal(Encoding.find("filesystem"))
   end
diff --git a/spec/ruby/core/dir/exist_spec.rb b/spec/ruby/core/dir/exist_spec.rb
index 9023de533f..0b8e521894 100644
--- a/spec/ruby/core/dir/exist_spec.rb
+++ b/spec/ruby/core/dir/exist_spec.rb
@@ -14,10 +14,8 @@ describe "Dir.exist?" do
   it_behaves_like :dir_exist, :exist?
 end
 
-ruby_version_is "3.2" do
-  describe "Dir.exists?" do
-    it "has been removed" do
-      Dir.should_not.respond_to?(:exists?)
-    end
+describe "Dir.exists?" do
+  it "has been removed" do
+    Dir.should_not.respond_to?(:exists?)
   end
 end
diff --git a/spec/ruby/core/dir/fchdir_spec.rb b/spec/ruby/core/dir/fchdir_spec.rb
index 429e569691..52600a95f2 100644
--- a/spec/ruby/core/dir/fchdir_spec.rb
+++ b/spec/ruby/core/dir/fchdir_spec.rb
@@ -2,7 +2,7 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/common'
 
 ruby_version_is '3.3' do
-  guard -> { Dir.respond_to? :fchdir } do
+  platform_is_not :windows do
     describe "Dir.fchdir" do
       before :all do
         DirSpecs.create_mock_dirs
@@ -13,51 +13,56 @@ ruby_version_is '3.3' do
       end
 
       before :each do
-        @dirs = [Dir.new('.')]
-        @original = @dirs.first.fileno
+        @original = Dir.pwd
       end
 
       after :each do
-        Dir.fchdir(@original)
-        @dirs.each(&:close)
+        Dir.chdir(@original)
       end
 
-      it "changes to the specified directory" do
+      it "changes the current working directory to the directory specified by the integer file descriptor" do
         dir = Dir.new(DirSpecs.mock_dir)
-        @dirs << dir
         Dir.fchdir dir.fileno
         Dir.pwd.should == DirSpecs.mock_dir
+      ensure
+        dir.close
       end
 
       it "returns 0 when successfully changing directory" do
-        Dir.fchdir(@original).should == 0
+        dir = Dir.new(DirSpecs.mock_dir)
+        Dir.fchdir(dir.fileno).should == 0
+      ensure
+        dir.close
       end
 
       it "returns the value of the block when a block is given" do
-        Dir.fchdir(@original) { :block_value }.should == :block_value
+        dir = Dir.new(DirSpecs.mock_dir)
+        Dir.fchdir(dir.fileno) { :block_value }.should == :block_value
+      ensure
+        dir.close
       end
 
       it "changes to the specified directory for the duration of the block" do
-        pwd = Dir.pwd
         dir = Dir.new(DirSpecs.mock_dir)
-        @dirs << dir
         Dir.fchdir(dir.fileno) { Dir.pwd }.should == DirSpecs.mock_dir
-        Dir.pwd.should == pwd
+        Dir.pwd.should == @original
+      ensure
+        dir.close
       end
 
       it "raises a SystemCallError if the file descriptor given is not valid" do
-        -> { Dir.fchdir(-1) }.should raise_error(SystemCallError)
-        -> { Dir.fchdir(-1) { } }.should raise_error(SystemCallError)
+        -> { Dir.fchdir(-1) }.should raise_error(SystemCallError, "Bad file descriptor - fchdir")
+        -> { Dir.fchdir(-1) { } }.should raise_error(SystemCallError, "Bad file descriptor - fchdir")
       end
 
       it "raises a SystemCallError if the file descriptor given is not for a directory" do
-        -> { Dir.fchdir $stdout.fileno }.should raise_error(SystemCallError)
-        -> { Dir.fchdir($stdout.fileno) { } }.should raise_error(SystemCallError)
+        -> { Dir.fchdir $stdout.fileno }.should raise_error(SystemCallError, /(Not a directory|Invalid argument) - fchdir/)
+        -> { Dir.fchdir($stdout.fileno) { } }.should raise_error(SystemCallError, /(Not a directory|Invalid argument) - fchdir/)
       end
     end
   end
 
-  guard_not -> { Dir.respond_to? :fchdir } do
+  platform_is :windows do
     describe "Dir.fchdir" do
       it "raises NotImplementedError" do
         -> { Dir.fchdir 1 }.should raise_error(NotImplementedError)
diff --git a/spec/ruby/core/dir/fixtures/common.rb b/spec/ruby/core/dir/fixtures/common.rb
index 087f46b331..848656c9b9 100644
--- a/spec/ruby/core/dir/fixtures/common.rb
+++ b/spec/ruby/core/dir/fixtures/common.rb
@@ -192,13 +192,7 @@ module DirSpecs
     ]
   end
 
-  if RUBY_VERSION > '3.1'
-    def self.expected_glob_paths
-      expected_paths - ['..']
-    end
-  else
-    def self.expected_glob_paths
-      expected_paths
-    end
+  def self.expected_glob_paths
+    expected_paths - ['..']
   end
 end
diff --git a/spec/ruby/core/dir/for_fd_spec.rb b/spec/ruby/core/dir/for_fd_spec.rb
new file mode 100644
index 0000000000..ba467f2f86
--- /dev/null
+++ b/spec/ruby/core/dir/for_fd_spec.rb
@@ -0,0 +1,79 @@
+require_relative '../../spec_helper'
+require_relative 'fixtures/common'
+
+quarantine! do # leads to "Errno::EBADF: Bad file descriptor - closedir" in DirSpecs.delete_mock_dirs
+ruby_version_is '3.3' do
+  platform_is_not :windows do
+    describe "Dir.for_fd" do
+      before :all do
+        DirSpecs.create_mock_dirs
+      end
+
+      after :all do
+        DirSpecs.delete_mock_dirs
+      end
+
+      before :each do
+        @original = Dir.pwd
+      end
+
+      after :each do
+        Dir.chdir(@original)
+      end
+
+      it "returns a new Dir object representing the directory specified by the given integer directory file descriptor" do
+        dir = Dir.new(DirSpecs.mock_dir)
+        dir_new = Dir.for_fd(dir.fileno)
+
+        dir_new.should.instance_of?(Dir)
+        dir_new.children.should == dir.children
+        dir_new.fileno.should == dir.fileno
+      ensure
+        dir.close
+      end
+
+      it "returns a new Dir object without associated path" do
+        dir = Dir.new(DirSpecs.mock_dir)
+        dir_new = Dir.for_fd(dir.fileno)
+
+        dir_new.path.should == nil
+      ensure
+        dir.close
+      end
+
+      it "calls #to_int to convert a value to an Integer" do
+        dir = Dir.new(DirSpecs.mock_dir)
+        obj = mock("fd")
+        obj.should_receive(:to_int).and_return(dir.fileno)
+
+        dir_new = Dir.for_fd(obj)
+        dir_new.fileno.should == dir.fileno
+      ensure
+        dir.close
+      end
+
+      it "raises TypeError when value cannot be converted to Integer" do
+        -> {
+          Dir.for_fd(nil)
+        }.should raise_error(TypeError, "no implicit conversion from nil to integer")
+      end
+
+      it "raises a SystemCallError if the file descriptor given is not valid" do
+        -> { Dir.for_fd(-1) }.should raise_error(SystemCallError, "Bad file descriptor - fdopendir")
+      end
+
+      it "raises a SystemCallError if the file descriptor given is not for a directory" do
+        -> { Dir.for_fd $stdout.fileno }.should raise_error(SystemCallError, "Not a directory - fdopendir")
+      end
+    end
+  end
+
+  platform_is :windows do
+    describe "Dir.for_fd" do
+      it "raises NotImplementedError" do
+        -> { Dir.for_fd 1 }.should raise_error(NotImplementedError)
+      end
+    end
+  end
+end
+end
diff --git a/spec/ruby/core/dir/glob_spec.rb b/spec/ruby/core/dir/glob_spec.rb
index 32f515c81d..a60b233bc0 100644
--- a/spec/ruby/core/dir/glob_spec.rb
+++ b/spec/ruby/core/dir/glob_spec.rb
@@ -89,31 +89,15 @@ describe "Dir.glob" do
     Dir.glob('**/', File::FNM_DOTMATCH).sort.should == expected
   end
 
-  ruby_version_is ''...'3.1' do
-    it "recursively matches files and directories in nested dot subdirectory with 'nested/**/*' from the current directory and option File::FNM_DOTMATCH" do
-      expected = %w[
-        nested/.
-        nested/.dotsubir
-        nested/.dotsubir/.
-        nested/.dotsubir/.dotfile
-        nested/.dotsubir/nondotfile
-      ]
-
-      Dir.glob('nested/**/*', File::FNM_DOTMATCH).sort.should == expected.sort
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "recursively matches files and directories in nested dot subdirectory except . with 'nested/**/*' from the current directory and option File::FNM_DOTMATCH" do
-      expected = %w[
-        nested/.
-        nested/.dotsubir
-        nested/.dotsubir/.dotfile
-        nested/.dotsubir/nondotfile
-      ]
+  it "recursively matches files and directories in nested dot subdirectory except . with 'nested/**/*' from the current directory and option File::FNM_DOTMATCH" do
+    expected = %w[
+      nested/.
+      nested/.dotsubir
+      nested/.dotsubir/.dotfile
+      nested/.dotsubir/nondotfile
+    ]
 
-      Dir.glob('nested/**/*', File::FNM_DOTMATCH).sort.should == expected.sort
-    end
+    Dir.glob('nested/**/*', File::FNM_DOTMATCH).sort.should == expected.sort
   end
 
   # This is a separate case to check **/ coming after a constant
@@ -260,34 +244,31 @@ describe "Dir.glob" do
     Dir.glob('**/.*', base: "deeply/nested").sort.should == expected
   end
 
-  # < 3.1 include a "." entry for every dir: ["directory/.", "directory/structure/.", ...]
-  ruby_version_is '3.1' do
-    it "handles **/.* with base keyword argument and FNM_DOTMATCH" do
-      expected = %w[
-        .
-        .dotfile.ext
-        directory/structure/.ext
-      ].sort
+  it "handles **/.* with base keyword argument and FNM_DOTMATCH" do
+    expected = %w[
+      .
+      .dotfile.ext
+      directory/structure/.ext
+    ].sort
 
-      Dir.glob('**/.*', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
-    end
+    Dir.glob('**/.*', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
+  end
 
-    it "handles **/** with base keyword argument and FNM_DOTMATCH" do
-      expected = %w[
-        .
-        .dotfile.ext
-        directory
-        directory/structure
-        directory/structure/.ext
-        directory/structure/bar
-        directory/structure/baz
-        directory/structure/file_one
-        directory/structure/file_one.ext
-        directory/structure/foo
-      ].sort
-
-      Dir.glob('**/**', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
-    end
+  it "handles **/** with base keyword argument and FNM_DOTMATCH" do
+    expected = %w[
+      .
+      .dotfile.ext
+      directory
+      directory/structure
+      directory/structure/.ext
+      directory/structure/bar
+      directory/structure/baz
+      directory/structure/file_one
+      directory/structure/file_one.ext
+      directory/structure/foo
+    ].sort
+
+    Dir.glob('**/**', File::FNM_DOTMATCH, base: "deeply/nested").sort.should == expected
   end
 
   it "handles **/*pattern* with base keyword argument and FNM_DOTMATCH" do
diff --git a/spec/ruby/core/dir/home_spec.rb b/spec/ruby/core/dir/home_spec.rb
index 3cf745ab46..966ac38af3 100644
--- a/spec/ruby/core/dir/home_spec.rb
+++ b/spec/ruby/core/dir/home_spec.rb
@@ -33,40 +33,32 @@ describe "Dir.home" do
     end
 
     platform_is :windows do
-      ruby_version_is "3.2" do
-        it "returns the home directory with forward slashs and as UTF-8" do
-          ENV['HOME'] = "C:\\rubyspäc\\home"
-          home = Dir.home
-          home.should == "C:/rubyspäc/home"
-          home.encoding.should == Encoding::UTF_8
-        end
+      it "returns the home directory with forward slashs and as UTF-8" do
+        ENV['HOME'] = "C:\\rubyspäc\\home"
+        home = Dir.home
+        home.should == "C:/rubyspäc/home"
+        home.encoding.should == Encoding::UTF_8
+      end
 
-        it "retrieves the directory from HOME, USERPROFILE, HOMEDRIVE/HOMEPATH and the WinAPI in that order" do
-          old_dirs = [ENV.delete('HOME'), ENV.delete('USERPROFILE'), ENV.delete('HOMEDRIVE'), ENV.delete('HOMEPATH')]
+      it "retrieves the directory from HOME, USERPROFILE, HOMEDRIVE/HOMEPATH and the WinAPI in that order" do
+        old_dirs = [ENV.delete('HOME'), ENV.delete('USERPROFILE'), ENV.delete('HOMEDRIVE'), ENV.delete('HOMEPATH')]
 
-          Dir.home.should == old_dirs[1].gsub("\\", "/")
-          ENV['HOMEDRIVE'] = "C:"
-          ENV['HOMEPATH'] = "\\rubyspec\\home1"
-          Dir.home.should == "C:/rubyspec/home1"
-          ENV['USERPROFILE'] = "C:\\rubyspec\\home2"
-          Dir.home.should == "C:/rubyspec/home2"
-          ENV['HOME'] = "C:\\rubyspec\\home3"
-          Dir.home.should == "C:/rubyspec/home3"
-        ensure
-          ENV['HOME'], ENV['USERPROFILE'], ENV['HOMEDRIVE'], ENV['HOMEPATH'] = *old_dirs
-        end
+        Dir.home.should == old_dirs[1].gsub("\\", "/")
+        ENV['HOMEDRIVE'] = "C:"
+        ENV['HOMEPATH'] = "\\rubyspec\\home1"
+        Dir.home.should == "C:/rubyspec/home1"
+        ENV['USERPROFILE'] = "C:\\rubyspec\\home2"
+        Dir.home.should == "C:/rubyspec/home2"
+        ENV['HOME'] = "C:\\rubyspec\\home3"
+        Dir.home.should == "C:/rubyspec/home3"
+      ensure
+        ENV['HOME'], ENV['USERPROFILE'], ENV['HOMEDRIVE'], ENV['HOMEPATH'] = *old_dirs
       end
     end
   end
 
   describe "when called with the current user name" do
-    platform_is :solaris do
-      it "returns the named user's home directory from the user database" do
-        Dir.home(ENV['USER']).should == `getent passwd #{ENV['USER']}|cut -d: -f6`.chomp
-      end
-    end
-
-    platform_is_not :windows, :solaris, :android, :wasi do
+    platform_is_not :windows, :android, :wasi do
       it "returns the named user's home directory, from the user database" do
         Dir.home(ENV['USER']).should == `echo ~#{ENV['USER']}`.chomp
       end
diff --git a/spec/ruby/core/dir/shared/delete.rb b/spec/ruby/core/dir/shared/delete.rb
index 49e88360e8..a81b059759 100644
--- a/spec/ruby/core/dir/shared/delete.rb
+++ b/spec/ruby/core/dir/shared/delete.rb
@@ -17,20 +17,10 @@ describe :dir_delete, shared: true do
     Dir.send(@method, p)
   end
 
-  platform_is_not :solaris do
-    it "raises an Errno::ENOTEMPTY when trying to remove a nonempty directory" do
-      -> do
-        Dir.send @method, DirSpecs.mock_rmdir("nonempty")
-      end.should raise_error(Errno::ENOTEMPTY)
-    end
-  end
-
-  platform_is :solaris do
-    it "raises an Errno::EEXIST when trying to remove a nonempty directory" do
-      -> do
-        Dir.send @method, DirSpecs.mock_rmdir("nonempty")
-      end.should raise_error(Errno::EEXIST)
-    end
+  it "raises an Errno::ENOTEMPTY when trying to remove a nonempty directory" do
+    -> do
+      Dir.send @method, DirSpecs.mock_rmdir("nonempty")
+    end.should raise_error(Errno::ENOTEMPTY)
   end
 
   it "raises an Errno::ENOENT when trying to remove a non-existing directory" do
diff --git a/spec/ruby/core/dir/shared/exist.rb b/spec/ruby/core/dir/shared/exist.rb
index 2ea4f88a80..3097f57715 100644
--- a/spec/ruby/core/dir/shared/exist.rb
+++ b/spec/ruby/core/dir/shared/exist.rb
@@ -34,6 +34,7 @@ describe :dir_exist, shared: true do
   end
 
   it "doesn't expand paths" do
+    skip "$HOME not valid directory" unless ENV['HOME'] && File.directory?(ENV['HOME'])
     Dir.send(@method, File.expand_path('~')).should be_true
     Dir.send(@method, '~').should be_false
   end
diff --git a/spec/ruby/core/dir/shared/glob.rb b/spec/ruby/core/dir/shared/glob.rb
index 27ae0e3000..b1fc924f08 100644
--- a/spec/ruby/core/dir/shared/glob.rb
+++ b/spec/ruby/core/dir/shared/glob.rb
@@ -12,7 +12,7 @@ describe :dir_glob, shared: true do
   end
 
   it "raises an Encoding::CompatibilityError if the argument encoding is not compatible with US-ASCII" do
-    pattern = "file*".force_encoding Encoding::UTF_16BE
+    pattern = "files*".dup.force_encoding Encoding::UTF_16BE
     -> { Dir.send(@method, pattern) }.should raise_error(Encoding::CompatibilityError)
   end
 
@@ -42,25 +42,10 @@ describe :dir_glob, shared: true do
     result.sort.should == Dir.send(@method, '*').sort
   end
 
-  ruby_version_is ""..."3.1" do
-    it "result is sorted with any non false value of sort:" do
-      result = Dir.send(@method, '*', sort: 0)
-      result.should == result.sort
-
-      result = Dir.send(@method, '*', sort: nil)
-      result.should == result.sort
-
-      result = Dir.send(@method, '*', sort: 'false')
-      result.should == result.sort
-    end
-  end
-
-  ruby_version_is "3.1" do
-    it "raises an ArgumentError if sort: is not true or false" do
-      -> { Dir.send(@method, '*', sort: 0) }.should raise_error ArgumentError, /expected true or false/
-      -> { Dir.send(@method, '*', sort: nil) }.should raise_error ArgumentError, /expected true or false/
-      -> { Dir.send(@method, '*', sort: 'false') }.should raise_error ArgumentError, /expected true or false/
-    end
+  it "raises an ArgumentError if sort: is not true or false" do
+    -> { Dir.send(@method, '*', sort: 0) }.should raise_error ArgumentError, /expected true or false/
+    -> { Dir.send(@method, '*', sort: nil) }.should raise_error ArgumentError, /expected true or false/
+    -> { Dir.send(@method, '*', sort: 'false') }.should raise_error ArgumentError, /expected true or false/
   end
 
   it "matches non-dotfiles with '*'" do
@@ -151,16 +136,8 @@ describe :dir_glob, shared: true do
     Dir.send(@method, 'special/test\{1\}/*').should == ['special/test{1}/file[1]']
   end
 
-  ruby_version_is ''...'3.1' do
-    it "matches dotfiles with '.*'" do
-      Dir.send(@method, '.*').sort.should == %w|. .. .dotfile .dotsubdir|.sort
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "matches dotfiles except .. with '.*'" do
-      Dir.send(@method, '.*').sort.should == %w|. .dotfile .dotsubdir|.sort
-    end
+  it "matches dotfiles except .. with '.*'" do
+    Dir.send(@method, '.*').sort.should == %w|. .dotfile .dotsubdir|.sort
   end
 
   it "matches non-dotfiles with '*<non-special characters>'" do
@@ -205,16 +182,8 @@ describe :dir_glob, shared: true do
     Dir.send(@method, '**').sort.should == expected
   end
 
-  ruby_version_is ''...'3.1' do
-    it "matches dotfiles in the current directory with '.**'" do
-      Dir.send(@method, '.**').sort.should == %w|. .. .dotsubdir .dotfile|.sort
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "matches dotfiles in the current directory except .. with '.**'" do
-      Dir.send(@method, '.**').sort.should == %w|. .dotsubdir .dotfile|.sort
-    end
+  it "matches dotfiles in the current directory except .. with '.**'" do
+    Dir.send(@method, '.**').sort.should == %w|. .dotsubdir .dotfile|.sort
   end
 
   it "recursively matches any nondot subdirectories with '**/'" do
@@ -245,19 +214,9 @@ describe :dir_glob, shared: true do
     Dir.send(@method, '**/*ory', base: 'deeply').sort.should == expected
   end
 
-  ruby_version_is ''...'3.1' do
-    it "recursively matches any subdirectories including ./ and ../ with '.**/'" do
-      Dir.chdir("#{DirSpecs.mock_dir}/subdir_one") do
-        Dir.send(@method, '.**/').sort.should == %w|./ ../|.sort
-      end
-    end
-  end
-
-  ruby_version_is '3.1' do
-    it "recursively matches any subdirectories including ./ with '.**/'" do
-      Dir.chdir("#{DirSpecs.mock_dir}/subdir_one") do
-        Dir.send(@method, '.**/').should == ['./']
-      end
+  it "recursively matches any subdirectories including ./ with '.**/'" do
+    Dir.chdir("#{DirSpecs.mock_dir}/subdir_one") do
+      Dir.send(@method, '.**/').should == ['./']
     end
   end