clean up some missed some @exitstatus

5 files changed, 16 insertions, 16 deletions

diff --git a/spec/commands/check_spec.rb b/spec/commands/check_spec.rb
index 4291914665..6d047597d5 100644
--- a/spec/commands/check_spec.rb
+++ b/spec/commands/check_spec.rb
@@ -8,7 +8,7 @@ describe "bundle check" do
     G
 
     bundle :check
-    expect(@exitstatus).to eq(0)
+    expect(exitstatus).to eq(0) if exitstatus
     expect(out).to eq("The Gemfile's dependencies are satisfied")
   end
 
@@ -68,7 +68,7 @@ describe "bundle check" do
     G
 
     bundle :check
-    expect(@exitstatus).to be > 0
+    expect(exitstatus).to be > 0 if exitstatus
     expect(out).to include("Bundler can't satisfy your Gemfile's dependencies.")
   end
 
@@ -102,7 +102,7 @@ describe "bundle check" do
 
     bundle "install --without foo"
     bundle "check"
-    expect(@exitstatus).to eq(0)
+    expect(exitstatus).to eq(0) if exitstatus
     expect(out).to include("The Gemfile's dependencies are satisfied")
   end
 
@@ -121,7 +121,7 @@ describe "bundle check" do
 
     bundle "check"
     expect(out).to include("* rack (1.0.0)")
-    expect(@exitstatus).to eq(1)
+    expect(exitstatus).to eq(1) if exitstatus
   end
 
   it "ignores missing gems restricted to other platforms" do
@@ -188,13 +188,13 @@ describe "bundle check" do
 
   it "outputs an error when the default Gemfile is not found" do
     bundle :check
-    expect(@exitstatus).to eq(10)
+    expect(exitstatus).to eq(10) if exitstatus
     expect(out).to include("Could not locate Gemfile")
   end
 
   it "does not output fatal error message" do
     bundle :check
-    expect(@exitstatus).to eq(10)
+    expect(exitstatus).to eq(10) if exitstatus
     expect(out).not_to include("Unfortunately, a fatal error has occurred. ")
   end
 
@@ -241,14 +241,14 @@ describe "bundle check" do
 
     it "returns success" do
       bundle "check --path vendor/bundle"
-      expect(@exitstatus).to eq(0)
+      expect(exitstatus).to eq(0) if exitstatus
       expect(out).to eq("The Gemfile's dependencies are satisfied")
     end
 
     it "should write to .bundle/config" do
       bundle "check --path vendor/bundle"
       bundle "check"
-      expect(@exitstatus).to eq(0)
+      expect(exitstatus).to eq(0) if exitstatus
     end
   end
 
@@ -264,7 +264,7 @@ describe "bundle check" do
     it "returns success when the Gemfile is satisfied" do
       bundle :install
       bundle :check
-      expect(@exitstatus).to eq(0)
+      expect(exitstatus).to eq(0) if exitstatus
       expect(out).to eq("The Gemfile's dependencies are satisfied")
     end
 
diff --git a/spec/install/gems/standalone_spec.rb b/spec/install/gems/standalone_spec.rb
index 36edb40ed6..08a20a2a23 100644
--- a/spec/install/gems/standalone_spec.rb
+++ b/spec/install/gems/standalone_spec.rb
@@ -188,7 +188,7 @@ describe "bundle install --standalone" do
       it "should run without errors" do
         bundle "install --standalone", :artifice => "endpoint"
 
-        expect(@exitstatus).to eq(0)
+        expect(exitstatus).to eq(0) if exitstatus
       end
 
       it "still makes the gems available to normal bundler" do
diff --git a/spec/install/gems/win32_spec.rb b/spec/install/gems/win32_spec.rb
index 947851b930..6d1ac85675 100644
--- a/spec/install/gems/win32_spec.rb
+++ b/spec/install/gems/win32_spec.rb
@@ -21,6 +21,6 @@ describe "bundle install with win32-generated lockfile" do
 
       gem "rack"
     G
-    expect(@exitstatus).to eq(0)
+    expect(exitstatus).to eq(0) if exitstatus
   end
 end
diff --git a/spec/other/platform_spec.rb b/spec/other/platform_spec.rb
index a2fc9636a0..6a012d558f 100644
--- a/spec/other/platform_spec.rb
+++ b/spec/other/platform_spec.rb
@@ -1041,7 +1041,7 @@ G
       R
 
       expect(bundled_app("Gemfile.lock")).not_to exist
-      should_be_ruby_version_incorrect(:exitstatus => false)
+      should_be_ruby_version_incorrect
     end
 
     it "fails when engine doesn't match" do
@@ -1069,7 +1069,7 @@ G
       R
 
       expect(bundled_app("Gemfile.lock")).not_to exist
-      should_be_engine_incorrect(:exitstatus => false)
+      should_be_engine_incorrect
     end
 
     it "fails when engine version doesn't match" do
@@ -1098,7 +1098,7 @@ G
         R
 
         expect(bundled_app("Gemfile.lock")).not_to exist
-        should_be_engine_version_incorrect(:exitstatus => false)
+        should_be_engine_version_incorrect
       end
     end
 
@@ -1128,7 +1128,7 @@ G
       R
 
       expect(bundled_app("Gemfile.lock")).not_to exist
-      should_be_patchlevel_incorrect(:exitstatus => false)
+      should_be_patchlevel_incorrect
     end
   end
 
diff --git a/spec/update/gems_spec.rb b/spec/update/gems_spec.rb
index 842cf796a0..ed503e3607 100644
--- a/spec/update/gems_spec.rb
+++ b/spec/update/gems_spec.rb
@@ -196,6 +196,6 @@ describe "bundle update" do
 
     bundle "update nonexisting"
     expect(out).to include("This Bundle hasn't been installed yet. Run `bundle install` to update and install the bundled gems.")
-    expect(@exitstatus).to eq(22)
+    expect(exitstatus).to eq(22) if exitstatus
   end
 end