Merge pull request #8239 from edipofederle/fix-dir-home-empty

Fix Dir.home for empty dir name
jruby · May 16, 2024 · 7dbf8a4 · 7dbf8a4
2 parents 733d2c4 + 50fe22d
commit 7dbf8a4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/core/src/main/java/org/jruby/RubyDir.java b/core/src/main/java/org/jruby/RubyDir.java
@@ -634,7 +634,7 @@ public static IRubyObject home(ThreadContext context, IRubyObject recv) {
 
     @JRubyMethod(name = "home", meta = true)
     public static IRubyObject home(ThreadContext context, IRubyObject recv, IRubyObject user) {
-        if (user == null || user.isNil()) {
+        if (user == null || user.isNil() || user.toString().isEmpty()) {
             return getHomeDirectoryPath(context);
         }
 

diff --git a/test/mri/excludes/TestDir.rb b/test/mri/excludes/TestDir.rb
@@ -2,4 +2,3 @@
 exclude :test_glob, '\0 delimiter is not handled'
 exclude :test_glob_gc_for_fd, "tweaks rlimit and never restores it, depends on GC effects"
 exclude :test_glob_too_may_open_files, "our glob does not appear to open files, and so the expected EMFILE does not happen"
-exclude :test_home, "uses user.home as a fallback home path"