diff options
| -rw-r--r-- | test/irb/type_completion/test_type_analyze.rb | 18 | ||||
| -rw-r--r-- | test/irb/type_completion/test_type_completor.rb | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/test/irb/type_completion/test_type_analyze.rb b/test/irb/type_completion/test_type_analyze.rb index 272756a243..ac7a65c729 100644 --- a/test/irb/type_completion/test_type_analyze.rb +++ b/test/irb/type_completion/test_type_analyze.rb @@ -10,7 +10,7 @@ rescue LoadError return end - +require 'irb/version' require 'irb/completion' require 'irb/type_completion/completor' require_relative '../helper' @@ -445,20 +445,20 @@ module TestIRB assert_call('class A; X=1; class B; X=""; X.', include: String, exclude: Integer) assert_call('class A; X=1; class B; X=""; end; X.', include: Integer, exclude: String) assert_call('class A; class B; X=1; end; end; class A; class B; X.', include: Integer) - assert_call('module IRB; VERSION.', include: String) if defined?(IRB::VERSION) - assert_call('module IRB; IRB::VERSION.', include: String) if defined?(IRB::VERSION) + assert_call('module IRB; VERSION.', include: String) + assert_call('module IRB; IRB::VERSION.', include: String) assert_call('module IRB; VERSION=1; VERSION.', include: Integer) assert_call('module IRB; VERSION=1; IRB::VERSION.', include: Integer) - assert_call('module IRB; module A; VERSION.', include: String) if defined?(IRB::VERSION) + assert_call('module IRB; module A; VERSION.', include: String) assert_call('module IRB; module A; VERSION=1; VERSION.', include: Integer) - assert_call('module IRB; module A; VERSION=1; IRB::VERSION.', include: String) if defined?(IRB::VERSION) - assert_call('module IRB; module A; VERSION=1; end; VERSION.', include: String) if defined?(IRB::VERSION) + assert_call('module IRB; module A; VERSION=1; IRB::VERSION.', include: String) + assert_call('module IRB; module A; VERSION=1; end; VERSION.', include: String) assert_call('module IRB; IRB=1; IRB.', include: Integer) - assert_call('module IRB; IRB=1; ::IRB::VERSION.', include: String) if defined?(IRB::VERSION) + assert_call('module IRB; IRB=1; ::IRB::VERSION.', include: String) module_binding = eval 'module ::IRB; binding; end' assert_call('VERSION.', include: NilClass) - assert_call('VERSION.', include: String, binding: module_binding) if defined?(IRB::VERSION) - assert_call('IRB::VERSION.', include: String, binding: module_binding) if defined?(IRB::VERSION) + assert_call('VERSION.', include: String, binding: module_binding) + assert_call('IRB::VERSION.', include: String, binding: module_binding) assert_call('A = 1; module M; A += 0.5; A.', include: Float) assert_call('::A = 1; module M; A += 0.5; A.', include: Float) assert_call('::A = 1; module M; A += 0.5; ::A.', include: Integer) diff --git a/test/irb/type_completion/test_type_completor.rb b/test/irb/type_completion/test_type_completor.rb index 90477f8f91..f947cc4e62 100644 --- a/test/irb/type_completion/test_type_completor.rb +++ b/test/irb/type_completion/test_type_completor.rb @@ -10,6 +10,7 @@ rescue LoadError return end +require 'irb/version' require 'irb/type_completion/completor' require_relative '../helper' @@ -89,7 +90,7 @@ module TestIRB def test_const assert_completion('Ar', include: 'Array') assert_completion('::Ar', include: 'Array') - assert_completion('IRB::V', include: 'VERSION') if defined?(IRB::VERSION) + assert_completion('IRB::V', include: 'VERSION') assert_completion('FooBar=1; F', include: 'FooBar') assert_completion('::FooBar=1; ::F', include: 'FooBar') assert_doc_namespace('Array', 'Array') |