s/last_command.stderr/err/

23 files changed, 84 insertions, 84 deletions

diff --git a/spec/bundler/cli_spec.rb b/spec/bundler/cli_spec.rb
index 649e304de2..9b3f9a7129 100644
--- a/spec/bundler/cli_spec.rb
+++ b/spec/bundler/cli_spec.rb
@@ -30,7 +30,7 @@ RSpec.describe "bundle executable" do
   context "with no arguments" do
     it "prints a concise help message", :bundler => "3" do
       bundle! ""
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
       expect(last_command.stdout).to include("Bundler version #{Bundler::VERSION}").
         and include("\n\nBundler commands:\n\n").
         and include("\n\n  Primary commands:\n").
@@ -125,7 +125,7 @@ RSpec.describe "bundle executable" do
       let(:latest_version) { "222.0" }
       it "prints the version warning" do
         bundle "fail"
-        expect(last_command.stderr).to start_with(<<-EOS.strip)
+        expect(err).to start_with(<<-EOS.strip)
 The latest bundler is #{latest_version}, but you are currently running #{bundler_version}.
 To install the latest version, run `gem install bundler`
         EOS
@@ -150,7 +150,7 @@ To install the latest version, run `gem install bundler`
         let(:latest_version) { "222.0.0.pre.4" }
         it "prints the version warning" do
           bundle "fail"
-          expect(last_command.stderr).to start_with(<<-EOS.strip)
+          expect(err).to start_with(<<-EOS.strip)
 The latest bundler is #{latest_version}, but you are currently running #{bundler_version}.
 To install the latest version, run `gem install bundler --pre`
           EOS
diff --git a/spec/bundler/friendly_errors_spec.rb b/spec/bundler/friendly_errors_spec.rb
index 4ca1e543c1..07ec196b86 100644
--- a/spec/bundler/friendly_errors_spec.rb
+++ b/spec/bundler/friendly_errors_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe Bundler, "friendly errors" do
 
       bundle :install, :env => { "DEBUG" => true }
 
-      expect(last_command.stderr).to include("Failed to load #{home(".gemrc")}")
+      expect(err).to include("Failed to load #{home(".gemrc")}")
       expect(exitstatus).to eq(0) if exitstatus
     end
   end
diff --git a/spec/commands/binstubs_spec.rb b/spec/commands/binstubs_spec.rb
index ce9eba248c..d2a22f3059 100644
--- a/spec/commands/binstubs_spec.rb
+++ b/spec/commands/binstubs_spec.rb
@@ -88,7 +88,7 @@ RSpec.describe "bundle binstubs <gem>" do
 
         sys_exec "bin/rackup"
 
-        expect(last_command.stderr).to include("was not generated by Bundler")
+        expect(err).to include("was not generated by Bundler")
       end
     end
 
@@ -135,7 +135,7 @@ RSpec.describe "bundle binstubs <gem>" do
         it "runs the correct version of bundler" do
           sys_exec "#{bundled_app("bin/bundle")} install", "BUNDLER_VERSION" => "999.999.999"
           expect(exitstatus).to eq(42) if exitstatus
-          expect(last_command.stderr).to include("Activating bundler (999.999.999) failed:").
+          expect(err).to include("Activating bundler (999.999.999) failed:").
             and include("To install the version of bundler this project requires, run `gem install bundler -v '999.999.999'`")
         end
       end
@@ -145,7 +145,7 @@ RSpec.describe "bundle binstubs <gem>" do
           lockfile lockfile.gsub(system_bundler_version, "999.999.999")
           sys_exec "#{bundled_app("bin/bundle")} install"
           expect(exitstatus).to eq(42) if exitstatus
-          expect(last_command.stderr).to include("Activating bundler (999.999.999) failed:").
+          expect(err).to include("Activating bundler (999.999.999) failed:").
             and include("To install the version of bundler this project requires, run `gem install bundler -v '999.999.999'`")
         end
 
