diff options
author | Bundlerbot <bot@bundler.io> | 2018-11-16 14:10:22 +0000 |
---|---|---|
committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2018-12-11 09:30:33 +0900 |
commit | ab73067a9b32339669e146dfae619e856b85a799 (patch) | |
tree | 474b875934175285c0c7601465fb31954668dc23 | |
parent | c2e74c9b712ae4a54b4a1515ad10b13ca1dd0a8c (diff) | |
download | bundler-ab73067a9b32339669e146dfae619e856b85a799.tar.gz |
Merge #6786
6786: Followed up #6743 r=hsbt a=hsbt
I fixed them.
Co-authored-by: SHIBATA Hiroshi <hsbt@ruby-lang.org>
(cherry picked from commit 9cfe9bd9be4b44bde1fd71e6faab494509ceb7b6)
(cherry picked from commit a7207e171d1e651fe7bf8361d745829a47a272a3)
-rw-r--r-- | spec/commands/show_spec.rb | 2 | ||||
-rw-r--r-- | spec/spec_helper.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/commands/show_spec.rb b/spec/commands/show_spec.rb index 05a0f165e3..efbe4b13fb 100644 --- a/spec/commands/show_spec.rb +++ b/spec/commands/show_spec.rb @@ -86,7 +86,7 @@ RSpec.describe "bundle show", :bundler => "< 2", :ruby => ">= 2.0" do and include(default_bundle_path("gems", "rails-2.3.2").to_s) end - it "prints the path to the running bundler", :ruby_repo do + it "prints the path to the running bundler" do bundle "show bundler" expect(out).to eq(root.to_s) end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b22b6b56ea..30d3bda130 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -122,13 +122,13 @@ RSpec.configure do |config| c.syntax = :expect 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 |