summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2024-11-22 11:14:08 +0100
committergit <svn-admin@ruby-lang.org>2024-11-29 15:27:39 +0000
commit9a4d91fa9507d981a02595d1760628f74396feec (patch)
tree6b181f43f42816b719d8f03b0fc1ed949f8df9d2 /spec
parent2a8437a1eb54f8beedb9c1f2e2dd5001d04ca13b (diff)
[rubygems/rubygems] Restore previous application cache format for git sources
And make sure `bundle install --local` can install from it without git. https://github.com/rubygems/rubygems/commit/7d6b631620
Diffstat (limited to 'spec')
-rw-r--r--spec/bundler/cache/git_spec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/bundler/cache/git_spec.rb b/spec/bundler/cache/git_spec.rb
index ea91829003..c2e69cf3dc 100644
--- a/spec/bundler/cache/git_spec.rb
+++ b/spec/bundler/cache/git_spec.rb
@@ -27,7 +27,6 @@ RSpec.describe "bundle cache with git" do
expect(bundled_app("vendor/cache/foo-1.0-#{ref}")).to exist
expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.git")).not_to exist
expect(bundled_app("vendor/cache/foo-1.0-#{ref}/.bundlecache")).to be_file
- expect(Dir.glob(bundled_app("vendor/cache/foo-1.0-#{ref}/hooks/*.sample"))).to be_empty
FileUtils.rm_rf lib_path("foo-1.0")
expect(the_bundle).to include_gems "foo 1.0"
@@ -240,7 +239,7 @@ RSpec.describe "bundle cache with git" do
expect(the_bundle).to include_gem "foo 1.0"
end
- it "copies repository to vendor cache" do
+ it "copies repository to vendor cache, including submodules" do
# CVE-2022-39253: https://lore.kernel.org/lkml/xmqq4jw1uku5.fsf@gitster.g/
system(*%W[git config --global protocol.file.allow always])
@@ -265,6 +264,7 @@ RSpec.describe "bundle cache with git" do
bundle :cache
expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}")).to exist
+ expect(bundled_app("vendor/cache/has_submodule-1.0-#{ref}/submodule-1.0")).to exist
expect(the_bundle).to include_gems "has_submodule 1.0"
end
@@ -275,7 +275,6 @@ RSpec.describe "bundle cache with git" do
source "https://gem.repo1"
gem "foo", :git => '#{lib_path("foo-1.0")}'
G
- bundle "config set path vendor/bundle"
bundle "config set cache_all true"
bundle :cache, "all-platforms" => true, :install => false