Merge pull request #14025 from MikeMcQuaid/bundler_with_unbundled_env

integration_test: fix Bundler deprecation.
This commit is contained in:
Mike McQuaid 2022-10-20 14:01:42 +01:00 committed by GitHub
commit f33b8511b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -116,7 +116,7 @@ RSpec.shared_context "integration test" do # rubocop:disable RSpec/ContextWordin
ruby_args << (HOMEBREW_LIBRARY_PATH/"brew.rb").resolved_path.to_s
end
Bundler.with_clean_env do
Bundler.with_unbundled_env do
stdout, stderr, status = Open3.capture3(env, *@ruby_args, *args)
$stdout.print stdout
$stderr.print stderr
@ -125,7 +125,7 @@ RSpec.shared_context "integration test" do # rubocop:disable RSpec/ContextWordin
end
def brew_sh(*args)
Bundler.with_clean_env do
Bundler.with_unbundled_env do
stdout, stderr, status = Open3.capture3("#{ENV.fetch("HOMEBREW_PREFIX")}/bin/brew", *args)
$stdout.print stdout
$stderr.print stderr