Merge upstream changes from 2-0-stable branch of bundler/bundler.

  * It update bundler 2 mode to bundler 3.

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

3 files changed, 7 insertions, 7 deletions

diff --git a/spec/bundler/other/bundle_ruby_spec.rb b/spec/bundler/other/bundle_ruby_spec.rb
index a7da9cbec9..88933b039e 100644
--- a/spec/bundler/other/bundle_ruby_spec.rb
+++ b/spec/bundler/other/bundle_ruby_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "bundle_ruby", :bundler => "< 2" do
+RSpec.describe "bundle_ruby", :ruby_repo, :bundler => "< 3" do
   context "without patchlevel" do
     it "returns the ruby version" do
       gemfile <<-G
diff --git a/spec/bundler/other/major_deprecation_spec.rb b/spec/bundler/other/major_deprecation_spec.rb
index fba177b497..a147d053e1 100644
--- a/spec/bundler/other/major_deprecation_spec.rb
+++ b/spec/bundler/other/major_deprecation_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "major deprecations", :bundler => "< 2" do
+RSpec.describe "major deprecations", :bundler => "< 3" do
   let(:warnings) { last_command.bundler_err } # change to err in 2.0
   let(:warnings_without_version_messages) { warnings.gsub(/#{Spec::Matchers::MAJOR_DEPRECATION}Bundler will only support ruby(gems)? >= .*/, "") }
 
diff --git a/spec/bundler/other/platform_spec.rb b/spec/bundler/other/platform_spec.rb
index ca74945563..96527e1641 100644
--- a/spec/bundler/other/platform_spec.rb
+++ b/spec/bundler/other/platform_spec.rb
@@ -633,7 +633,7 @@ G
       end
     end
 
-    it "fails if ruby version doesn't match", :bundler => "< 2" do
+    it "fails if ruby version doesn't match", :bundler => "< 3" do
       gemfile <<-G
         source "file://#{gem_repo1}"
         gem "rails"
@@ -645,7 +645,7 @@ G
       should_be_ruby_version_incorrect
     end
 
-    it "fails if engine doesn't match", :bundler => "< 2" do
+    it "fails if engine doesn't match", :bundler => "< 3" do
       gemfile <<-G
         source "file://#{gem_repo1}"
         gem "rails"
@@ -657,7 +657,7 @@ G
       should_be_engine_incorrect
     end
 
-    it "fails if engine version doesn't match", :bundler => "< 2" do
+    it "fails if engine version doesn't match", :bundler => "< 3" do
       simulate_ruby_engine "jruby" do
         gemfile <<-G
           source "file://#{gem_repo1}"
@@ -671,7 +671,7 @@ G
       end
     end
 
-    it "fails when patchlevel doesn't match", :bundler => "< 2" do
+    it "fails when patchlevel doesn't match", :bundler => "< 3" do
       gemfile <<-G
         source "file://#{gem_repo1}"
         gem "rack"
@@ -928,7 +928,7 @@ G
     end
   end
 
-  context "bundle console", :bundler => "< 2" do
+  context "bundle console", :bundler => "< 3" do
     before do
       install_gemfile <<-G
         source "file://#{gem_repo1}"