summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2014-11-16 11:56:15 -0800
committerAndre Arko <andre@arko.net>2014-11-19 13:31:18 -0800
commit9c5d3bd60aa1c6d891d41d368aed90e11c2ecfe3 (patch)
tree9ecca897f822b8d09b4c745f6e6279ba2dfd73c1
parent5d5651d35bbda4ad526c8f86bb2ce03f501a9eae (diff)
downloadbundler-9c5d3bd60aa1c6d891d41d368aed90e11c2ecfe3.tar.gz
Run all tests against RG master again
Conflicts: spec/spec_helper.rb
-rw-r--r--spec/spec_helper.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 774f10cecb..e55a72bcf0 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -76,11 +76,7 @@ RSpec.configure do |config|
config.filter_run_excluding :rubygems => "2.2"
end
- if ENV['RGV'] == "master"
- config.filter_run :rubygems_master => true
- else
- config.filter_run_excluding :rubygems_master => true
- end
+ config.filter_run_excluding :rubygems_master => (ENV['RGV'] != "master")
config.filter_run :focused => true unless ENV['CI']
config.run_all_when_everything_filtered = true