diff options
| author | st0012 <stan001212@gmail.com> | 2022-10-07 23:19:03 +0100 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2022-10-17 21:14:50 +0000 |
| commit | 1c83469fc6e6bde8781e09ce2844231feed9b170 (patch) | |
| tree | 02d21755ef8f7edccbd27e263805af1ae237727c /test/irb/test_color.rb | |
| parent | f11765aef0cafb6fadf98216c94507f2390a0a70 (diff) | |
[ruby/irb] Remove unnecessary coloring support check
https://github.com/ruby/irb/commit/ddd7dbe2c5
Diffstat (limited to 'test/irb/test_color.rb')
| -rw-r--r-- | test/irb/test_color.rb | 47 |
1 files changed, 17 insertions, 30 deletions
diff --git a/test/irb/test_color.rb b/test/irb/test_color.rb index 8de03a5e8e..34af4e2bea 100644 --- a/test/irb/test_color.rb +++ b/test/irb/test_color.rb @@ -140,23 +140,19 @@ module TestIRB end tests.each do |code, result| - if colorize_code_supported? - assert_equal_with_term(result, code, complete: true) - assert_equal_with_term(result, code, complete: false) + assert_equal_with_term(result, code, complete: true) + assert_equal_with_term(result, code, complete: false) - assert_equal_with_term(code, code, complete: true, tty: false) - assert_equal_with_term(code, code, complete: false, tty: false) + assert_equal_with_term(code, code, complete: true, tty: false) + assert_equal_with_term(code, code, complete: false, tty: false) - assert_equal_with_term(code, code, complete: true, colorable: false) + assert_equal_with_term(code, code, complete: true, colorable: false) - assert_equal_with_term(code, code, complete: false, colorable: false) + assert_equal_with_term(code, code, complete: false, colorable: false) - assert_equal_with_term(result, code, complete: true, tty: false, colorable: true) + assert_equal_with_term(result, code, complete: true, tty: false, colorable: true) - assert_equal_with_term(result, code, complete: false, tty: false, colorable: true) - else - assert_equal_with_term(code, code) - end + assert_equal_with_term(result, code, complete: false, tty: false, colorable: true) end end @@ -186,26 +182,22 @@ module TestIRB "'foo' + 'bar" => "#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}#{RED}#{BOLD}'#{CLEAR} + #{RED}#{BOLD}'#{CLEAR}#{RED}bar#{CLEAR}", "('foo" => "(#{RED}#{BOLD}'#{CLEAR}#{RED}foo#{CLEAR}", }.each do |code, result| - if colorize_code_supported? - assert_equal_with_term(result, code, complete: false) + assert_equal_with_term(result, code, complete: false) - assert_equal_with_term(code, code, complete: false, tty: false) + assert_equal_with_term(code, code, complete: false, tty: false) - assert_equal_with_term(code, code, complete: false, colorable: false) + assert_equal_with_term(code, code, complete: false, colorable: false) - assert_equal_with_term(result, code, complete: false, tty: false, colorable: true) + assert_equal_with_term(result, code, complete: false, tty: false, colorable: true) - unless complete_option_supported? - assert_equal_with_term(result, code, complete: true) + unless complete_option_supported? + assert_equal_with_term(result, code, complete: true) - assert_equal_with_term(code, code, complete: true, tty: false) + assert_equal_with_term(code, code, complete: true, tty: false) - assert_equal_with_term(code, code, complete: true, colorable: false) + assert_equal_with_term(code, code, complete: true, colorable: false) - assert_equal_with_term(result, code, complete: true, tty: false, colorable: true) - end - else - assert_equal_with_term(code, code) + assert_equal_with_term(result, code, complete: true, tty: false, colorable: true) end end end @@ -232,11 +224,6 @@ module TestIRB private - # `#colorize_code` is supported only for Ruby 2.5+. It just returns the original code in 2.4-. - def colorize_code_supported? - Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5.0') - end - # `complete: true` is the same as `complete: false` in Ruby 2.6- def complete_option_supported? Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0') |