diff options
Diffstat (limited to 'spec/bundler/install')
-rw-r--r-- | spec/bundler/install/deploy_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/git_spec.rb | 2 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/path_spec.rb | 2 | ||||
-rw-r--r-- | spec/bundler/install/gemfile/sources_spec.rb | 8 | ||||
-rw-r--r-- | spec/bundler/install/gems/compact_index_spec.rb | 6 | ||||
-rw-r--r-- | spec/bundler/install/gemspecs_spec.rb | 4 | ||||
-rw-r--r-- | spec/bundler/install/path_spec.rb | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb index 429041d9e9..357f4512f1 100644 --- a/spec/bundler/install/deploy_spec.rb +++ b/spec/bundler/install/deploy_spec.rb @@ -23,7 +23,7 @@ RSpec.describe "install in deployment or frozen mode" do bundle "install --deployment --system", :raise_on_error => false expect(err).to include("You have specified both --deployment") expect(err).to include("Please choose only one option") - expect(exitstatus).to eq(15) if exitstatus + expect(exitstatus).to eq(15) end it "disallows --deployment --path --system" do @@ -31,7 +31,7 @@ RSpec.describe "install in deployment or frozen mode" do expect(err).to include("You have specified both --path") expect(err).to include("as well as --system") expect(err).to include("Please choose only one option") - expect(exitstatus).to eq(15) if exitstatus + expect(exitstatus).to eq(15) end it "doesn't mess up a subsequent `bundle install` after you try to deploy without a lock" do diff --git a/spec/bundler/install/gemfile/git_spec.rb b/spec/bundler/install/gemfile/git_spec.rb index aaef839c0a..c0e2510acd 100644 --- a/spec/bundler/install/gemfile/git_spec.rb +++ b/spec/bundler/install/gemfile/git_spec.rb @@ -926,7 +926,7 @@ RSpec.describe "bundle install with git sources" do gem "foo", :git => "#{lib_path("foo-1.0")}" G - expect(exitstatus).to_not eq(0) if exitstatus + expect(exitstatus).to_not eq(0) expect(err).to include("Bundler could not install a gem because it " \ "needs to create a directory, but a file exists " \ "- #{default_bundle_path("bundler")}") diff --git a/spec/bundler/install/gemfile/path_spec.rb b/spec/bundler/install/gemfile/path_spec.rb index 84ece3d699..07722d09dd 100644 --- a/spec/bundler/install/gemfile/path_spec.rb +++ b/spec/bundler/install/gemfile/path_spec.rb @@ -309,7 +309,7 @@ RSpec.describe "bundle install with explicit source paths" do gemspec :path => "#{lib_path("foo")}" G - expect(exitstatus).to eq(15) if exitstatus + expect(exitstatus).to eq(15) expect(err).to match(/There are multiple gemspecs/) end diff --git a/spec/bundler/install/gemfile/sources_spec.rb b/spec/bundler/install/gemfile/sources_spec.rb index 3690dc50d6..be41857043 100644 --- a/spec/bundler/install/gemfile/sources_spec.rb +++ b/spec/bundler/install/gemfile/sources_spec.rb @@ -38,7 +38,7 @@ RSpec.describe "bundle install with gems on multiple sources" do it "fails", :bundler => "3" do bundle :instal, :raise_on_error => false expect(err).to include("Each source after the first must include a block") - expect(exitstatus).to eq(4) if exitstatus + expect(exitstatus).to eq(4) end end @@ -64,7 +64,7 @@ RSpec.describe "bundle install with gems on multiple sources" do it "fails", :bundler => "3" do bundle :install, :raise_on_error => false expect(err).to include("Each source after the first must include a block") - expect(exitstatus).to eq(4) if exitstatus + expect(exitstatus).to eq(4) end end end @@ -258,7 +258,7 @@ RSpec.describe "bundle install with gems on multiple sources" do it "fails", :bundler => "3" do bundle :install, :raise_on_error => false expect(err).to include("Each source after the first must include a block") - expect(exitstatus).to eq(4) if exitstatus + expect(exitstatus).to eq(4) end end @@ -298,7 +298,7 @@ RSpec.describe "bundle install with gems on multiple sources" do it "fails", :bundler => "3" do bundle :install, :raise_on_error => false expect(err).to include("Each source after the first must include a block") - expect(exitstatus).to eq(4) if exitstatus + expect(exitstatus).to eq(4) end end end diff --git a/spec/bundler/install/gems/compact_index_spec.rb b/spec/bundler/install/gems/compact_index_spec.rb index 18c9485c3c..6e5177c60d 100644 --- a/spec/bundler/install/gems/compact_index_spec.rb +++ b/spec/bundler/install/gems/compact_index_spec.rb @@ -856,7 +856,7 @@ The checksum of /versions does not match the checksum provided by the server! So source "htps://rubygems.org" gem "rack" G - expect(exitstatus).to eq(15) if exitstatus + expect(exitstatus).to eq(15) expect(err).to end_with(<<-E.strip) The request uri `htps://index.rubygems.org/versions` has an invalid scheme (`htps`). Did you mean `http` or `https`? E @@ -869,7 +869,7 @@ The checksum of /versions does not match the checksum provided by the server! So gem "rack" G - expect(exitstatus).to eq(19) if exitstatus + expect(exitstatus).to eq(19) expect(err). to include("Bundler cannot continue installing rack (1.0.0)."). and include("The checksum for the downloaded `rack-1.0.0.gem` does not match the checksum given by the server."). @@ -888,7 +888,7 @@ The checksum of /versions does not match the checksum provided by the server! So source "#{source_uri}" gem "rack" G - expect(exitstatus).to eq(5) if exitstatus + expect(exitstatus).to eq(5) expect(err).to include("The given checksum for rack-1.0.0 (\"checksum!\") is not a valid SHA256 hexdigest nor base64digest") end diff --git a/spec/bundler/install/gemspecs_spec.rb b/spec/bundler/install/gemspecs_spec.rb index 98e87f1b21..0db1f1985b 100644 --- a/spec/bundler/install/gemspecs_spec.rb +++ b/spec/bundler/install/gemspecs_spec.rb @@ -130,7 +130,7 @@ RSpec.describe "bundle install" do expect(err).to include("Ruby patchlevel") expect(err).to include("but your Gemfile specified") - expect(exitstatus).to eq(18) if exitstatus + expect(exitstatus).to eq(18) end it "fails and complains about version on version mismatch" do @@ -147,7 +147,7 @@ RSpec.describe "bundle install" do expect(err).to include("Ruby version") expect(err).to include("but your Gemfile specified") - expect(exitstatus).to eq(18) if exitstatus + expect(exitstatus).to eq(18) end end end diff --git a/spec/bundler/install/path_spec.rb b/spec/bundler/install/path_spec.rb index 22eedad388..2239706020 100644 --- a/spec/bundler/install/path_spec.rb +++ b/spec/bundler/install/path_spec.rb @@ -39,7 +39,7 @@ RSpec.describe "bundle install" do it "disallows --path vendor/bundle --system", :bundler => "< 3" do bundle "install --path vendor/bundle --system", :raise_on_error => false expect(err).to include("Please choose only one option.") - expect(exitstatus).to eq(15) if exitstatus + expect(exitstatus).to eq(15) end it "remembers to disable system gems after the first time with bundle --path vendor/bundle", :bundler => "< 3" do |