From 823835499539aa53128a025ab72eb00c288dfb09 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 25 Mar 2023 11:07:09 +0900 Subject: merge revision(s) d6ce4180a5b4dacbac895c9911031a6df6c61136: [Backport #19243] Windows: Fix encoding of Dir.home Dir.home returns an UTF-8 string since ruby-3.0, but the actual encoding of the bytes was CP_ACP or CP_OEMCP. That led to invalid bytes when calling Dir.home with an unicode username. --- spec/ruby/core/dir/home_spec.rb | 11 +++++++++++ win32/file.c | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) --- spec/ruby/core/dir/home_spec.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'spec/ruby/core') diff --git a/spec/ruby/core/dir/home_spec.rb b/spec/ruby/core/dir/home_spec.rb index 713ba9db9a..e8c7f5970b 100644 --- a/spec/ruby/core/dir/home_spec.rb +++ b/spec/ruby/core/dir/home_spec.rb @@ -19,6 +19,17 @@ describe "Dir.home" do it "returns a non-frozen string" do Dir.home.should_not.frozen? end + + platform_is :windows do + ruby_version_is "3.0" 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 + end + end end describe "when called with the current user name" do -- cgit v1.2.3