Merge Bundler 2.0.1 from upstream.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 6 deletions

diff --git a/spec/bundler/lock/lockfile_bundler_1_spec.rb b/spec/bundler/lock/lockfile_bundler_1_spec.rb
index fcdf6ebf0d..e89c5078d9 100644
--- a/spec/bundler/lock/lockfile_bundler_1_spec.rb
+++ b/spec/bundler/lock/lockfile_bundler_1_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "the lockfile format", :bundler => "< 2" do
+RSpec.describe "the lockfile format", :bundler => "< 3" do
   include Bundler::GemHelpers
 
   before { ENV["BUNDLER_SPEC_IGNORE_COMPATIBILITY_GUARD"] = "TRUE" }
@@ -78,7 +78,7 @@ RSpec.describe "the lockfile format", :bundler => "< 2" do
   it "does not update the lockfile's bundler version if nothing changed during bundle install", :ruby_repo do
     version = "#{Bundler::VERSION.split(".").first}.0.0.0.a"
 
-    lockfile <<-L
+    lockfile normalize_uri_file(<<-L)
       GEM
         remote: file://localhost#{gem_repo1}/
         specs:
@@ -94,13 +94,13 @@ RSpec.describe "the lockfile format", :bundler => "< 2" do
          #{version}
     L
 
-    install_gemfile <<-G
+    install_gemfile normalize_uri_file(<<-G)
       source "file://localhost#{gem_repo1}"
 
       gem "rack"
     G
 
-    lockfile_should_be <<-G
+    lockfile_should_be normalize_uri_file(<<-G)
       GEM
         remote: file://localhost#{gem_repo1}/
         specs:
diff --git a/spec/bundler/lock/lockfile_spec.rb b/spec/bundler/lock/lockfile_spec.rb
index 53c832445f..9e2fb3b2dd 100644
--- a/spec/bundler/lock/lockfile_spec.rb
+++ b/spec/bundler/lock/lockfile_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "the lockfile format", :bundler => "2" do
+RSpec.describe "the lockfile format", :bundler => "3" do
   include Bundler::GemHelpers
 
   before { ENV["BUNDLER_SPEC_IGNORE_COMPATIBILITY_GUARD"] = "TRUE" }
@@ -428,7 +428,7 @@ RSpec.describe "the lockfile format", :bundler => "2" do
     expect(the_bundle).to include_gems "net-sftp 1.1.1", "net-ssh 1.0.0"
   end
 
-  it "generates a simple lockfile for a single pinned source, gem with a version requirement", :bundler => "< 2" do
+  it "generates a simple lockfile for a single pinned source, gem with a version requirement", :bundler => "< 3" do
     git = build_git "foo"
 
     install_gemfile <<-G