kotovalexarian-likes-github
/
teamcapybara--capybara
mirror of https://github.com/teamcapybara/capybara.git
1
0
Fork 0
Code Releases Activity

Add FilterSet::[]

This commit is contained in:
Thomas Walpole 2018-11-19 14:33:39 -08:00
parent 5c8d8141af
commit 8354eef965
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/capybara/queries/selector_query.rb
View File

@ -194,7 +194,7 @@ module Capybara
end
def filter_set(name)
::Capybara::Selector::FilterSet.all[name]
::Capybara::Selector::FilterSet[name]
end
def node_filters

26
lib/capybara/selector/filter_set.rb
View File

@ -52,15 +52,16 @@ module Capybara
end
def import(name, filters = nil)
f_set = self.class.all[name]
filter_selector = filters.nil? ? ->(*) { true } : ->(filter_name, _) { filters.include? filter_name }
expression_filters.merge!(f_set.expression_filters.select(&filter_selector))
node_filters.merge!(f_set.node_filters.select(&filter_selector))
f_set.undeclared_descriptions.each { |desc| describe(&desc) }
f_set.expression_filter_descriptions.each { |desc| describe(:expression_filters, &desc) }
f_set.node_filter_descriptions.each { |desc| describe(:node_filters, &desc) }
self.class[name].tap do |f_set|
expression_filters.merge!(f_set.expression_filters.select(&filter_selector))
node_filters.merge!(f_set.node_filters.select(&filter_selector))
f_set.undeclared_descriptions.each { |desc| describe(&desc) }
f_set.expression_filter_descriptions.each { |desc| describe(:expression_filters, &desc) }
f_set.node_filter_descriptions.each { |desc| describe(:node_filters, &desc) }
end
self
end
class << self
@ -68,6 +69,10 @@ module Capybara
@filter_sets ||= {} # rubocop:disable Naming/MemoizedInstanceVariableName
end
def [](name)
all.fetch(name.to_sym) { |set_name| raise ArgumentError, "Unknown filter set (:#{set_name})" }
end
def add(name, &block)
all[name.to_sym] = FilterSet.new(name.to_sym, &block)
end
@ -107,11 +112,8 @@ module Capybara
types.each { |type| options[type] = true }
raise 'ArgumentError', ':default option is not supported for filters with a :matcher option' if matcher && options[:default]
if filter_class <= Filters::ExpressionFilter
@expression_filters[name] = filter_class.new(name, matcher, block, options)
else
@node_filters[name] = filter_class.new(name, matcher, block, options)
end
filter = filter_class.new(name, matcher, block, options)
(filter_class <= Filters::ExpressionFilter ? @expression_filters : @node_filters)[name] = filter
end
end
end