summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Lance <stefan@lances.net>2015-07-09 12:34:14 -0500
committerSamuel E. Giddins <segiddins@segiddins.me>2015-07-16 16:55:05 -0700
commit4334e66f35fb8acf9eada4cd7901e9d3b740a055 (patch)
tree640e2c4a170604162abcfcaee08b1a14b32061e6
parent030a886637009421550a5635875efc8f8d0c81bb (diff)
downloadbundler-4334e66f35fb8acf9eada4cd7901e9d3b740a055.tar.gz
Fix config spec
-rw-r--r--spec/commands/config_spec.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/spec/commands/config_spec.rb b/spec/commands/config_spec.rb
index 3ec41c5157..4ff5f0019e 100644
--- a/spec/commands/config_spec.rb
+++ b/spec/commands/config_spec.rb
@@ -289,9 +289,14 @@ E
describe "setting `path` when `path.system` is already set" do
it "should print a warning and remove the `path.system` setting" do
bundle "config path.system true"
- # Note that if a path is used that does not include the installed gems,
- # we'll get an error when we pass _any_ command to `run` below.
- bundle "config path #{default_bundle_path}"
+ # Note that if we use `default_bundle_path` in place of
+ # `bundled_app(".bundle")` below, we add two `Bundler.ruby_scope`s to
+ # `Bundler.settings.path`, making it
+ # `bundler/tmp/bundled_app/.bundle/ruby/1.9.1/ruby/1.9.1` instead of
+ # `bundler/tmp/bundled_app/.bundle/ruby/1.9.1`.
+ # FIXME: Maybe we should ensure that installation paths cannot have
+ # two `Bundler.ruby_scope`s in them in `Settings#path`.
+ bundle "config path #{bundled_app(".bundle")}"
expect(out).to include("`path.system` is already configured")
run "puts Bundler.settings['path.system'] == nil"