[rubygems/rubygems] Remove unnecessary branching

We now run specs against a single version, so I prefer to keep a single
branch. Once we bump the major version, this will need very little
updates, and that seems fine.

https://github.com/rubygems/rubygems/commit/3866d25a00

3 files changed, 4 insertions, 16 deletions

diff --git a/spec/bundler/commands/clean_spec.rb b/spec/bundler/commands/clean_spec.rb
index 99a8f9c141..672f0afed7 100644
--- a/spec/bundler/commands/clean_spec.rb
+++ b/spec/bundler/commands/clean_spec.rb
@@ -151,7 +151,7 @@ RSpec.describe "bundle clean" do
     bundle :clean
 
     digest = Digest(:SHA1).hexdigest(git_path.to_s)
-    cache_path = Bundler.feature_flag.global_gem_cache? ? home(".bundle/cache/git/foo-1.0-#{digest}") : vendored_gems("cache/bundler/git/foo-1.0-#{digest}")
+    cache_path = vendored_gems("cache/bundler/git/foo-1.0-#{digest}")
     expect(cache_path).to exist
   end
 
diff --git a/spec/bundler/install/gems/compact_index_spec.rb b/spec/bundler/install/gems/compact_index_spec.rb
index 823b5aab11..e5f7380855 100644
--- a/spec/bundler/install/gems/compact_index_spec.rb
+++ b/spec/bundler/install/gems/compact_index_spec.rb
@@ -1010,11 +1010,7 @@ RSpec.describe "compact index api" do
         gem "myrack"
       G
 
-      gem_path = if Bundler.feature_flag.global_gem_cache?
-        default_cache_path.dirname.join("cache", "gems", "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "myrack-1.0.0.gem")
-      else
-        default_cache_path.dirname.join("myrack-1.0.0.gem")
-      end
+      gem_path = default_cache_path.dirname.join("myrack-1.0.0.gem")
 
       expect(exitstatus).to eq(37)
       expect(err).to eq <<~E.strip
diff --git a/spec/bundler/support/path.rb b/spec/bundler/support/path.rb
index 7c2d06abaf..cc750f55d8 100644
--- a/spec/bundler/support/path.rb
+++ b/spec/bundler/support/path.rb
@@ -136,19 +136,11 @@ module Spec
     end
 
     def default_bundle_path(*path)
-      if Bundler.feature_flag.bundler_4_mode?
-        local_gem_path(*path)
-      else
-        system_gem_path(*path)
-      end
+      system_gem_path(*path)
     end
 
     def default_cache_path(*path)
-      if Bundler.feature_flag.global_gem_cache?
-        home(".bundle/cache", *path)
-      else
-        default_bundle_path("cache/bundler", *path)
-      end
+      default_bundle_path("cache/bundler", *path)
     end
 
     def compact_index_cache_path