diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 854ec3fffa..47302350b1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,7 +32,6 @@ jobs: - name: Install dependencies run: | bundle install - gem install reline --pre - name: Run test run: rake compile test - name: Run test with libedit enabled diff --git a/test/readline/helper.rb b/test/readline/helper.rb index c2c201c72b..62f71d71ea 100644 --- a/test/readline/helper.rb +++ b/test/readline/helper.rb @@ -13,22 +13,3 @@ def use_ext_readline # Use ext/readline as Readline Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline) Object.const_set(:Readline, ReadlineSo) end - -begin - require "reline" -rescue LoadError - Object.class_eval {remove_const :Reline} if defined?(Reline) -else - def use_lib_reline # Use lib/reline as Readline - Reline.send(:remove_const, 'IOGate') if Reline.const_defined?('IOGate') - Reline.const_set('IOGate', Reline::GeneralIO) - Reline.send(:core).config.instance_variable_set(:@test_mode, true) - Reline.send(:core).config.reset - 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 index 86d3862739..7eb5e97028 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -486,8 +486,6 @@ def test_interrupt_in_other_thread if defined?(TestReadline) && self.class == TestReadline use = "use_ext_readline" - elsif defined?(TestRelineAsReadline) && self.class == TestRelineAsReadline - use = "use_lib_reline" end code = <<-"end;" $stdout.sync = true @@ -825,8 +823,6 @@ def test_without_tty loader = nil if defined?(TestReadline) && self.class == TestReadline loader = "use_ext_readline" - elsif defined?(TestRelineAsReadline) && self.class == TestRelineAsReadline - loader = "use_lib_reline" end if loader res, exit_status = Open3.capture2e("#{RUBY} -I#{__dir__} -Ilib -rhelper -e '#{loader}; Readline.readline(%{y or n?})'", stdin_data: "y\n") @@ -915,26 +911,4 @@ def setup use_ext_readline super end -end if defined?(ReadlineSo) && ENV["TEST_READLINE_OR_RELINE"] != "Reline" - -class TestRelineAsReadline < Test::Unit::TestCase - include BasetestReadline - - def setup - use_lib_reline - 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 - Reline::IOGate.encoding - end - end -end if defined?(Reline) && ENV["TEST_READLINE_OR_RELINE"] != "Readline" +end if defined?(ReadlineSo) diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb index 39ad4fe85a..a31a15dbdb 100644 --- a/test/readline/test_readline_history.rb +++ b/test/readline/test_readline_history.rb @@ -259,8 +259,7 @@ def setup use_ext_readline super end -end if defined?(::ReadlineSo) && defined?(::ReadlineSo::HISTORY) && - ENV["TEST_READLINE_OR_RELINE"] != "Reline" && +end if defined?(::ReadlineSo) && defined?(::ReadlineSo::HISTORY) ( begin ReadlineSo::HISTORY.clear @@ -268,25 +267,3 @@ def setup false end ) - -class TestRelineAsReadlineHistory < Test::Unit::TestCase - include BasetestReadlineHistory - - def setup - use_lib_reline - 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 - Reline::IOGate.encoding - end - end -end if defined?(Reline) && ENV["TEST_READLINE_OR_RELINE"] != "Readline"