diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index 492907743a2..acf12ced790 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -843,10 +843,7 @@ def bin_path(a,b,c) expect(bundle!("exec #{file}", :artifice => nil)).to eq(expected) expect(bundle!("exec bundle exec #{file}", :artifice => nil)).to eq(expected) expect(bundle!("exec ruby #{file}", :artifice => nil)).to eq(expected) - # Ignore expectation for default bundler gem conflict. - unless ENV["BUNDLER_SPEC_SUB_VERSION"] - expect(run!(file.read, :artifice => nil)).to eq(expected) - end + expect(run!(file.read, :artifice => nil)).to eq(expected) end # sanity check that we get the newer, custom version without bundler diff --git a/spec/install/redownload_spec.rb b/spec/install/redownload_spec.rb index 1225c839c48..232c0f9e2cc 100644 --- a/spec/install/redownload_spec.rb +++ b/spec/install/redownload_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -RSpec.describe "bundle install", :bundler => "2" do +RSpec.describe "bundle install" do before :each do gemfile <<-G source "file://#{gem_repo1}" @@ -61,15 +61,25 @@ let(:flag) { "force" } end - it "shows a deprecation when single flag passed" do + it "shows a deprecation when single flag passed", :bundler => 2 do bundle! "install --force" expect(out).to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`" end - it "shows a deprecation when multiple flags passed" do + it "shows a deprecation when multiple flags passed", :bundler => 2 do bundle! "install --no-color --force" expect(out).to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`" end + + it "does not show a deprecation when single flag passed", :bundler => "< 2" do + bundle! "install --force" + expect(out).not_to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`" + end + + it "does not show a deprecation when multiple flags passed", :bundler => "< 2" do + bundle! "install --no-color --force" + expect(out).not_to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`" + end end describe "with --redownload" do diff --git a/spec/update/redownload_spec.rb b/spec/update/redownload_spec.rb index 8c716664e2c..5a739c51b3e 100644 --- a/spec/update/redownload_spec.rb +++ b/spec/update/redownload_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -RSpec.describe "bundle update", :bundler => "2" do +RSpec.describe "bundle update" do before :each do install_gemfile <<-G source "file://#{gem_repo1}" @@ -9,15 +9,25 @@ end describe "with --force" do - it "shows a deprecation when single flag passed" do + it "shows a deprecation when single flag passed", :bundler => 2 do bundle! "update rack --force" expect(out).to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`" end - it "shows a deprecation when multiple flags passed" do + it "shows a deprecation when multiple flags passed", :bundler => 2 do bundle! "update rack --no-color --force" expect(out).to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`" end + + it "does not show a deprecation when single flag passed", :bundler => "< 2" do + bundle! "update rack --force" + expect(out).not_to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`" + end + + it "does not show a deprecation when multiple flags passed", :bundler => "< 2" do + bundle! "update rack --no-color --force" + expect(out).not_to include "[DEPRECATED FOR 2.0] The `--force` option has been renamed to `--redownload`" + end end describe "with --redownload" do