Move on to bundler 3

* Drop bundler 1 stuff from tests.
* Move all feature flags to bundler 3 (like they are in 2-0-stable) and
get them tested.

2 files changed, 5 insertions, 5 deletions

diff --git a/spec/cache/git_spec.rb b/spec/cache/git_spec.rb
index 4ed519b9d6..55a24ff118 100644
--- a/spec/cache/git_spec.rb
+++ b/spec/cache/git_spec.rb
@@ -168,7 +168,7 @@ end
       expect(the_bundle).to include_gems "has_submodule 1.0"
     end
 
-    it "displays warning message when detecting git repo in Gemfile", :bundler => "< 2" do
+    it "displays warning message when detecting git repo in Gemfile", :bundler => "< 3" do
       build_git "foo"
 
       install_gemfile <<-G
@@ -177,7 +177,7 @@ end
 
       bundle "#{cmd}"
 
-      expect(out).to include("Your Gemfile contains path and git dependencies.")
+      expect(err).to include("Your Gemfile contains path and git dependencies.")
     end
 
     it "does not display warning message if cache_all is set in bundle config" do
@@ -190,7 +190,7 @@ end
       bundle cmd, forgotten_command_line_options([:all, :cache_all] => true)
       bundle cmd
 
-      expect(out).not_to include("Your Gemfile contains path and git dependencies.")
+      expect(err).not_to include("Your Gemfile contains path and git dependencies.")
     end
 
     it "caches pre-evaluated gemspecs" do
diff --git a/spec/cache/path_spec.rb b/spec/cache/path_spec.rb
index 8c6a843476..0d7b154a37 100644
--- a/spec/cache/path_spec.rb
+++ b/spec/cache/path_spec.rb
@@ -86,7 +86,7 @@
       expect(bundled_app("vendor/cache/bar-1.0")).not_to exist
     end
 
-    it "raises a warning without --all", :bundler => "< 2" do
+    it "raises a warning without --all", :bundler => "< 3" do
       build_lib "foo"
 
       install_gemfile <<-G
@@ -94,7 +94,7 @@
       G
 
       bundle cmd
-      expect(out).to match(/please pass the \-\-all flag/)
+      expect(err).to match(/please pass the \-\-all flag/)
       expect(bundled_app("vendor/cache/foo-1.0")).not_to exist
     end