[ruby/irb] Fix test runner exit bug
(https://github.com/ruby/irb/pull/728) * Remove useless test setup and teardown that sets MAIN_CONTEXT to nil * Avoid adding command methods to main object in test https://github.com/ruby/irb/commit/f204829a08
This commit is contained in:
parent
e029375a7d
commit
cf21c72cdb
@ -22,7 +22,7 @@ module IRB # :nodoc:
|
|||||||
#
|
#
|
||||||
# Same as <code>IRB.CurrentContext.exit</code>.
|
# Same as <code>IRB.CurrentContext.exit</code>.
|
||||||
def irb_exit(ret = 0)
|
def irb_exit(ret = 0)
|
||||||
irb_context&.exit(ret)
|
irb_context.exit(ret)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Displays current configuration.
|
# Displays current configuration.
|
||||||
|
@ -6,15 +6,6 @@ require_relative "helper"
|
|||||||
|
|
||||||
module TestIRB
|
module TestIRB
|
||||||
class CompletionTest < TestCase
|
class CompletionTest < TestCase
|
||||||
def setup
|
|
||||||
# make sure require completion candidates are not cached
|
|
||||||
IRB::BaseCompletor.class_variable_set(:@@files_from_load_path, nil)
|
|
||||||
end
|
|
||||||
|
|
||||||
def teardown
|
|
||||||
IRB.conf[:MAIN_CONTEXT] = nil
|
|
||||||
end
|
|
||||||
|
|
||||||
def completion_candidates(target, bind)
|
def completion_candidates(target, bind)
|
||||||
IRB::RegexpCompletor.new.completion_candidates('', target, '', bind: bind)
|
IRB::RegexpCompletor.new.completion_candidates('', target, '', bind: bind)
|
||||||
end
|
end
|
||||||
|
@ -733,9 +733,13 @@ module TestIRB
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def build_binding
|
||||||
|
Object.new.instance_eval { binding }
|
||||||
|
end
|
||||||
|
|
||||||
def build_irb
|
def build_irb
|
||||||
IRB.init_config(nil)
|
IRB.init_config(nil)
|
||||||
workspace = IRB::WorkSpace.new(TOPLEVEL_BINDING.dup)
|
workspace = IRB::WorkSpace.new(build_binding)
|
||||||
|
|
||||||
IRB.conf[:VERBOSE] = false
|
IRB.conf[:VERBOSE] = false
|
||||||
IRB::Irb.new(workspace, TestInputMethod.new)
|
IRB::Irb.new(workspace, TestInputMethod.new)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user