summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2018-07-29 16:47:20 -0700
committerSamuel Giddins <segiddins@segiddins.me>2018-07-29 16:50:25 -0700
commit9b38bcb791f4e78ea041e71e7caa6d91eb9076b6 (patch)
tree4661ba620b20d104fbb64b9177a75cefe4c502dc
parent3dabfcbec8317c80fae190ebd717f73e74ba3324 (diff)
downloadbundler-9b38bcb791f4e78ea041e71e7caa6d91eb9076b6.tar.gz
Update sudo specs
-rw-r--r--spec/install/bundler_spec.rb1
-rw-r--r--spec/install/gems/sudo_spec.rb4
2 files changed, 5 insertions, 0 deletions
diff --git a/spec/install/bundler_spec.rb b/spec/install/bundler_spec.rb
index 08b7e2b673..42863ed89b 100644
--- a/spec/install/bundler_spec.rb
+++ b/spec/install/bundler_spec.rb
@@ -140,6 +140,7 @@ RSpec.describe "bundle install" do
it "can install dependencies with newer bundler version with a local path", :ruby => "> 2" do
bundle! "config path .bundle"
+ bundle! "config global_path_appends_ruby_scope true"
install_gemfile! <<-G
source "file://#{gem_repo2}"
gem "rails", "3.0"
diff --git a/spec/install/gems/sudo_spec.rb b/spec/install/gems/sudo_spec.rb
index ae94eee9c6..1781451c98 100644
--- a/spec/install/gems/sudo_spec.rb
+++ b/spec/install/gems/sudo_spec.rb
@@ -52,6 +52,8 @@ RSpec.describe "when using sudo", :sudo => true do
end
it "installs when BUNDLE_PATH is owned by root" do
+ bundle! "config global_path_appends_ruby_scope false" # consistency in tests between 1.x and 2.x modes
+
bundle_path = tmp("owned_by_root")
FileUtils.mkdir_p bundle_path
sudo "chown -R root #{bundle_path}"
@@ -68,6 +70,8 @@ RSpec.describe "when using sudo", :sudo => true do
end
it "installs when BUNDLE_PATH does not exist" do
+ bundle! "config global_path_appends_ruby_scope false" # consistency in tests between 1.x and 2.x modes
+
root_path = tmp("owned_by_root")
FileUtils.mkdir_p root_path
sudo "chown -R root #{root_path}"