[前][次][番号順一覧][スレッド一覧]

ruby-changes:67210

From: Nobuyoshi <ko1@a...>
Date: Sun, 22 Aug 2021 12:16:23 +0900 (JST)
Subject: [ruby-changes:67210] d574b84182 (master): Fix failures on non-UTF-8 environment [Bug #18077]

https://git.ruby-lang.org/ruby.git/commit/?id=d574b84182

From d574b84182f4e6a17c63113abf8fe51c3b001bcc Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 22 Aug 2021 12:03:44 +0900
Subject: Fix failures on non-UTF-8 environment [Bug #18077]

Call `IOSpecs.io_fixture` with the default encoding explicitly.
`IOSpecs.closed_io` calls the method without optional `mode` which
is set to UTF-8 by default, while the default external encoding
depends on the locale environment variables.
---
 spec/ruby/core/io/external_encoding_spec.rb | 4 +++-
 spec/ruby/core/io/internal_encoding_spec.rb | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/ruby/core/io/external_encoding_spec.rb b/spec/ruby/core/io/external_encoding_spec.rb
index 25af11f..2fcf1c7 100644
--- a/spec/ruby/core/io/external_encoding_spec.rb
+++ b/spec/ruby/core/io/external_encoding_spec.rb
@@ -96,7 +96,9 @@ describe "IO#external_encoding" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/io/external_encoding_spec.rb#L96
 
   ruby_version_is '3.1' do
     it "can be retrieved from a closed stream" do
-      IOSpecs.closed_io.external_encoding.should equal(Encoding.default_external)
+      io = IOSpecs.io_fixture("lines.txt", "r")
+      io.close
+      io.external_encoding.should equal(Encoding.default_external)
     end
   end
 
diff --git a/spec/ruby/core/io/internal_encoding_spec.rb b/spec/ruby/core/io/internal_encoding_spec.rb
index c76c9c8..60afaf2 100644
--- a/spec/ruby/core/io/internal_encoding_spec.rb
+++ b/spec/ruby/core/io/internal_encoding_spec.rb
@@ -115,7 +115,9 @@ describe "IO#internal_encoding" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/core/io/internal_encoding_spec.rb#L115
 
   ruby_version_is '3.1' do
     it "can be retrieved from a closed stream" do
-      IOSpecs.closed_io.internal_encoding.should equal(Encoding.default_internal)
+      io = IOSpecs.io_fixture("lines.txt", "r")
+      io.close
+      io.internal_encoding.should equal(Encoding.default_internal)
     end
   end
 
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]