@@ -154,7 +154,7 @@ RSpec.describe "bundle binstubs <gem>" do
           lockfile lockfile.gsub(system_bundler_version, "44.0")
           sys_exec "#{bundled_app("bin/bundle")} install"
           expect(exitstatus).to eq(42) if exitstatus
-          expect(last_command.stderr).to include("Activating bundler (44.0) failed:").
+          expect(err).to include("Activating bundler (44.0) failed:").
             and include("To install the version of bundler this project requires, run `gem install bundler -v '44.0'`")
         end
 
@@ -163,7 +163,7 @@ RSpec.describe "bundle binstubs <gem>" do
           lockfile lockfile.gsub(system_bundler_version, "2.12.0.a")
           sys_exec "#{bundled_app("bin/bundle")} install"
           expect(exitstatus).to eq(42) if exitstatus
-          expect(last_command.stderr).to include("Activating bundler (2.12.0.a) failed:").
+          expect(err).to include("Activating bundler (2.12.0.a) failed:").
             and include("To install the version of bundler this project requires, run `gem install bundler -v '2.12.0.a'`")
         end
       end
@@ -179,7 +179,7 @@ RSpec.describe "bundle binstubs <gem>" do
         it "calls through to the explicit bundler version" do
           sys_exec "#{bundled_app("bin/bundle")} update --bundler=999.999.999"
           expect(exitstatus).to eq(42) if exitstatus
-          expect(last_command.stderr).to include("Activating bundler (999.999.999) failed:").
+          expect(err).to include("Activating bundler (999.999.999) failed:").
             and include("To install the version of bundler this project requires, run `gem install bundler -v '999.999.999'`")
         end
       end
@@ -205,7 +205,7 @@ RSpec.describe "bundle binstubs <gem>" do
           it "attempts to load that version", :ruby_repo do
             sys_exec bundled_app("bin/rackup").to_s
             expect(exitstatus).to eq(42) if exitstatus
-            expect(last_command.stderr).to include("Activating bundler (999.999.999) failed:").
+            expect(err).to include("Activating bundler (999.999.999) failed:").
               and include("To install the version of bundler this project requires, run `gem install bundler -v '999.999.999'`")
           end
         end
diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb
index 1d84669a75..9d849f9f49 100644
--- a/spec/commands/exec_spec.rb
+++ b/spec/commands/exec_spec.rb
@@ -88,14 +88,14 @@ RSpec.describe "bundle exec" do
     sys_exec "#{Gem.ruby} #{command.path}"
 
     expect(out).to eq("")
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
   end
 
   it "accepts --keep-file-descriptors" do
     install_gemfile ""
     bundle "exec --keep-file-descriptors echo foobar"
 
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
   end
 
   it "can run a command named --verbose" do
@@ -156,7 +156,7 @@ RSpec.describe "bundle exec" do
         bundle! "exec irb --version"
 
         expect(out).to include(default_irb_version)
-        expect(last_command.stderr).to be_empty
+        expect(err).to be_empty
       end
     end
 
@@ -182,7 +182,7 @@ RSpec.describe "bundle exec" do
         bundle! "exec irb --version"
 
         expect(out).to include(specified_irb_version)
-        expect(last_command.stderr).to be_empty
+        expect(err).to be_empty
       end
     end
 
@@ -212,7 +212,7 @@ RSpec.describe "bundle exec" do
 
       it "uses resolved version" do
         expect(out).to include(indirect_irb_version)
-        expect(last_command.stderr).to be_empty
+        expect(err).to be_empty
       end
     end
   end
@@ -305,7 +305,7 @@ RSpec.describe "bundle exec" do
     [true, false].each do |l|
       bundle! "config set disable_exec_load #{l}"
       bundle "exec rackup"
