Browse files

Merge pull request #380 from joshcooper/patch-1

Properly merge command-line exclusions with default :if and :unless.
  • Loading branch information...
2 parents 0871afc + 51c30d2 commit 69c11b15b6cafdafe4b59c19448a6b0ebea9f7c5 @justinko justinko committed May 19, 2011
Showing with 1 addition and 0 deletions.
  1. +1 −0 lib/rspec/core/configuration_options.rb
View
1 lib/rspec/core/configuration_options.rb
@@ -16,6 +16,7 @@ def configure(config)
keys.unshift(:requires) if keys.delete(:requires)
keys.unshift(:libs) if keys.delete(:libs)
formatters = options[:formatters] if keys.delete(:formatters)
+ config.exclusion_filter.merge! options[:exclusion_filter] if keys.delete(:exclusion_filter)
keys.each do |key|
config.send("#{key}=", options[key]) if config.respond_to?("#{key}=")
end

0 comments on commit 69c11b1

Please sign in to comment.