Skip to content

Commit 625f759

Browse files
authored
Require test/lib helpers from main test helper (#595)
Because they are handled differently in `ruby/irb` and `ruby/ruby`.
1 parent b06611d commit 625f759

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

test/irb/helper.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
begin
55
require_relative "../lib/helper"
6+
require_relative "../lib/envutil"
67
rescue LoadError # ruby/ruby defines helpers differently
78
end
89

@@ -66,10 +67,6 @@ def without_rdoc(&block)
6667

6768
yield
6869
ensure
69-
begin
70-
require_relative "../lib/envutil"
71-
rescue LoadError # ruby/ruby defines EnvUtil differently
72-
end
7370
EnvUtil.suppress_warning {
7471
::Kernel.send(:alias_method, :require, :irb_original_require)
7572
::Kernel.undef_method :irb_original_require

test/irb/test_debug_cmd.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
require "tempfile"
1010
require "tmpdir"
1111

12-
require_relative "../lib/envutil"
1312
require_relative "helper"
1413

1514
module TestIRB

0 commit comments

Comments
 (0)