Merge #7079

7079: Remove `bundle config` deprecations from specs r=hsbt a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that some specs still use the deprecated `bundle config interface` ### What is your fix for the problem, implemented in this PR? My fix is to use the newer interface. Co-authored-by: David Rodríguez <[email protected]>
rubygems · Mar 30, 2019 · 52e329f · 52e329f
2 parents 53989a9 + 4e97ae5
commit 52e329f
Show file tree

Hide file tree

Showing 30 changed files with 82 additions and 82 deletions.
diff --git a/spec/cache/gems_spec.rb b/spec/cache/gems_spec.rb
@@ -74,12 +74,12 @@
   end
 
   context "using system gems" do
-    before { bundle! "config path.system true" }
+    before { bundle! "config set path.system true" }
     it_behaves_like "when there are only gemsources"
   end
 
   context "installing into a local path" do
-    before { bundle! "config path ./.bundle" }
+    before { bundle! "config set path ./.bundle" }
     it_behaves_like "when there are only gemsources"
   end
 
@@ -97,7 +97,7 @@
     end
 
     it "uses builtin gems when installing to system gems" do
-      bundle! "config path.system true"
+      bundle! "config set path.system true"
       install_gemfile %(gem 'builtin_gem', '1.0.2')
       expect(the_bundle).to include_gems("builtin_gem 1.0.2")
     end
@@ -129,7 +129,7 @@
     end
 
     it "errors if the builtin gem isn't available to cache" do
-      bundle! "config path.system true"
+      bundle! "config set path.system true"
 
       install_gemfile <<-G
         gem 'builtin_gem', '1.0.2'

diff --git a/spec/cache/git_spec.rb b/spec/cache/git_spec.rb
@@ -127,7 +127,7 @@
         gem "foo", :git => '#{lib_path("foo-invalid")}', :branch => :master
       G
 
