summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Allen <dan.j.allen@gmail.com>2021-04-15 01:03:09 -0600
committerDan Allen <dan.j.allen@gmail.com>2021-04-15 01:03:09 -0600
commitafcdac29a3134d3e044e1d15d3c412c49d1200ff (patch)
tree40c08da97511bca29d52f8ff8150c0a90b6a57d4
parent01aa1b564c202695d40d3d910aa6bd5dd0eeac5f (diff)
fix error in logic when modifying ENV for CI tests on JRuby
-rw-r--r--test/test_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1f2821fa..8028ad36 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -345,7 +345,7 @@ class Minitest::Test
#if jruby? && (Gem::Version.new JRUBY_VERSION) < (Gem::Version.new '9.2.10.0')
if jruby?
begin
- old_env, env = ENV, (ENV.merge env)
+ old_env, env = ENV.merge, (ENV.merge env)
env.each {|key, val| env.delete key if val.nil? } if env.value? nil
ENV.replace env
IO.popen [cmd, *args, opts], &block