Require test/lib helpers from main test helper (#595)

Because they are handled differently in `ruby/irb` and `ruby/ruby`.
ruby · Jun 2, 2023 · 625f759 · 625f759
1 parent b06611d
commit 625f759
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/test/irb/helper.rb b/test/irb/helper.rb
@@ -3,6 +3,7 @@
 
 begin
   require_relative "../lib/helper"
+  require_relative "../lib/envutil"
 rescue LoadError # ruby/ruby defines helpers differently
 end
 
@@ -66,10 +67,6 @@ def without_rdoc(&block)
 
       yield
     ensure
-      begin
-        require_relative "../lib/envutil"
-      rescue LoadError # ruby/ruby defines EnvUtil differently
-      end
       EnvUtil.suppress_warning {
         ::Kernel.send(:alias_method, :require, :irb_original_require)
         ::Kernel.undef_method :irb_original_require

diff --git a/test/irb/test_debug_cmd.rb b/test/irb/test_debug_cmd.rb
@@ -9,7 +9,6 @@
 require "tempfile"
 require "tmpdir"
 
-require_relative "../lib/envutil"
 require_relative "helper"
 
 module TestIRB