-      bundle %(config local.foo #{lib_path("foo-1.0")})
+      bundle %(config set local.foo #{lib_path("foo-1.0")})
       bundle "install"
       bundle "#{cmd}", forgotten_command_line_options([:all, :cache_all] => true)
 

diff --git a/spec/commands/check_spec.rb b/spec/commands/check_spec.rb
@@ -106,7 +106,7 @@
   end
 
   it "uses the without setting" do
-    bundle! "config without foo"
+    bundle! "config set without foo"
     install_gemfile! <<-G
       source "file://#{gem_repo1}"
       group :foo do

diff --git a/spec/commands/clean_spec.rb b/spec/commands/clean_spec.rb
@@ -276,7 +276,7 @@ def should_not_have_gems(*gems)
   end
 
   it "displays an error when used without --path" do
-    bundle! "config path.system true"
+    bundle! "config set path.system true"
     install_gemfile <<-G
       source "file://#{gem_repo1}"
 
@@ -320,7 +320,7 @@ def should_not_have_gems(*gems)
   end
 
   it "does not call clean automatically when using system gems" do
-    bundle! "config path.system true"
+    bundle! "config set path.system true"
 
     bundle! "config list"
 
@@ -446,7 +446,7 @@ def should_not_have_gems(*gems)
   end
 
   it "does not clean on bundle update when using --system" do
-    bundle! "config path.system true"
+    bundle! "config set path.system true"
 
     build_repo2
 
@@ -468,7 +468,7 @@ def should_not_have_gems(*gems)
   end
 
   it "cleans system gems when --force is used" do
-    bundle! "config path.system true"
+    bundle! "config set path.system true"
 
     gemfile <<-G
       source "file://#{gem_repo1}"
@@ -560,7 +560,7 @@ def should_not_have_gems(*gems)
   end
 
   it "when using --force on system gems, it doesn't remove binaries" do
-    bundle! "config path.system true"
+    bundle! "config set path.system true"
 
     build_repo2
     update_repo2 do
@@ -707,7 +707,7 @@ def should_not_have_gems(*gems)
       gem "weakling"
     G
 
-    bundle! "config auto_install 1"
+    bundle! "config set auto_install 1"
     bundle! :clean
     expect(out).to include("Installing weakling 0.0.3")
     should_have_gems "thin-1.0", "rack-1.0.0", "weakling-0.0.3"

diff --git a/spec/commands/config_spec.rb b/spec/commands/config_spec.rb
@@ -488,7 +488,7 @@
       bundle "config set --local gemfile #{bundled_app("NotGemfile")}"
       expect(File.exist?(".bundle/config")).to eq(true)
 
-      bundle "config"
+      bundle "config list"
       expect(out).to include("NotGemfile")
     end
   end

diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb
@@ -220,13 +220,13 @@
   end
 
   it "raises a helpful error when exec'ing to something outside of the bundle", :ruby_repo do
-    bundle! "config clean false" # want to keep the rackup binstub
+    bundle! "config set clean false" # want to keep the rackup binstub
     install_gemfile! <<-G
       source "file://#{gem_repo1}"
       gem "with_license"
     G
     [true, false].each do |l|
-      bundle! "config disable_exec_load #{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?"
     end

diff --git a/spec/commands/inject_spec.rb b/spec/commands/inject_spec.rb
@@ -80,9 +80,9 @@
     before do
       bundle "install"
       if Bundler.feature_flag.bundler_2_mode?
-        bundle! "config --local deployment true"
+        bundle! "config set --local deployment true"
       else
-        bundle! "config --local frozen true"
+        bundle! "config set --local frozen true"
       end
     end
 

diff --git a/spec/commands/outdated_spec.rb b/spec/commands/outdated_spec.rb
@@ -202,7 +202,7 @@ def test_group_option(group = nil, gems_list_size = 1)
         build_gem "activesupport", "2.3.4"
       end
 
-      bundle! "config clean false"
+      bundle! "config set clean false"
 
       install_gemfile <<-G
         source "file://#{gem_repo2}"
@@ -414,7 +414,7 @@ def test_group_option(group = nil, gems_list_size = 1)
       gem "foo"
     G
 
-    bundle "config auto_install 1"
+    bundle "config set auto_install 1"
     bundle :outdated
     expect(out).to include("Installing foo 1.0")
   end

diff --git a/spec/commands/package_spec.rb b/spec/commands/package_spec.rb
@@ -217,7 +217,7 @@
     subject { bundle :package, forgotten_command_line_options(:frozen => true) }
 
     it "tries to install with frozen" do
-      bundle! "config deployment true"
+      bundle! "config set deployment true"
       gemfile <<-G
         source "file://#{gem_repo1}"
         gem "rack"

diff --git a/spec/commands/update_spec.rb b/spec/commands/update_spec.rb
@@ -72,7 +72,7 @@
   end
 
   context "when update_requires_all_flag is set" do
-    before { bundle! "config update_requires_all_flag true" }
+    before { bundle! "config set update_requires_all_flag true" }
 
     it "errors when passed nothing" do
       install_gemfile! ""
@@ -133,7 +133,7 @@
   describe "when a possible resolve requires an older version of a locked gem" do
     context "and only_update_to_newer_versions is set" do
       before do
-        bundle! "config only_update_to_newer_versions true"
+        bundle! "config set only_update_to_newer_versions true"
       end
 
       it "does not go to an older version" do
@@ -290,14 +290,14 @@
     end
 
     it "should suggest different command when frozen is set globally", :bundler => "< 2" do
-      bundle! "config --global frozen 1"
+      bundle! "config set --global frozen 1"
       bundle "update", :all => bundle_update_requires_all?
       expect(out).to match(/You are trying to install in deployment mode after changing.your Gemfile/m).
         and match(/freeze \nby running `bundle config unset frozen`./m)
     end
 
     it "should suggest different command when frozen is set globally", :bundler => "2" do
-      bundle! "config --global deployment true"
+      bundle! "config set --global deployment true"
       bundle "update", :all => bundle_update_requires_all?
       expect(err).to match(/You are trying to install in deployment mode after changing.your Gemfile/m).
         and match(/freeze \nby running `bundle config unset deployment`./m)
@@ -328,7 +328,7 @@
     end
 
     context "with unlock_source_unlocks_spec set to false" do
-      before { bundle! "config unlock_source_unlocks_spec false" }
+      before { bundle! "config set unlock_source_unlocks_spec false" }
 
       it "should not update gems not included in the source that happen to have the same name" do
         install_gemfile <<-G
@@ -598,7 +598,7 @@
   end
 
   context "with suppress_install_using_messages set" do
-    before { bundle! "config suppress_install_using_messages true" }
+    before { bundle! "config set suppress_install_using_messages true" }
 
     it "only prints `Using` for versions that have changed" do
       build_repo4 do
@@ -811,7 +811,7 @@
 
     context "with patch set as default update level in config" do
       it "should do a patch level update" do
-        bundle! "config --local prefer_patch true"
+        bundle! "config set --local prefer_patch true"
         bundle! "update foo"
 
         expect(the_bundle).to include_gems "foo 1.4.5", "bar 2.1.1", "qux 1.0.0"

diff --git a/spec/install/allow_offline_install_spec.rb b/spec/install/allow_offline_install_spec.rb
@@ -28,7 +28,7 @@
     it "will install from the compact index" do
       system_gems ["rack-1.0.0"], :path => :bundle_path
 
-      bundle! "config clean false"
+      bundle! "config set clean false"
       install_gemfile! <<-G, :artifice => "compact_index"
         source "http://testgemserver.local"
         gem "rack-obama"

diff --git a/spec/install/bundler_spec.rb b/spec/install/bundler_spec.rb
@@ -126,7 +126,7 @@
     end
 
     it "can install dependencies with newer bundler version with system gems" do
-      bundle! "config path.system true"
+      bundle! "config set path.system true"
       install_gemfile! <<-G
         source "file://#{gem_repo2}"
         gem "rails", "3.0"
@@ -139,8 +139,8 @@
     end
 
     it "can install dependencies with newer bundler version with a local path" do
-      bundle! "config path .bundle"
-      bundle! "config global_path_appends_ruby_scope true"
+      bundle! "config set path .bundle"
+      bundle! "config set global_path_appends_ruby_scope true"
       install_gemfile! <<-G
         source "file://#{gem_repo2}"
         gem "rails", "3.0"
@@ -153,7 +153,7 @@
     end
 
     context "with allow_bundler_dependency_conflicts set" do
-      before { bundle! "config allow_bundler_dependency_conflicts true" }
+      before { bundle! "config set allow_bundler_dependency_conflicts true" }
 
       it "are forced to the current bundler version with warnings when no compatible version is found" do
         build_repo4 do

diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb
@@ -331,7 +331,7 @@
       end
 
       context "when allow_deployment_source_credential_changes is true" do
-        before { bundle! "config allow_deployment_source_credential_changes true" }
+        before { bundle! "config set allow_deployment_source_credential_changes true" }
 
         it "allows the replace" do
           bundle :install, forgotten_command_line_options(:deployment => true)
@@ -341,7 +341,7 @@
       end
 
       context "when allow_deployment_source_credential_changes is false" do
-        before { bundle! "config allow_deployment_source_credential_changes false" }
+        before { bundle! "config set allow_deployment_source_credential_changes false" }
 
         it "prevents the replace" do
           bundle :install, forgotten_command_line_options(:deployment => true)
@@ -374,7 +374,7 @@
     it "remembers that the bundle is frozen at runtime" do
       bundle! :lock
 
-      bundle! "config deployment true"
+      bundle! "config set deployment true"
 
       gemfile <<-G
         source "file://#{gem_repo1}"