diff options
-rw-r--r-- | spec/commands/check_spec.rb | 2 | ||||
-rw-r--r-- | spec/commands/outdated_spec.rb | 2 | ||||
-rw-r--r-- | spec/commands/package_spec.rb | 2 | ||||
-rw-r--r-- | spec/install/deploy_spec.rb | 28 | ||||
-rw-r--r-- | spec/install/gemfile/eval_gemfile_spec.rb | 2 | ||||
-rw-r--r-- | spec/install/gemfile/gemspec_spec.rb | 2 | ||||
-rw-r--r-- | spec/install/gemfile/git_spec.rb | 2 | ||||
-rw-r--r-- | spec/install/gemfile/sources_spec.rb | 2 | ||||
-rw-r--r-- | spec/install/gems/compact_index_spec.rb | 4 | ||||
-rw-r--r-- | spec/install/gems/dependency_api_spec.rb | 4 |
10 files changed, 25 insertions, 25 deletions
diff --git a/spec/commands/check_spec.rb b/spec/commands/check_spec.rb index e70a66f17d..3c25a8e8c8 100644 --- a/spec/commands/check_spec.rb +++ b/spec/commands/check_spec.rb @@ -231,7 +231,7 @@ RSpec.describe "bundle check" do gem "foo" G - bundle! "install", forgotten_command_line_options([:deployment, :frozen] => true) + bundle! "install", forgotten_command_line_options(:deployment => true) FileUtils.rm(bundled_app("Gemfile.lock")) bundle :check diff --git a/spec/commands/outdated_spec.rb b/spec/commands/outdated_spec.rb index 50a16bd926..c7964365a6 100644 --- a/spec/commands/outdated_spec.rb +++ b/spec/commands/outdated_spec.rb @@ -407,7 +407,7 @@ RSpec.describe "bundle outdated" do context "after bundle install --deployment", :bundler => "< 2" do before do - install_gemfile <<-G, forgotten_command_line_options([:deployment, :frozen] => true) + install_gemfile <<-G, forgotten_command_line_options(:deployment => true) source "file://#{gem_repo2}" gem "rack" diff --git a/spec/commands/package_spec.rb b/spec/commands/package_spec.rb index 1d8f4db012..50d93be127 100644 --- a/spec/commands/package_spec.rb +++ b/spec/commands/package_spec.rb @@ -250,7 +250,7 @@ RSpec.describe "bundle install with gem sources" do simulate_new_machine FileUtils.rm_rf gem_repo2 - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true, :path => "vendor/bundle") + bundle! :install, forgotten_command_line_options(:deployment => true, :path => "vendor/bundle") expect(the_bundle).to include_gems "rack 1.0.0" end diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb index bbcf19b717..11cf38a577 100644 --- a/spec/install/deploy_spec.rb +++ b/spec/install/deploy_spec.rb @@ -47,7 +47,7 @@ RSpec.describe "install with --deployment or --frozen" do simulate_new_machine bundle! :install, forgotten_command_line_options(:gemfile => "#{tmp}/bundled_app/Gemfile", - [:deployment, :frozen] => true, + :deployment => true, :path => "vendor/bundle") end expect(the_bundle).to include_gems "rack 1.0" @@ -61,7 +61,7 @@ RSpec.describe "install with --deployment or --frozen" do end G bundle :install - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true, :without => "test") + bundle! :install, forgotten_command_line_options(:deployment => true, :without => "test") end it "works when you bundle exec bundle" do @@ -79,7 +79,7 @@ RSpec.describe "install with --deployment or --frozen" do G bundle! :install - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle! :install, forgotten_command_line_options(:deployment => true) end it "works when there are credentials in the source URL" do @@ -89,7 +89,7 @@ RSpec.describe "install with --deployment or --frozen" do gem "rack-obama", ">= 1.0" G - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true).merge(:artifice => "endpoint_strict_basic_authentication") + bundle! :install, forgotten_command_line_options(:deployment => true).merge(:artifice => "endpoint_strict_basic_authentication") end it "works with sources given by a block" do @@ -99,7 +99,7 @@ RSpec.describe "install with --deployment or --frozen" do end G - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle! :install, forgotten_command_line_options(:deployment => true) expect(the_bundle).to include_gems "rack 1.0" end @@ -128,7 +128,7 @@ RSpec.describe "install with --deployment or --frozen" do gem "rack-obama" G - bundle :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle :install, forgotten_command_line_options(:deployment => true) expect(out).to include("deployment mode") expect(out).to include("You have added to the Gemfile") expect(out).to include("* rack-obama") @@ -146,7 +146,7 @@ RSpec.describe "install with --deployment or --frozen" do expect(the_bundle).to include_gems "path_gem 1.0" FileUtils.rm_r lib_path("path_gem-1.0") - bundle! :install, forgotten_command_line_options(:path => ".bundle", :without => "development", [:deployment, :frozen] => true).merge(:env => { :DEBUG => "1" }) + bundle! :install, forgotten_command_line_options(:path => ".bundle", :without => "development", :deployment => true).merge(:env => { :DEBUG => "1" }) run! "puts :WIN" expect(out).to eq("WIN") end @@ -161,7 +161,7 @@ RSpec.describe "install with --deployment or --frozen" do expect(the_bundle).to include_gems "path_gem 1.0" FileUtils.rm_r lib_path("path_gem-1.0") - bundle :install, forgotten_command_line_options(:path => ".bundle", [:deployment, :frozen] => true) + bundle :install, forgotten_command_line_options(:path => ".bundle", :deployment => true) expect(out).to include("The path `#{lib_path("path_gem-1.0")}` does not exist.") end @@ -212,7 +212,7 @@ RSpec.describe "install with --deployment or --frozen" do expect(out).not_to include("* rack-obama") end - it "explodes with the --frozen flag if you make a change and don't check in the lockfile" do + it "explodes with the --frozen flag if you make a change and don't check in the lockfile", :bundler => "< 2" do gemfile <<-G source "file://#{gem_repo1}" gem "rack" @@ -233,7 +233,7 @@ RSpec.describe "install with --deployment or --frozen" do gem "activesupport" G - bundle :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle :install, forgotten_command_line_options(:deployment => true) expect(out).to include("deployment mode") expect(out).to include("You have added to the Gemfile:\n* activesupport\n\n") expect(out).to include("You have deleted from the Gemfile:\n* rack") @@ -246,7 +246,7 @@ RSpec.describe "install with --deployment or --frozen" do gem "rack", :git => "git://hubz.com" G - bundle :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle :install, forgotten_command_line_options(:deployment => true) expect(out).to include("deployment mode") expect(out).to include("You have added to the Gemfile:\n* source: git://hubz.com (at master)") expect(out).not_to include("You have changed in the Gemfile") @@ -265,7 +265,7 @@ RSpec.describe "install with --deployment or --frozen" do gem "rack" G - bundle :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle :install, forgotten_command_line_options(:deployment => true) expect(out).to include("deployment mode") expect(out).to include("You have deleted from the Gemfile:\n* source: #{lib_path("rack-1.0")} (at master@#{revision_for(lib_path("rack-1.0"))[0..6]}") expect(out).not_to include("You have added to the Gemfile") @@ -288,7 +288,7 @@ RSpec.describe "install with --deployment or --frozen" do gem "foo", :git => "#{lib_path("rack")}" G - bundle :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle :install, forgotten_command_line_options(:deployment => true) expect(out).to include("deployment mode") expect(out).to include("You have changed in the Gemfile:\n* rack from `no specified source` to `#{lib_path("rack")} (at master@#{revision_for(lib_path("rack"))[0..6]})`") expect(out).not_to include("You have added to the Gemfile") @@ -336,7 +336,7 @@ You have deleted from the Gemfile: expect(out).to include("Updating files in vendor/cache") simulate_new_machine - bundle! "install --verbose", forgotten_command_line_options([:deployment, :frozen] => true) + bundle! "install --verbose", forgotten_command_line_options(:deployment => true) expect(out).not_to include("You are trying to install in deployment mode after changing your Gemfile") expect(out).not_to include("You have added to the Gemfile") expect(out).not_to include("You have deleted from the Gemfile") diff --git a/spec/install/gemfile/eval_gemfile_spec.rb b/spec/install/gemfile/eval_gemfile_spec.rb index 7020f1af28..380cfd8593 100644 --- a/spec/install/gemfile/eval_gemfile_spec.rb +++ b/spec/install/gemfile/eval_gemfile_spec.rb @@ -47,7 +47,7 @@ RSpec.describe "bundle install with gemfile that uses eval_gemfile" do # parsed lockfile and the evaluated gemfile. it "bundles with --deployment" do bundle! :install - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle! :install, forgotten_command_line_options(:deployment => true) end end diff --git a/spec/install/gemfile/gemspec_spec.rb b/spec/install/gemfile/gemspec_spec.rb index 1bf89b6bab..2585f7106f 100644 --- a/spec/install/gemfile/gemspec_spec.rb +++ b/spec/install/gemfile/gemspec_spec.rb @@ -272,7 +272,7 @@ RSpec.describe "bundle install from an existing gemspec" do s.add_dependency "activesupport", ">= 1.0.1" end - bundle :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle :install, forgotten_command_line_options(:deployment => true) expect(out).to include("changed") end diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb index d08c3a4794..71ef3c856f 100644 --- a/spec/install/gemfile/git_spec.rb +++ b/spec/install/gemfile/git_spec.rb @@ -1022,7 +1022,7 @@ RSpec.describe "bundle install with git sources" do simulate_new_machine - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle! :install, forgotten_command_line_options(:deployment => true) end end diff --git a/spec/install/gemfile/sources_spec.rb b/spec/install/gemfile/sources_spec.rb index 5d734ad447..6afe8bda59 100644 --- a/spec/install/gemfile/sources_spec.rb +++ b/spec/install/gemfile/sources_spec.rb @@ -107,7 +107,7 @@ RSpec.describe "bundle install with gems on multiple sources" do expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist expect(bundled_app("vendor/cache/rack-obama-1.0.gem")).to exist - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true) + bundle! :install, forgotten_command_line_options(:deployment => true) expect(the_bundle).to include_gems("rack-obama 1.0.0", "rack 1.0.0") end diff --git a/spec/install/gems/compact_index_spec.rb b/spec/install/gems/compact_index_spec.rb index 7112aec863..6dadbd9fca 100644 --- a/spec/install/gems/compact_index_spec.rb +++ b/spec/install/gems/compact_index_spec.rb @@ -80,7 +80,7 @@ RSpec.describe "compact index api" do G bundle! :install, :artifice => "compact_index" - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true, :path => "vendor/bundle").merge(:artifice => "compact_index") + bundle! :install, forgotten_command_line_options(:deployment => true, :path => "vendor/bundle").merge(:artifice => "compact_index") expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -129,7 +129,7 @@ RSpec.describe "compact index api" do G bundle "install", :artifice => "compact_index" - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true).merge(:artifice => "compact_index") + bundle! :install, forgotten_command_line_options(:deployment => true).merge(:artifice => "compact_index") expect(the_bundle).to include_gems("foo 1.0") end diff --git a/spec/install/gems/dependency_api_spec.rb b/spec/install/gems/dependency_api_spec.rb index efa2a2e6e4..22c623ab40 100644 --- a/spec/install/gems/dependency_api_spec.rb +++ b/spec/install/gems/dependency_api_spec.rb @@ -60,7 +60,7 @@ RSpec.describe "gemcutter's dependency API" do G bundle :install, :artifice => "endpoint" - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true, :path => "vendor/bundle").merge(:artifice => "endpoint") + bundle! :install, forgotten_command_line_options(:deployment => true, :path => "vendor/bundle").merge(:artifice => "endpoint") expect(out).to include("Fetching gem metadata from #{source_uri}") expect(the_bundle).to include_gems "rack 1.0.0" end @@ -109,7 +109,7 @@ RSpec.describe "gemcutter's dependency API" do G bundle "install", :artifice => "endpoint" - bundle! :install, forgotten_command_line_options([:deployment, :frozen] => true).merge(:artifice => "endpoint") + bundle! :install, forgotten_command_line_options(:deployment => true).merge(:artifice => "endpoint") expect(the_bundle).to include_gems("foo 1.0") end |