-      expect(last_command.stderr).to include "can't find executable rackup for gem rack. rack is not currently included in the bundle, perhaps you meant to add it to your Gemfile?"
+      expect(err).to include "can't find executable rackup for gem rack. rack is not currently included in the bundle, perhaps you meant to add it to your Gemfile?"
     end
   end
 
@@ -523,8 +523,8 @@ RSpec.describe "bundle exec" do
 
       bundle "exec irb"
 
-      expect(last_command.stderr).to match("The gemspec at #{lib_path("foo-1.0").join("foo.gemspec")} is not valid")
-      expect(last_command.stderr).to match('"TODO" is not a summary')
+      expect(err).to match("The gemspec at #{lib_path("foo-1.0").join("foo.gemspec")} is not valid")
+      expect(err).to match('"TODO" is not a summary')
     end
   end
 
@@ -585,7 +585,7 @@ RSpec.describe "bundle exec" do
       it "like a normally executed executable" do
         subject
         expect(exitstatus).to eq(exit_code) if exitstatus
-        expect(last_command.stderr).to eq(expected_err)
+        expect(err).to eq(expected_err)
         expect(last_command.stdout).to eq(expected)
       end
     end
@@ -857,7 +857,7 @@ __FILE__: #{path.to_s.inspect}
 
         # sanity check that we get the newer, custom version without bundler
         sys_exec("#{Gem.ruby} #{file}")
-        expect(last_command.stderr).to include("custom openssl should not be loaded")
+        expect(err).to include("custom openssl should not be loaded")
       end
     end
   end
diff --git a/spec/commands/package_spec.rb b/spec/commands/package_spec.rb
index 6cd8e3f85a..b9cc079c5c 100644
--- a/spec/commands/package_spec.rb
+++ b/spec/commands/package_spec.rb
@@ -278,7 +278,7 @@ RSpec.describe "bundle install with gem sources" do
       end
 
       bundle :install
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
       expect(the_bundle).to include_gems "rack 1.0"
     end
 
diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb
index 918dbabfbe..2df6127d51 100644
--- a/spec/install/deploy_spec.rb
+++ b/spec/install/deploy_spec.rb
@@ -366,7 +366,7 @@ RSpec.describe "install with --deployment or --frozen" do
       G
 
       expect(the_bundle).not_to include_gems "rack 1.0.0"
-      expect(last_command.stderr).to include strip_whitespace(<<-E).strip
+      expect(err).to include strip_whitespace(<<-E).strip
 The dependencies in your gemfile changed
 
 You have added to the Gemfile:
diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb
index a5b2d03864..89207dc2a6 100644
--- a/spec/install/gemfile/git_spec.rb
+++ b/spec/install/gemfile/git_spec.rb
@@ -204,7 +204,7 @@ RSpec.describe "bundle install with git sources" do
           gem "foo"
         end
       G
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
 
       run <<-RUBY
         require 'foo'
@@ -234,7 +234,7 @@ RSpec.describe "bundle install with git sources" do
           gem "foo"
         end
       G
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
 
       run! <<-RUBY
         require 'foo'
@@ -270,7 +270,7 @@ RSpec.describe "bundle install with git sources" do
           gem "foo"
         end
       G
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
 
       run! <<-RUBY
         require 'foo'
@@ -515,7 +515,7 @@ RSpec.describe "bundle install with git sources" do
       bundle solution
       bundle :install
 
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
     end
 
     it "explodes and gives correct solution if branch is not given on install" do
@@ -537,7 +537,7 @@ RSpec.describe "bundle install with git sources" do
       bundle solution
       bundle :install
 
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
     end
 
     it "does not explode if disable_local_branch_check is given" do
diff --git a/spec/install/gemfile/path_spec.rb b/spec/install/gemfile/path_spec.rb
index 54a41b576f..c6856ac974 100644
--- a/spec/install/gemfile/path_spec.rb
+++ b/spec/install/gemfile/path_spec.rb
@@ -313,7 +313,7 @@ RSpec.describe "bundle install with explicit source paths" do
     install_gemfile <<-G
       gem 'foo', '1.0', :path => "#{lib_path("foo-1.0")}"
     G
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
   end
 
   it "removes the .gem file after installing" do
