summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColby Swandale <me@colby.fyi>2018-10-13 12:05:45 +1100
committerColby Swandale <me@colby.fyi>2018-10-13 13:00:03 +1100
commite5773bccad9769090469dd3209f7577eac0598d4 (patch)
treeeb3a7c250599dd537a2f3be28c8e58c135c946cd
parent3c11579a175cf29da636e85da22730d187949bcb (diff)
downloadbundler-e5773bccad9769090469dd3209f7577eac0598d4.tar.gz
fix failing bundle remove specs
-rw-r--r--spec/commands/remove_spec.rb18
1 files changed, 15 insertions, 3 deletions
diff --git a/spec/commands/remove_spec.rb b/spec/commands/remove_spec.rb
index 37594b1ece..faeb654b14 100644
--- a/spec/commands/remove_spec.rb
+++ b/spec/commands/remove_spec.rb
@@ -294,7 +294,11 @@ RSpec.describe "bundle remove" do
bundle "remove rails"
- expect(out).to include("Gems could not be removed. rack (>= 0) would also have been removed.")
+ if Gem::VERSION >= "1.6.0"
+ expect(out).to include("Gems could not be removed. rack (>= 0) would also have been removed.")
+ else
+ expect(out).to include("Gems could not be removed. rack (>= 0, runtime) would also have been removed.")
+ end
gemfile_should_be <<-G
source "file://#{gem_repo1}"
gem "rack"; gem "rails"
@@ -457,7 +461,11 @@ RSpec.describe "bundle remove" do
bundle "remove rack"
expect(out).to include("rack was removed.")
- expect(out).to include("Gems could not be removed. rails (>= 0) would also have been removed.")
+ if Gem::VERSION >= "1.6.0"
+ expect(out).to include("Gems could not be removed. rails (>= 0) would also have been removed.")
+ else
+ expect(out).to include("Gems could not be removed. rails (>= 0, runtime) would also have been removed.")
+ end
gemfile_should_be <<-G
source "file://#{gem_repo1}"
@@ -481,7 +489,11 @@ RSpec.describe "bundle remove" do
bundle "remove rack"
- expect(out).to include("Gems could not be removed. rails (>= 0) would also have been removed.")
+ if Gem::VERSION >= "1.6.0"
+ expect(out).to include("Gems could not be removed. rails (>= 0) would also have been removed.")
+ else
+ expect(out).to include("Gems could not be removed. rails (>= 0, runtime) would also have been removed.")
+ end
expect(bundled_app("Gemfile-other").read).to include("gem \"rack\"")
gemfile_should_be <<-G
source "file://#{gem_repo1}"