summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-07-27 12:29:50 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-08-02 15:04:28 -0500
commit17107b22ad41ee306f534bcee375bb3d08d5f460 (patch)
treebe10ffc15fc47d81248b0d5819ad90fcaed154fd
parent70bc65cf41f2db1e9477e5e49dc265ab8f4f6422 (diff)
downloadbundler-17107b22ad41ee306f534bcee375bb3d08d5f460.tar.gz
[Gemspec] Depend upon rspec ~> 3.5
-rw-r--r--bundler.gemspec2
-rw-r--r--spec/spec_helper.rb3
2 files changed, 2 insertions, 3 deletions
diff --git a/bundler.gemspec b/bundler.gemspec
index 3b3cbf46f5..6c9d046de9 100644
--- a/bundler.gemspec
+++ b/bundler.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "rake", "~> 10.0"
s.add_development_dependency "rdiscount", "~> 2.1.8"
s.add_development_dependency "ronn", "~> 0.7.3"
- s.add_development_dependency "rspec", "~> 3.0"
+ s.add_development_dependency "rspec", "~> 3.5"
s.files = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
# we don't check in man pages, but we need to ship them because
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 05cd430048..68146168e7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -81,8 +81,7 @@ RSpec.configure do |config|
config.filter_run_excluding :git => LessThanProc.with(git_version)
config.filter_run_excluding :rubygems_master => (ENV["RGV"] != "master")
- config.filter_run :focused => true unless ENV["CI"]
- config.run_all_when_everything_filtered = true
+ config.filter_run_when_matching :focus unless ENV["CI"]
original_wd = Dir.pwd
original_env = ENV.to_hash