Merge pull request #2597 from MikeMcQuaid/vendor-gems

Vendor all Homebrew's gems.

2 files changed, 4 insertions, 8 deletions

diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
index ae1854f58..3a36f1853 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
@@ -89,12 +89,10 @@ RSpec.shared_context "integration test" do
     ruby_args << "-rtest/support/helper/integration_mocks"
     ruby_args << (HOMEBREW_LIBRARY_PATH/"brew.rb").resolved_path.to_s
 
-    Bundler.with_original_env do
-      stdout, stderr, status = Open3.capture3(env, RUBY_PATH, *ruby_args, *args)
-      $stdout.print stdout
-      $stderr.print stderr
-      status
-    end
+    stdout, stderr, status = Open3.capture3(env, RUBY_PATH, *ruby_args, *args)
+    $stdout.print stdout
+    $stderr.print stderr
+    status
   end
 
   def setup_test_formula(name, content = nil)
diff --git a/Library/Homebrew/test/support/lib/config.rb b/Library/Homebrew/test/support/lib/config.rb
index 3a0a76722..fb5c210fe 100644
--- a/Library/Homebrew/test/support/lib/config.rb
+++ b/Library/Homebrew/test/support/lib/config.rb
@@ -2,8 +2,6 @@ unless ENV["HOMEBREW_BREW_FILE"]
   raise "HOMEBREW_BREW_FILE was not exported! Please call bin/brew directly!"
 end
 
-require "constants"
-
 require "tmpdir"
 require "pathname"