From e1b8d366dd87e94fdbc54ed7a4e1bb7f88b928eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Thu, 21 Mar 2019 11:12:28 +0100 Subject: Fix some specs to not rely on remembering flags --- spec/install/deploy_spec.rb | 6 +++--- spec/realworld/edgecases_spec.rb | 3 ++- 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 -- cgit v1.2.1