Skip to content

Commit 182acd5

Browse files
larskaniseregon
authored andcommitted
Windows: Prefer USERPROFILE over HOMEPATH
Enable the test commented out in ruby/ruby@d0f5dc9eac78ecade459. Extracted from GH-7033, that is for initialization at start up time and this test is unrelated to it.
1 parent 28c6271 commit 182acd5

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

core/dir/home_spec.rb

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,21 @@
4040
home.should == "C:/rubyspäc/home"
4141
home.encoding.should == Encoding::UTF_8
4242
end
43-
end
4443

45-
it "retrieves the directory from HOME, USERPROFILE, HOMEDRIVE/HOMEPATH and the WinAPI in that order" do
46-
old_dirs = [ENV.delete('HOME'), ENV.delete('USERPROFILE'), ENV.delete('HOMEDRIVE'), ENV.delete('HOMEPATH')]
44+
it "retrieves the directory from HOME, USERPROFILE, HOMEDRIVE/HOMEPATH and the WinAPI in that order" do
45+
old_dirs = [ENV.delete('HOME'), ENV.delete('USERPROFILE'), ENV.delete('HOMEDRIVE'), ENV.delete('HOMEPATH')]
4746

48-
Dir.home.should == old_dirs[1].gsub("\\", "/")
49-
ENV['HOMEDRIVE'] = "C:"
50-
ENV['HOMEPATH'] = "\\rubyspec\\home1"
51-
Dir.home.should == "C:/rubyspec/home1"
52-
ENV['USERPROFILE'] = "C:\\rubyspec\\home2"
53-
# https://bugs.ruby-lang.org/issues/19244
54-
# Dir.home.should == "C:/rubyspec/home2"
55-
ENV['HOME'] = "C:\\rubyspec\\home3"
56-
Dir.home.should == "C:/rubyspec/home3"
57-
ensure
58-
ENV['HOME'], ENV['USERPROFILE'], ENV['HOMEDRIVE'], ENV['HOMEPATH'] = *old_dirs
47+
Dir.home.should == old_dirs[1].gsub("\\", "/")
48+
ENV['HOMEDRIVE'] = "C:"
49+
ENV['HOMEPATH'] = "\\rubyspec\\home1"
50+
Dir.home.should == "C:/rubyspec/home1"
51+
ENV['USERPROFILE'] = "C:\\rubyspec\\home2"
52+
Dir.home.should == "C:/rubyspec/home2"
53+
ENV['HOME'] = "C:\\rubyspec\\home3"
54+
Dir.home.should == "C:/rubyspec/home3"
55+
ensure
56+
ENV['HOME'], ENV['USERPROFILE'], ENV['HOMEDRIVE'], ENV['HOMEPATH'] = *old_dirs
57+
end
5958
end
6059
end
6160
end

0 commit comments

Comments
 (0)