diff options
| author | Mike McQuaid | 2017-05-07 13:52:57 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2017-05-07 13:52:57 +0100 |
| commit | ee253e465b8e2f5acdb53daf572311e87055e082 (patch) | |
| tree | 59d478b0a91845c3706e6cd312e7d3469c0a594a /Library/Homebrew/test/support | |
| parent | 6edf9382bcc1240ad6f97c8b752cfe56cef9965d (diff) | |
| download | brew-ee253e465b8e2f5acdb53daf572311e87055e082.tar.bz2 | |
Vendor all Homebrew's gems.
Homebrew's actually ended up using a fair few gems. While we want to
avoid Bundler at runtime (and this PR still does that, in fact uses
Bundler even less at runtime than it did before) writing our own version
to use at build-time seems redundant.
Diffstat (limited to 'Library/Homebrew/test/support')
| -rw-r--r-- | Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb | 10 | ||||
| -rw-r--r-- | Library/Homebrew/test/support/lib/config.rb | 2 |
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" |
