summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSHIBATA Hiroshi <hsbt@ruby-lang.org>2018-11-16 22:17:58 +0900
committerSHIBATA Hiroshi <hsbt@ruby-lang.org>2018-11-16 22:17:58 +0900
commit66f5dcbd06edebc442dea6b01d0e8bc7449d1d54 (patch)
tree0d35903841bd337702550f01d814407371a012a7
parent05b552ccafb6fc6492e498edaeddd0979657c517 (diff)
downloadbundler-66f5dcbd06edebc442dea6b01d0e8bc7449d1d54.tar.gz
Followed up https://github.com/bundler/bundler/pull/6743
#6743 was failed with ruby core repository and ignored working example. Fixed them.
-rw-r--r--spec/commands/show_spec.rb4
-rw-r--r--spec/spec_helper.rb6
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