diff --git a/spec/install/gems/flex_spec.rb b/spec/install/gems/flex_spec.rb
index 7a22ab2eb1..d15841124a 100644
--- a/spec/install/gems/flex_spec.rb
+++ b/spec/install/gems/flex_spec.rb
@@ -188,7 +188,7 @@ RSpec.describe "bundle flex_install" do
       ruby <<-RUBY
         require 'bundler/setup'
       RUBY
-      expect(last_command.stderr).to match(/could not find gem 'rack-obama/i)
+      expect(err).to match(/could not find gem 'rack-obama/i)
     end
 
     it "suggests bundle update when the Gemfile requires different versions than the lock" do
diff --git a/spec/install/gems/resolving_spec.rb b/spec/install/gems/resolving_spec.rb
index 1f3b06a480..7bab676cea 100644
--- a/spec/install/gems/resolving_spec.rb
+++ b/spec/install/gems/resolving_spec.rb
@@ -77,7 +77,7 @@ RSpec.describe "bundle install with install-time dependencies" do
 
         bundle :install, :env => { "DEBUG_RESOLVER" => "1" }
 
-        expect(last_command.stderr).to include("Creating possibility state for net_c")
+        expect(err).to include("Creating possibility state for net_c")
       end
     end
 
@@ -91,7 +91,7 @@ RSpec.describe "bundle install with install-time dependencies" do
 
         bundle :install, :env => { "DEBUG_RESOLVER_TREE" => "1" }
 
-        expect(last_command.stderr).to include(" net_b").
+        expect(err).to include(" net_b").
           and include("Starting resolution").
           and include("Finished resolution").
           and include("Attempting to activate")
diff --git a/spec/install/gems/standalone_spec.rb b/spec/install/gems/standalone_spec.rb
index e2cfe5ec4c..2c279fe1b4 100644
--- a/spec/install/gems/standalone_spec.rb
+++ b/spec/install/gems/standalone_spec.rb
@@ -176,7 +176,7 @@ RSpec.shared_examples "bundle install --standalone" do
       end
 
       expect(last_command.stdout).to eq("2.3.2")
-      expect(last_command.stderr).to eq("ZOMG LOAD ERROR")
+      expect(err).to eq("ZOMG LOAD ERROR")
     end
 
     it "allows --without to limit the groups used in a standalone" do
@@ -194,7 +194,7 @@ RSpec.shared_examples "bundle install --standalone" do
       end
 
       expect(last_command.stdout).to eq("2.3.2")
-      expect(last_command.stderr).to eq("ZOMG LOAD ERROR")
+      expect(err).to eq("ZOMG LOAD ERROR")
     end
 
     it "allows --path to change the location of the standalone bundle", :bundler => "< 3" do
@@ -246,7 +246,7 @@ RSpec.shared_examples "bundle install --standalone" do
       end
 
       expect(last_command.stdout).to eq("2.3.2")
-      expect(last_command.stderr).to eq("ZOMG LOAD ERROR")
+      expect(err).to eq("ZOMG LOAD ERROR")
     end
   end
 
diff --git a/spec/install/gemspecs_spec.rb b/spec/install/gemspecs_spec.rb
index c9878ccae8..55c7a67b4b 100644
--- a/spec/install/gemspecs_spec.rb
+++ b/spec/install/gemspecs_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe "bundle install" do
         gem "yaml_spec"
       G
       bundle :install
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
     end
 
     it "still installs correctly when using path" do
@@ -23,7 +23,7 @@ RSpec.describe "bundle install" do
       install_gemfile <<-G
         gem 'yaml_spec', :path => "#{lib_path("yaml_spec-1.0")}"
       G
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
     end
   end
 
diff --git a/spec/install/path_spec.rb b/spec/install/path_spec.rb
index 0947ed9539..aac697fb23 100644
--- a/spec/install/path_spec.rb
+++ b/spec/install/path_spec.rb
@@ -226,7 +226,7 @@ RSpec.describe "bundle install" do
       vendored_gems("extensions").rmtree
 
       run "require 'very_simple_binary_c'"
-      expect(last_command.stderr).to include("Bundler::GemNotFound")
+      expect(err).to include("Bundler::GemNotFound")
 
       bundle :install, forgotten_command_line_options(:path => "./vendor/bundle")
 
diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb
index 072a8d81f2..0842a94fc5 100644
--- a/spec/lock/lockfile_spec.rb
+++ b/spec/lock/lockfile_spec.rb
@@ -183,7 +183,7 @@ RSpec.describe "the lockfile format" do
                       "than the version that created the lockfile (9999999.1.0). " \
                       "We suggest you to upgrade to the version that created the " \
                       "lockfile by running `gem install bundler:9999999.1.0`."
-    expect(last_command.stderr).to include warning_message
+    expect(err).to include warning_message
 
     lockfile_should_be <<-G
       GEM
@@ -293,7 +293,7 @@ RSpec.describe "the lockfile format" do
       G
     end
 
-    expect(last_command.stderr).to include(
+    expect(err).to include(
       "Warning: the lockfile is being updated to Bundler " \
       "9999999, after which you will be unable to return to Bundler 1."
     )
@@ -340,7 +340,7 @@ RSpec.describe "the lockfile format" do
         gem "rack"
       G
 
-      expect(last_command.stderr).to include(
+      expect(err).to include(
         "Warning: the lockfile is being updated to Bundler " \
         "9999999, after which you will be unable to return to Bundler 1."
       )
diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb
index f9c815aee1..219a6bc85d 100644
--- a/spec/quality_spec.rb
+++ b/spec/quality_spec.rb
@@ -225,9 +225,9 @@ RSpec.describe "The library itself" do
         end
 
         # there's no way around this warning
-        last_command.stderr.sub!(/^YAML safe loading.*/, "")
+        err.sub!(/^YAML safe loading.*/, "")
 
-        expect(last_command.stderr).to be_empty, "bundler should build as a gem without warnings, but\n#{err}"
+        expect(err).to be_empty, "bundler should build as a gem without warnings, but\n#{err}"
       ensure
         # clean up the .gem generated
         FileUtils.rm("bundler-#{Bundler::VERSION}.gem")
diff --git a/spec/realworld/edgecases_spec.rb b/spec/realworld/edgecases_spec.rb
index a3662c91e7..6468ee7f1e 100644
--- a/spec/realworld/edgecases_spec.rb
+++ b/spec/realworld/edgecases_spec.rb
@@ -204,7 +204,7 @@ RSpec.describe "real world edgecases", :realworld => true, :sometimes => true do
     bundle "config set --local path vendor/bundle"
     bundle! :install
     expect(err).not_to include("Could not find rake")
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
   end
 
   it "checks out git repos when the lockfile is corrupted" do
@@ -331,7 +331,7 @@ RSpec.describe "real world edgecases", :realworld => true, :sometimes => true do
     L
 
     bundle! :lock
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
   end
 
   it "outputs a helpful error message when gems have invalid gemspecs" do
diff --git a/spec/runtime/gem_tasks_spec.rb b/spec/runtime/gem_tasks_spec.rb
index 3c69f8a800..de72869dc3 100644
--- a/spec/runtime/gem_tasks_spec.rb
+++ b/spec/runtime/gem_tasks_spec.rb
@@ -22,7 +22,7 @@ RSpec.describe "require 'bundler/gem_tasks'", :ruby_repo do
       sys_exec "#{rake} -T"
     end
 
-    expect(last_command.stderr).to eq("")
+    expect(err).to eq("")
     expected_tasks = [
       "rake build",
       "rake clean",
diff --git a/spec/runtime/inline_spec.rb b/spec/runtime/inline_spec.rb
index 96a3fa09ae..4c1cc35a4a 100644
--- a/spec/runtime/inline_spec.rb
+++ b/spec/runtime/inline_spec.rb
@@ -67,7 +67,7 @@ RSpec.describe "bundler/inline#gemfile" do
       puts "success"
     RUBY
 
-    expect(last_command.stderr).to include "Could not find gem 'eleven'"
+    expect(err).to include "Could not find gem 'eleven'"
     expect(out).not_to include "success"
 
     script <<-RUBY
@@ -90,7 +90,7 @@ RSpec.describe "bundler/inline#gemfile" do
     expect(out).to include("Installing activesupport")
     err.gsub! %r{.*lib/sinatra/base\.rb:\d+: warning: constant ::Fixnum is deprecated$}, ""
     err.strip!
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
     expect(exitstatus).to be_zero if exitstatus
   end
 
@@ -134,7 +134,7 @@ RSpec.describe "bundler/inline#gemfile" do
 
       puts "success"
     RUBY
-    expect(last_command.stderr).to include "Unknown options: arglebargle"
+    expect(err).to include "Unknown options: arglebargle"
     expect(out).not_to include "success"
   end
 
@@ -165,7 +165,7 @@ RSpec.describe "bundler/inline#gemfile" do
     RUBY
 
     expect(out).to eq("1.0.0")
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
     expect(exitstatus).to be_zero if exitstatus
   end
 
@@ -183,7 +183,7 @@ RSpec.describe "bundler/inline#gemfile" do
     RUBY
 
     expect(out).to eq("1.0.0\n2.0.0")
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
     expect(exitstatus).to be_zero if exitstatus
   end
 
@@ -203,7 +203,7 @@ RSpec.describe "bundler/inline#gemfile" do
     RUBY
 
     expect(out).to eq("two\nfour")
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
     expect(exitstatus).to be_zero if exitstatus
   end
 
@@ -240,7 +240,7 @@ RSpec.describe "bundler/inline#gemfile" do
       RUBY
     end
 
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
     expect(exitstatus).to be_zero if exitstatus
   end
 
@@ -258,7 +258,7 @@ RSpec.describe "bundler/inline#gemfile" do
       RUBY
     end
 
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
     expect(exitstatus).to be_zero if exitstatus
   end
 
diff --git a/spec/runtime/require_spec.rb b/spec/runtime/require_spec.rb
index c9cfa199d3..f149c9d489 100644
--- a/spec/runtime/require_spec.rb
+++ b/spec/runtime/require_spec.rb
@@ -136,8 +136,8 @@ RSpec.describe "Bundler.require" do
     G
 
     run "Bundler.require"
-    expect(last_command.stderr).to match("error while trying to load the gem 'faulty'")
-    expect(last_command.stderr).to match("Gem Internal Error Message")
+    expect(err).to match("error while trying to load the gem 'faulty'")
+    expect(err).to match("Gem Internal Error Message")
   end
 
   it "doesn't swallow the error when the library has an unrelated error" do
@@ -198,7 +198,7 @@ RSpec.describe "Bundler.require" do
       RUBY
       ruby(cmd)
 
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
     end
 
     it "does not mangle explicitly given requires" do
@@ -432,7 +432,7 @@ RSpec.describe "Bundler.require with platform specific dependencies" do
     G
 
     run "Bundler.require"
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
   end
 
   it "requires gems pinned to multiple platforms, including the current one" do
@@ -447,6 +447,6 @@ RSpec.describe "Bundler.require with platform specific dependencies" do
     run "Bundler.require; puts RACK"
 
     expect(out).to eq("1.0.0")
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
   end
 end
diff --git a/spec/runtime/setup_spec.rb b/spec/runtime/setup_spec.rb
index c81baa34ea..3aba1efa6d 100644
--- a/spec/runtime/setup_spec.rb
+++ b/spec/runtime/setup_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe "Bundler.setup" do
         require 'rack'
         puts RACK
       RUBY
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
       expect(out).to eq("1.0.0")
     end
   end
@@ -45,7 +45,7 @@ RSpec.describe "Bundler.setup" do
           puts "WIN"
         end
       RUBY
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
       expect(out).to eq("WIN")
     end
 
@@ -58,7 +58,7 @@ RSpec.describe "Bundler.setup" do
         require 'rack'
         puts RACK
       RUBY
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
       expect(out).to eq("1.0.0")
     end
 
@@ -72,7 +72,7 @@ RSpec.describe "Bundler.setup" do
         require 'rack'
         puts RACK
       RUBY
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
       expect(out).to eq("1.0.0")
     end
 
@@ -90,7 +90,7 @@ RSpec.describe "Bundler.setup" do
           puts "FAIL"
         end
       RUBY
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
       expect(out).to match("WIN")
     end
 
@@ -104,8 +104,8 @@ RSpec.describe "Bundler.setup" do
         puts "FAIL"
       RUBY
 
-      expect(last_command.stderr).to match("rack")
-      expect(last_command.stderr).to match("LoadError")
+      expect(err).to match("rack")
+      expect(err).to match("LoadError")
       expect(out).not_to match("FAIL")
     end
   end
@@ -141,7 +141,7 @@ RSpec.describe "Bundler.setup" do
       load_path = out.split("\n")
       rack_load_order = load_path.index {|path| path.include?("rack") }
 
-      expect(last_command.stderr).to eq("")
+      expect(err).to eq("")
       expect(load_path).to include(a_string_ending_with("dash_i_dir"), "rubylib_dir")
       expect(rack_load_order).to be > 0
     end
@@ -364,7 +364,7 @@ RSpec.describe "Bundler.setup" do
           end
         R
 
-        expect(last_command.stderr).to be_empty
+        expect(err).to be_empty
       end
 
       it "replaces #gem but raises when the version is wrong" do
@@ -390,7 +390,7 @@ RSpec.describe "Bundler.setup" do
           end
         R
 
-        expect(last_command.stderr).to be_empty
+        expect(err).to be_empty
       end
     end
 
@@ -449,7 +449,7 @@ RSpec.describe "Bundler.setup" do
 
     it "provides a useful exception when the git repo is not checked out yet" do
       run "1"
-      expect(last_command.stderr).to match(/the git source #{lib_path('rack-1.0.0')} is not yet checked out. Please run `bundle install`/i)
+      expect(err).to match(/the git source #{lib_path('rack-1.0.0')} is not yet checked out. Please run `bundle install`/i)
     end
 
     it "does not hit the git binary if the lockfile is available and up to date" do
@@ -535,7 +535,7 @@ RSpec.describe "Bundler.setup" do
 
       FileUtils.rm_rf(lib_path("local-rack"))
       run "require 'rack'"
-      expect(last_command.stderr).to match(/Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/)
+      expect(err).to match(/Cannot use local override for rack-0.8 because #{Regexp.escape(lib_path('local-rack').to_s)} does not exist/)
     end
 
     it "explodes if branch is not given on runtime" do
@@ -557,7 +557,7 @@ RSpec.describe "Bundler.setup" do
       G
 
       run "require 'rack'"
-      expect(last_command.stderr).to match(/because :branch is not specified in Gemfile/)
+      expect(err).to match(/because :branch is not specified in Gemfile/)
     end
 
     it "explodes on different branches on runtime" do
@@ -579,7 +579,7 @@ RSpec.describe "Bundler.setup" do
       G
 
       run "require 'rack'"
-      expect(last_command.stderr).to match(/is using branch master but Gemfile specifies changed/)
+      expect(err).to match(/is using branch master but Gemfile specifies changed/)
     end
 
     it "explodes on refs with different branches on runtime" do
@@ -599,7 +599,7 @@ RSpec.describe "Bundler.setup" do
 
       bundle %(config set local.rack #{lib_path("local-rack")})
       run "require 'rack'"
-      expect(last_command.stderr).to match(/is using branch master but Gemfile specifies nonexistant/)
+      expect(err).to match(/is using branch master but Gemfile specifies nonexistant/)
     end
   end
 
@@ -711,7 +711,7 @@ end
     ENV["GEM_HOME"] = ""
     bundle %(exec ruby -e "require 'set'")
 
-    expect(last_command.stderr).to be_empty
+    expect(err).to be_empty
   end
 
   describe "$MANPATH" do
@@ -878,7 +878,7 @@ end
           require 'foo'
         R
       end
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
     end
 
     it "should make sure the Bundler.root is really included in the path relative to the Gemfile" do
@@ -903,7 +903,7 @@ end
         R
       end
 
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
     end
   end
 
@@ -1053,7 +1053,7 @@ end
         Bundler.load
       RUBY
 
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
       expect(out).to eq("")
     end
   end
@@ -1065,7 +1065,7 @@ end
       G
 
       bundle %(exec ruby -e "require 'bundler'; Bundler.setup")
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
     end
   end
 
@@ -1355,7 +1355,7 @@ end
       RUBY
 
       expect(last_command.stdboth).not_to include "FAIL"
-      expect(last_command.stderr).to include "private method `gem'"
+      expect(err).to include "private method `gem'"
     end
 
     it "keeps Kernel#require private" do
@@ -1371,7 +1371,7 @@ end
       RUBY
 
       expect(last_command.stdboth).not_to include "FAIL"
-      expect(last_command.stderr).to include "private method `require'"
+      expect(err).to include "private method `require'"
     end
   end
 end
diff --git a/spec/runtime/with_unbundled_env_spec.rb b/spec/runtime/with_unbundled_env_spec.rb
index b4503cba32..69a0dd731f 100644
--- a/spec/runtime/with_unbundled_env_spec.rb
+++ b/spec/runtime/with_unbundled_env_spec.rb
@@ -46,7 +46,7 @@ RSpec.describe "Bundler.with_env helpers" do
         build_bundler_context
         bundle! "exec '#{Gem.ruby}' #{bundled_app("exe.rb")} 2"
       end
-      expect(last_command.stderr).to eq <<-EOS.strip
+      expect(err).to eq <<-EOS.strip
 2 false
 1 true
 0 true
diff --git a/spec/support/helpers.rb b/spec/support/helpers.rb
index 53459669e6..cb03022330 100644
--- a/spec/support/helpers.rb
+++ b/spec/support/helpers.rb
@@ -51,7 +51,7 @@ module Spec
     MAJOR_DEPRECATION = /^\[DEPRECATED\]\s*/.freeze
 
     def err_without_deprecations
-      last_command.stderr.gsub(/#{MAJOR_DEPRECATION}.+[\n]?/, "")
+      err.gsub(/#{MAJOR_DEPRECATION}.+[\n]?/, "")
     end
 
     def deprecations
diff --git a/spec/update/git_spec.rb b/spec/update/git_spec.rb
index c776a8998e..bc230a3575 100644
--- a/spec/update/git_spec.rb
+++ b/spec/update/git_spec.rb
@@ -88,7 +88,7 @@ RSpec.describe "bundle update" do
         gem "foo", "1.0", :git => "#{lib_path("foo_two")}"
       G
 
-      expect(last_command.stderr).to be_empty
+      expect(err).to be_empty
       expect(out).to include("Fetching #{lib_path}/foo_two")
       expect(out).to include("Bundle complete!")
     end