summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-03-21 11:12:28 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-04-11 13:16:45 +0200
commite1b8d366dd87e94fdbc54ed7a4e1bb7f88b928eb (patch)
tree4f0d20f309933106476a740f0ed9b299145e07d5
parente4b07bdca7a98453487b2dc012ce8d841857c34b (diff)
downloadbundler-e1b8d366dd87e94fdbc54ed7a4e1bb7f88b928eb.tar.gz
Fix some specs to not rely on remembering flags
-rw-r--r--spec/install/deploy_spec.rb6
-rw-r--r--spec/realworld/edgecases_spec.rb3
2 files changed, 5 insertions, 4 deletions
diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb
index 21d7ba3294..8995caa52b 100644
--- a/spec/install/deploy_spec.rb
+++ b/spec/install/deploy_spec.rb
@@ -323,7 +323,7 @@ RSpec.describe "install with --deployment or --frozen" do
rack
G
- bundle! "config set deployment true"
+ bundle! "config set --local deployment true"
end
it "prevents the replace by default" do
@@ -376,7 +376,7 @@ RSpec.describe "install with --deployment or --frozen" do
it "remembers that the bundle is frozen at runtime" do
bundle! :lock
- bundle! "config set deployment true"
+ bundle! "config set --local deployment true"
gemfile <<-G
source "file://#{gem_repo1}"
@@ -414,7 +414,7 @@ You have deleted from the Gemfile:
expect(out).to include("Updating files in vendor/cache")
simulate_new_machine
- bundle! "config set deployment true"
+ bundle! "config set --local deployment true"
bundle! "install --verbose"
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")
diff --git a/spec/realworld/edgecases_spec.rb b/spec/realworld/edgecases_spec.rb
index 0189c55020..22d94bef90 100644
--- a/spec/realworld/edgecases_spec.rb
+++ b/spec/realworld/edgecases_spec.rb
@@ -201,7 +201,8 @@ RSpec.describe "real world edgecases", :realworld => true, :sometimes => true do
gem 'rack', '1.0.1'
G
- bundle! :install, forgotten_command_line_options(:path => "vendor/bundle")
+ 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
end