Merge pull request #6 from aycabta/fetch-upstream

Fetch upstream
ruby · Jun 22, 2021 · b875a5b · b875a5b
2 parents 8541aac + d4d2b03
commit b875a5b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/test/readline/helper.rb b/test/readline/helper.rb
@@ -21,4 +21,8 @@ def use_lib_reline # Use lib/reline as Readline
     Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline)
     Object.const_set(:Readline, Reline)
   end
+
+  def finish_using_lib_reline
+    Reline.instance_variable_set(:@core, nil)
+  end
 end
diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
@@ -806,11 +806,16 @@ def setup
     super
   end
 
+  def teardown
+    finish_using_lib_reline
+    super
+  end
+
   def get_default_internal_encoding
     if RUBY_PLATFORM =~ /mswin|mingw/
       Encoding.default_internal || Encoding::UTF_8
     else
-      super
+      Reline::IOGate.encoding
     end
   end
 end if defined?(Reline) && ENV["TEST_READLINE_OR_RELINE"] != "Readline"
diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb
@@ -277,11 +277,16 @@ def setup
     super
   end
 
+  def teardown
+    finish_using_lib_reline
+    super
+  end
+
   def get_default_internal_encoding
     if RUBY_PLATFORM =~ /mswin|mingw/
       Encoding.default_internal || Encoding::UTF_8
     else
-      super
+      Reline::IOGate.encoding
     end
   end
 end if defined?(Reline) && ENV["TEST_READLINE_OR_RELINE"] != "Readline"