summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-08-07 20:35:28 +0200
committerSHIBATA Hiroshi <hsbt@ruby-lang.org>2019-08-16 14:30:23 +0900
commit7ff0b4fec4cbd763e9bb7be597b54217176a8d86 (patch)
tree7ffb0469b976608d34c93ab07e1234dd4e26b2fe
parent6c6c4c7388c2f1c0f579de363bb0ec66ad851b5b (diff)
[bundler/bundler] Fix installation of system bundler
Previously it was being installed to the :bundle_path (`/tmp/bundled_app/.bundle`), but the `bundle` helper uses the `system_gem_path("bin/bundle")`. That means the first `bundle install`in the spec was actually failing, but not affecting the test status because of not being called as `bundle!`. https://github.com/bundler/bundler/commit/ad75f75539
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/2366
-rw-r--r--spec/bundler/commands/exec_spec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/bundler/commands/exec_spec.rb b/spec/bundler/commands/exec_spec.rb
index 3016ca928f..dde9e94ed2 100644
--- a/spec/bundler/commands/exec_spec.rb
+++ b/spec/bundler/commands/exec_spec.rb
@@ -840,10 +840,10 @@ __FILE__: #{path.to_s.inspect}
end
context "nested bundle exec" do
- let(:system_gems_to_install) { super() << :bundler }
-
context "when bundle in a local path" do
before do
+ system_gems :bundler
+
gemfile <<-G
source "#{file_uri_for(gem_repo1)}"
gem "rack"
@@ -853,7 +853,6 @@ __FILE__: #{path.to_s.inspect}
end
it "correctly shells out", :ruby_repo do
- system_gems :bundler
file = bundled_app("file_that_bundle_execs.rb")
create_file(file, <<-RB)
#!#{Gem.ruby}