[ruby/irb] Require test/lib
helpers from main test helper
(https://github.com/ruby/irb/pull/595) Because they are handled differently in `ruby/irb` and `ruby/ruby`.
This commit is contained in:
parent
e38fb050fa
commit
8305681729
@ -3,6 +3,7 @@ require "pathname"
|
|||||||
|
|
||||||
begin
|
begin
|
||||||
require_relative "../lib/helper"
|
require_relative "../lib/helper"
|
||||||
|
require_relative "../lib/envutil"
|
||||||
rescue LoadError # ruby/ruby defines helpers differently
|
rescue LoadError # ruby/ruby defines helpers differently
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -66,10 +67,6 @@ module TestIRB
|
|||||||
|
|
||||||
yield
|
yield
|
||||||
ensure
|
ensure
|
||||||
begin
|
|
||||||
require_relative "../lib/envutil"
|
|
||||||
rescue LoadError # ruby/ruby defines EnvUtil differently
|
|
||||||
end
|
|
||||||
EnvUtil.suppress_warning {
|
EnvUtil.suppress_warning {
|
||||||
::Kernel.send(:alias_method, :require, :irb_original_require)
|
::Kernel.send(:alias_method, :require, :irb_original_require)
|
||||||
::Kernel.undef_method :irb_original_require
|
::Kernel.undef_method :irb_original_require
|
||||||
|
@ -9,7 +9,6 @@ end
|
|||||||
require "tempfile"
|
require "tempfile"
|
||||||
require "tmpdir"
|
require "tmpdir"
|
||||||
|
|
||||||
require_relative "../lib/envutil"
|
|
||||||
require_relative "helper"
|
require_relative "helper"
|
||||||
|
|
||||||
module TestIRB
|
module TestIRB
|
||||||
|
Loading…
x
Reference in New Issue
Block a user