Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fetch upstream #6

Merged
merged 7 commits into from
Jun 22, 2021
Merged

Fetch upstream #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a024bf9
Use Encoding.default_external for tests of Readline::HISTORY
aycabta Jun 21, 2021
7b374d1
Revert "Use Encoding.default_external for tests of Readline::HISTORY"
aycabta Jun 21, 2021
f76f679
Use test encoding for TestRelineAsReadline and TestRelineAsReadlineHi…
aycabta Jun 21, 2021
e6b97db
Call Reline.test_reset in teardown of tests for readline definitely
aycabta Jun 21, 2021
76c7b5b
Call Reline-specific method in helper file
aycabta Jun 21, 2021
8a45f0f
Call super method by teardown of tests of Reline as Readline
aycabta Jun 21, 2021
d4d2b03
Fix finish_using_lib_reline
aycabta Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions test/readline/helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 6 additions & 1 deletion test/readline/test_readline.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
7 changes: 6 additions & 1 deletion test/readline/test_readline_history.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"