summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2018-11-16 14:10:22 +0000
committerSHIBATA Hiroshi <hsbt@ruby-lang.org>2018-11-17 06:46:25 +0900
commita7207e171d1e651fe7bf8361d745829a47a272a3 (patch)
tree0e3389f76a1fec1ad6700993ae4c851b18a904e3
parent02cd16945342a5a74051c04d208337f170464f34 (diff)
downloadbundler-a7207e171d1e651fe7bf8361d745829a47a272a3.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)
-rw-r--r--spec/commands/show_spec.rb2
-rw-r--r--spec/spec_helper.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/commands/show_spec.rb b/spec/commands/show_spec.rb
index 55bdacac98..a5c6beec1a 100644
--- a/spec/commands/show_spec.rb
+++ b/spec/commands/show_spec.rb
@@ -86,7 +86,7 @@ RSpec.describe "bundle show", :bundler => "< 3", :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 8d8272e573..ff009e773f 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