1 files changed, 47 insertions, 7 deletions
diff --git a/spec/ruby/core/dir/home_spec.rb b/spec/ruby/core/dir/home_spec.rb
index 713ba9db9a..f0b20e0687 100644
--- a/spec/ruby/core/dir/home_spec.rb
+++ b/spec/ruby/core/dir/home_spec.rb
@@ -19,16 +19,46 @@ describe "Dir.home" do
     it "returns a non-frozen string" do
       Dir.home.should_not.frozen?
     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
+    it "returns a string with the filesystem encoding" do
+      Dir.home.encoding.should == Encoding.find("filesystem")
+    end
+
+    platform_is_not :windows do
+      it "works even if HOME is unset" do
+        ENV.delete('HOME')
+        Dir.home.should.start_with?('/')
+        Dir.home.encoding.should == Encoding.find("filesystem")
+      end
+    end
+
+    platform_is :windows 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 "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
     end
+  end
 
-    platform_is_not :windows, :solaris, :android do
+  describe "when called with the current user name" 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
@@ -37,9 +67,19 @@ describe "Dir.home" do
     it "returns a non-frozen string" do
       Dir.home(ENV['USER']).should_not.frozen?
     end
+
+    it "returns a string with the filesystem encoding" do
+      Dir.home(ENV['USER']).encoding.should == Encoding.find("filesystem")
+    end
   end
 
   it "raises an ArgumentError if the named user doesn't exist" do
-    -> { Dir.home('geuw2n288dh2k') }.should raise_error(ArgumentError)
+    -> { Dir.home('geuw2n288dh2k') }.should.raise(ArgumentError)
+  end
+
+  describe "when called with a nil user name" do
+    it "returns the current user's home directory, reading $HOME first" do
+      Dir.home(nil).should == "/rubyspec_home"
+    end
   end
 end