archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[rubygems/rubygems] Remove unnecessary branching

Browse source 
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.

3866d25a00
This commit is contained in:
David Rodríguez 2025-07-24 21:49:35 +02:00 • committed by Hiroshi SHIBATA
parent 2690d21067
commit 0dc86fd843
3 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/bundler/commands/clean_spec.rb
View file

@ -151,7 +151,7 @@ RSpec.describe "bundle clean" do
bundle :clean bundle :clean
digest = Digest(:SHA1).hexdigest(git_path.to_s) 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 expect(cache_path).to exist
end end

6
spec/bundler/install/gems/compact_index_spec.rb
View file

@ -1010,11 +1010,7 @@ RSpec.describe "compact index api" do
gem "myrack" gem "myrack"
G G
gem_path = if Bundler.feature_flag.global_gem_cache? gem_path = default_cache_path.dirname.join("myrack-1.0.0.gem")
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
expect(exitstatus).to eq(37) expect(exitstatus).to eq(37)
expect(err).to eq <<~E.strip expect(err).to eq <<~E.strip

12
spec/bundler/support/path.rb
View file

@ -136,19 +136,11 @@ module Spec
end end
def default_bundle_path(*path) def default_bundle_path(*path)
if Bundler.feature_flag.bundler_4_mode? system_gem_path(*path)
local_gem_path(*path)
else
system_gem_path(*path)
end
end end
def default_cache_path(*path) def default_cache_path(*path)
if Bundler.feature_flag.global_gem_cache? default_bundle_path("cache/bundler", *path)
home(".bundle/cache", *path)
else
default_bundle_path("cache/bundler", *path)
end
end end
def compact_index_cache_path def compact_index_cache_path