summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-04-12 12:50:21 +0200
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-04-27 12:50:43 +0200
commit1113640bcc4e6c8849e5d124015d4d9c69b1a3b2 (patch)
treea8abb192f5147bdd5399c29fb6a4d027dc30c797
parentf0ae5ebb1572177f76dbb751b241890e0e00b9c0 (diff)
downloadbundler-1113640bcc4e6c8849e5d124015d4d9c69b1a3b2.tar.gz
Merge unnecessarily split specs
-rw-r--r--spec/lock/lockfile_spec.rb50
1 files changed, 1 insertions, 49 deletions
diff --git a/spec/lock/lockfile_spec.rb b/spec/lock/lockfile_spec.rb
index 41c4f7d6e5..ed310c48a5 100644
--- a/spec/lock/lockfile_spec.rb
+++ b/spec/lock/lockfile_spec.rb
@@ -230,7 +230,7 @@ RSpec.describe "the lockfile format" do
expect(err).to include("You must use Bundler 9999999 or greater with this lockfile.")
end
- it "warns when updating bundler major version", :bundler => "< 3" do
+ it "warns when updating bundler major version" do
lockfile <<-L
GEM
remote: file://localhost#{gem_repo1}/
@@ -253,54 +253,6 @@ RSpec.describe "the lockfile format" do
gem "rack"
G
- end
-
- expect(err).to include(
- "Warning: the lockfile is being updated to Bundler " \
- "9999999, after which you will be unable to return to Bundler 1."
- )
-
- lockfile_should_be <<-G
- GEM
- remote: file://localhost#{gem_repo1}/
- specs:
- rack (1.0.0)
-
- PLATFORMS
- #{generic_local_platform}
- #{specific_local_platform}
-
- DEPENDENCIES
- rack
-
- BUNDLED WITH
- 9999999.0.0
- G
- end
-
- it "warns when updating bundler major version", :bundler => "3" do
- lockfile <<-L
- GEM
- remote: file://localhost#{gem_repo1}/
- specs:
- rack (1.0.0)
-
- PLATFORMS
- #{lockfile_platforms}
-
- DEPENDENCIES
- rack
-
- BUNDLED WITH
- 1.10.0
- L
-
- simulate_bundler_version "9999999.0.0" do
- install_gemfile <<-G
- source "file://localhost#{gem_repo1}/"
-
- gem "rack"
- G
expect(err).to include(
"Warning: the lockfile is being updated to Bundler " \