From 259c3b7b2e77b17590beef58b519f57a7d9b41e7 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Fri, 21 Mar 2014 11:34:05 -0400 Subject: [PATCH] workbench: Expound Bundle+integration interaction. Unsurprisingly, I don't write my best code and comments when I'm frantically trying to fix the build. --- apps/workbench/test/integration_helper.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb index 3cd485797e..08d60c38aa 100644 --- a/apps/workbench/test/integration_helper.rb +++ b/apps/workbench/test/integration_helper.rb @@ -33,9 +33,10 @@ 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 = ENV.map { |item| (item[0] =~ /^BUNDLE_/) ? [item[0], nil] : 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) -- 2.30.2