diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2018-09-24 17:11:32 -0300 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2018-09-24 17:11:32 -0300 |
commit | 371ff5114f275abceedf7d03f8f2dac869a296e9 (patch) | |
tree | 74ed0167d34273b926eebda69d023d064a80e97e | |
parent | ff73899d27ce0d2aa875aa24e8e53f1ce6429dfc (diff) | |
download | bundler-371ff5114f275abceedf7d03f8f2dac869a296e9.tar.gz |
Improve redownload specsmore_assertions
So they are run on bundler 1.x too.
-rw-r--r-- | spec/install/redownload_spec.rb | 16 | ||||
-rw-r--r-- | spec/update/redownload_spec.rb | 16 |
2 files changed, 26 insertions, 6 deletions
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 |