diff options
author | Bundlerbot <bot@bundler.io> | 2018-11-16 14:10:22 +0000 |
---|---|---|
committer | Bundlerbot <bot@bundler.io> | 2018-11-16 14:10:22 +0000 |
commit | 9cfe9bd9be4b44bde1fd71e6faab494509ceb7b6 (patch) | |
tree | 0d35903841bd337702550f01d814407371a012a7 | |
parent | 05b552ccafb6fc6492e498edaeddd0979657c517 (diff) | |
parent | 66f5dcbd06edebc442dea6b01d0e8bc7449d1d54 (diff) | |
download | bundler-9cfe9bd9be4b44bde1fd71e6faab494509ceb7b6.tar.gz |
Merge #6786
6786: Followed up #6743 r=hsbt a=hsbt
### What was the end-user problem that led to this PR?
#6743 was failed with ruby core repository and ignored working example.
I fixed them.
Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
-rw-r--r-- | spec/commands/show_spec.rb | 4 | ||||
-rw-r--r-- | spec/spec_helper.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/commands/show_spec.rb b/spec/commands/show_spec.rb index 369d0d708a..102b9534de 100644 --- a/spec/commands/show_spec.rb +++ b/spec/commands/show_spec.rb @@ -60,12 +60,12 @@ RSpec.describe "bundle show" do and include(default_bundle_path("gems", "rails-2.3.2").to_s) end - it "prints the path to the running bundler", :ruby_repo, :bundler => "< 2" do + it "prints the path to the running bundler", :bundler => "< 2" do bundle "show bundler" expect(out).to eq(root.to_s) end - it "prints the path to the running bundler", :ruby_repo, :bundler => "2" do + it "prints the path to the running bundler", :bundler => "2" do bundle "show bundler" expect(out).to eq( "[DEPRECATED FOR 2.0] use `bundle info bundler` instead of `bundle show bundler`\n" + diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f79c4e683a..f2ccccc5ef 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -114,13 +114,13 @@ RSpec.configure do |config| mocks.allow_message_expectations_on_nil = false end - config.around :suite do |example| + config.around :each do |example| if ENV["BUNDLE_RUBY"] - @orig_ruby = Gem.ruby + orig_ruby = Gem.ruby Gem.ruby = ENV["BUNDLE_RUBY"] end example.run - Gem.ruby = @orig_ruby if ENV["BUNDLE_RUBY"] + Gem.ruby = orig_ruby if ENV["BUNDLE_RUBY"] end config.before :all do |