summaryrefslogtreecommitdiff
path: root/spec/install/gemfile/git_spec.rb
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2017-07-25 03:33:50 +0000
committerThe Bundler Bot <bot@bundler.io>2017-07-25 03:33:50 +0000
commit219ea82fd4c84fcf047fc4cd957147600902288e (patch)
treec0feb454837dc0de5df6666a81d48fc657ad9d3b /spec/install/gemfile/git_spec.rb
parentc34f20a39b03d07f72089fa58bf5af24edd6b490 (diff)
parent65c05e88eaba044117e80aa40c8a8e7ffc8f6a27 (diff)
downloadbundler-219ea82fd4c84fcf047fc4cd957147600902288e.tar.gz
Auto merge of #5860 - bundler:seg-validate-settings, r=segiddins
Introduce the notion of settings validation & default install to ./.bundle Thanks so much for the contribution! To make reviewing this PR a bit easier, please fill out answers to the following questions. ### What was the end-user problem that led to this PR? The problem was... ### What was your diagnosis of the problem? My diagnosis was... ### What is your fix for the problem, implemented in this PR? My fix... ### Why did you choose this fix out of the possible options? I chose this fix because...
Diffstat (limited to 'spec/install/gemfile/git_spec.rb')
-rw-r--r--spec/install/gemfile/git_spec.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/install/gemfile/git_spec.rb b/spec/install/gemfile/git_spec.rb
index 71ef3c856f..a3e69325cc 100644
--- a/spec/install/gemfile/git_spec.rb
+++ b/spec/install/gemfile/git_spec.rb
@@ -287,7 +287,7 @@ RSpec.describe "bundle install with git sources" do
# ensure we also git fetch after cloning
bundle! :update, :all => bundle_update_requires_all?
- Dir.chdir(Dir[system_gem_path("cache/bundler/git/foo-*")].first) do
+ Dir.chdir(Dir[default_bundle_path("cache/bundler/git/foo-*")].first) do
sys_exec("git ls-remote .")
end
@@ -893,6 +893,7 @@ RSpec.describe "bundle install with git sources" do
it "prints a friendly error if a file blocks the git repo" do
build_git "foo"
+ FileUtils.mkdir_p(default_bundle_path)
FileUtils.touch(default_bundle_path("bundler"))
install_gemfile <<-G
@@ -1118,7 +1119,7 @@ RSpec.describe "bundle install with git sources" do
run! <<-R
puts $:.grep(/ext/)
R
- expect(out).to eq(Pathname.glob(system_gem_path("bundler/gems/extensions/**/foo-1.0-*")).first.to_s)
+ expect(out).to eq(Pathname.glob(default_bundle_path("bundler/gems/extensions/**/foo-1.0-*")).first.to_s)
end
it "does not use old extension after ref changes" do