From 3e8b300a26ca5a157be27f8efae372e868317521 Mon Sep 17 00:00:00 2001 From: Bundlerbot Date: Tue, 25 Sep 2018 11:21:54 +0000 Subject: Merge #6707 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6707: Run more assertions in more cases r=deivid-rodriguez a=deivid-rodriguez I noticed a couple of places where assertions were being excluded and they shouldn't: * One was introduced by me in #6702, where the specs added (and some already present) started being tested only on bundler 2.x. * The other one was introduced in f7414bcb17fe1bd67246021251b5f0527bd6afd1, where one assertion would be run only if a certain env variable was not set. I think it was because of a TravisCI environmental issue that now seems fixed. My diagnosis was that none of these exclusions are necessary. My fix is to restore the excluded assertions to all environments and branches. I chose this fix because it seems best to avoid future problems. Co-authored-by: David Rodríguez (cherry picked from commit 3d9e6167a7df9ca89a030dfe95c7cdff293e74a9) --- spec/commands/exec_spec.rb | 2 +- spec/install/redownload_spec.rb | 16 +++++++++++++--- spec/update/redownload_spec.rb | 16 +++++++++++++--- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/spec/commands/exec_spec.rb b/spec/commands/exec_spec.rb index bd3c49baa1..587d6cccdc 100644 --- a/spec/commands/exec_spec.rb +++ b/spec/commands/exec_spec.rb @@ -845,7 +845,7 @@ __FILE__: #{path.to_s.inspect} expect(bundle!("exec ruby #{file}", :artifice => nil)).to eq(expected) # Ignore expectaion for default bundler gem conflict. unless ENV["BUNDLER_SPEC_SUB_VERSION"] - expect(run!(file.read, :no_lib => true, :artifice => nil)).to eq(expected) + expect(run!(file.read, :artifice => nil)).to eq(expected) end end diff --git a/spec/install/redownload_spec.rb b/spec/install/redownload_spec.rb index 1225c839c4..232c0f9e2c 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 @@ RSpec.describe "bundle install", :bundler => "2" do 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 8c716664e2..5a739c51b3 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 @@ RSpec.describe "bundle update", :bundler => "2" do 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 -- cgit v1.2.1