summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-05-18 15:09:15 +0000
committerBundlerbot <bot@bundler.io>2019-05-18 15:09:15 +0000
commitabc124185b57c42fe61ee64603676d050d37bb15 (patch)
tree059ed38f605a8d38f4efbac106eda5992f79e8f4
parent3ec8165eec0a1af8c45ee258d3e7cb61fba875a2 (diff)
parent08cea1ecb47ece5174762d00769e2445fadadb36 (diff)
downloadbundler-abc124185b57c42fe61ee64603676d050d37bb15.tar.gz
Merge #7174
7174: Revert "Remove unused filter" r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that I removed the `:git` filter from our specs in ac282dc9de5e20db85e9cdf23b97763a2a2cc292 because I thought it was unused, but it's not. ### What was your diagnosis of the problem? My diagnosis was that the filter is actually used once: https://github.com/bundler/bundler/blob/3ec8165eec0a1af8c45ee258d3e7cb61fba875a2/spec/update/git_spec.rb#L162 ### What is your fix for the problem, implemented in this PR? My fix is to revert the commit. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
-rw-r--r--spec/spec_helper.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 35cf8bfefb..067c8dc070 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -70,8 +70,11 @@ RSpec.configure do |config|
config.filter_run_excluding :realworld => true
end
+ git_version = Bundler::Source::Git::GitProxy.new(nil, nil, nil).version
+
config.filter_run_excluding :ruby => RequirementChecker.against(RUBY_VERSION)
config.filter_run_excluding :rubygems => RequirementChecker.against(Gem::VERSION)
+ config.filter_run_excluding :git => RequirementChecker.against(git_version)
config.filter_run_excluding :rubygems_master => (ENV["RGV"] != "master")
config.filter_run_excluding :bundler => RequirementChecker.against(Bundler::VERSION.split(".")[0])
config.filter_run_excluding :ruby_repo => !(ENV["BUNDLE_RUBY"] && ENV["BUNDLE_GEM"]).nil?