X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3e3ef3aec33b4374a0d5cdfdb52b233499f9eb90..b65cb64f0d7865266bd8674e681cd0f48fd476c7:/apps/workbench/test/integration_helper.rb

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 5cd6f8421a..8e317ba4e2 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -5,6 +5,7 @@ require 'uri'
 require 'yaml'
 
 $ARV_API_SERVER_DIR = File.expand_path('../../../../services/api', __FILE__)
+SERVER_PID_PATH = 'tmp/pids/server.pid'
 
 class ActionDispatch::IntegrationTest
   # Make the Capybara DSL available in all integration tests
@@ -32,14 +33,11 @@ class ActionDispatch::IntegrationTest
 end
 
 class IntegrationTestRunner < MiniTest::Unit
-  # Don't try to re-use the current Bundle environment when we launch the
-  # API server.
-  @@APIENV = {
-    'BUNDLE_BIN_PATH' => nil,
-    'BUNDLE_GEMFILE' => nil,
-    'RUBYLIB' => nil,
-    'RUBYOPT' => nil,
-  }
+  # Make a hash that unsets Bundle's environment variables.
+  # We'll use this environment when we launch Bundle commands in the API
+  # server.  Otherwise, those commands will try to use Workbench's gems, etc.
+  @@APIENV = ENV.map { |(key, val)| (key =~ /^BUNDLE_/) ? [key, nil] : nil }.
+    compact.to_h
 
   def _system(*cmd)
     if not system(@@APIENV, *cmd)
@@ -53,12 +51,11 @@ class IntegrationTestRunner < MiniTest::Unit
       _system('bundle', 'exec', 'rake', 'db:test:load')
       _system('bundle', 'exec', 'rake', 'db:fixtures:load')
       _system('bundle', 'exec', 'rails', 'server', '-d')
-      pid_path = 'tmp/pids/server.pid'
       timeout = Time.now.tv_sec + 5
-      while (not File.exists? pid_path) and (Time.now.tv_sec < timeout)
+      while (not File.exists? SERVER_PID_PATH) and (Time.now.tv_sec < timeout)
         sleep 0.2
       end
-      IO.read(pid_path).to_i
+      IO.read(SERVER_PID_PATH).to_i
     end
     begin
       super(args)