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

Rename Selector#filter => node_filter

This commit is contained in:
Thomas Walpole 2018-05-29 14:02:03 -07:00
parent daa6a4c7da
commit 88e3ac2d2c
6 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/capybara/selector.rb
View File

@ -2,10 +2,10 @@
require 'capybara/selector/selector'
Capybara::Selector::FilterSet.add(:_field) do
filter(:checked, :boolean) { |node, value| !(value ^ node.checked?) }
filter(:unchecked, :boolean) { |node, value| (value ^ node.checked?) }
filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| !(value ^ node.disabled?) }
filter(:multiple, :boolean) { |node, value| !(value ^ node.multiple?) }
node_filter(:checked, :boolean) { |node, value| !(value ^ node.checked?) }
node_filter(:unchecked, :boolean) { |node, value| (value ^ node.checked?) }
node_filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| !(value ^ node.disabled?) }
node_filter(:multiple, :boolean) { |node, value| !(value ^ node.multiple?) }
expression_filter(:name) { |xpath, val| xpath[XPath.attr(:name) == val] }
expression_filter(:placeholder) { |xpath, val| xpath[XPath.attr(:placeholder) == val] }
@ -89,8 +89,8 @@ Capybara.add_selector(:field) do
filter_set(:_field) # checked/unchecked/disabled/multiple/name/placeholder
filter(:readonly, :boolean) { |node, value| !(value ^ node.readonly?) }
filter(:with) do |node, with|
node_filter(:readonly, :boolean) { |node, value| !(value ^ node.readonly?) }
node_filter(:with) do |node, with|
with.is_a?(Regexp) ? node.value =~ with : node.value == with.to_s
end
describe do |type: nil, **options|
@ -164,7 +164,7 @@ Capybara.add_selector(:link) do
xpath
end
filter(:href) do |node, href|
node_filter(:href) do |node, href|
# If not a Regexp it's been handled in the main XPath
href.is_a?(Regexp) ? node[:href].match(href) : true
end
@ -214,7 +214,7 @@ Capybara.add_selector(:button) do
res_xpath
end
filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| !(value ^ node.disabled?) }
node_filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| !(value ^ node.disabled?) }
describe do |disabled: nil, **options|
desc = +""
@ -234,7 +234,7 @@ Capybara.add_selector(:link_or_button) do
self.class.all.values_at(:link, :button).map { |selector| selector.xpath.call(locator, options) }.reduce(:union)
end
filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| node.tag_name == "a" || !(value ^ node.disabled?) }
node_filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| node.tag_name == "a" || !(value ^ node.disabled?) }
describe { |disabled: nil, **_options| " that is disabled" if disabled == true }
end
@ -272,7 +272,7 @@ Capybara.add_selector(:fillable_field) do
filter_set(:_field, %i[disabled multiple name placeholder])
filter(:with) do |node, with|
node_filter(:with) do |node, with|
with.is_a?(Regexp) ? node.value =~ with : node.value == with.to_s
end
@ -307,7 +307,7 @@ Capybara.add_selector(:radio_button) do
filter_set(:_field, %i[checked unchecked disabled name])
filter(:option) { |node, value| node.value == value.to_s }
node_filter(:option) { |node, value| node.value == value.to_s }
describe do |option: nil, **options|
desc = +""
@ -338,7 +338,7 @@ Capybara.add_selector(:checkbox) do
filter_set(:_field, %i[checked unchecked disabled name])
filter(:option) { |node, value| node.value == value.to_s }
node_filter(:option) { |node, value| node.value == value.to_s }
describe do |option: nil, **options|
desc = +""
@ -374,7 +374,7 @@ Capybara.add_selector(:select) do
filter_set(:_field, %i[disabled multiple name placeholder])
filter(:options) do |node, options|
node_filter(:options) do |node, options|
actual = if node.visible?
node.all(:xpath, './/option', wait: false).map(&:text)
else
@ -389,12 +389,12 @@ Capybara.add_selector(:select) do
end
end
filter(:selected) do |node, selected|
node_filter(:selected) do |node, selected|
actual = node.all(:xpath, './/option', visible: false, wait: false).select(&:selected?).map { |option| option.text(:all) }
Array(selected).sort == actual.sort
end
filter(:with_selected) do |node, selected|
node_filter(:with_selected) do |node, selected|
actual = node.all(:xpath, './/option', visible: false, wait: false).select(&:selected?).map { |option| option.text(:all) }
(Array(selected) - actual).empty?
end
@ -420,7 +420,7 @@ Capybara.add_selector(:datalist_input) do
filter_set(:_field, %i[disabled name placeholder])
filter(:options) do |node, options|
node_filter(:options) do |node, options|
actual = node.find("//datalist[@id=#{node[:list]}]", visible: :all).all(:datalist_option, wait: false).map(&:value)
options.sort == actual.sort
end
@ -455,8 +455,8 @@ Capybara.add_selector(:option) do
xpath
end
filter(:disabled, :boolean) { |node, value| !(value ^ node.disabled?) }
filter(:selected, :boolean) { |node, value| !(value ^ node.selected?) }
node_filter(:disabled, :boolean) { |node, value| !(value ^ node.disabled?) }
node_filter(:selected, :boolean) { |node, value| !(value ^ node.selected?) }
describe do |**options|
desc = +""
@ -476,7 +476,7 @@ Capybara.add_selector(:datalist_option) do
xpath
end
filter(:disabled, :boolean) { |node, value| !(value ^ node.disabled?) }
node_filter(:disabled, :boolean) { |node, value| !(value ^ node.disabled?) }
describe do |**options|
desc = +""
@ -534,7 +534,7 @@ Capybara.add_selector(:label) do
xpath
end
filter(:for) do |node, field_or_value|
node_filter(:for) do |node, field_or_value|
if field_or_value.is_a? Capybara::Node::Element
if node[:for]
field_or_value[:id] == node[:for]
@ -617,7 +617,7 @@ Capybara.add_selector(:element) do
end
end
filter(:attributes, matcher: /.+/) do |node, name, val|
node_filter(:attributes, matcher: /.+/) do |node, name, val|
val.is_a?(Regexp) ? node[name] =~ val : true
end

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

@ -15,9 +15,10 @@ module Capybara
instance_eval(&block)
end
def filter(name, *types_and_options, &block)
def node_filter(name, *types_and_options, &block)
add_filter(name, Filters::NodeFilter, *types_and_options, &block)
end
alias_method :filter, :node_filter
def expression_filter(name, *types_and_options, &block)
add_filter(name, Filters::ExpressionFilter, *types_and_options, &block)

2
lib/capybara/selector/selector.rb
View File

@ -194,7 +194,7 @@ module Capybara
# is passed for the name the block should accept | current_expression, option_name, option_value |. In either case
# the block should return the modified expression
def_delegators :@filter_set, :filter, :expression_filter
def_delegators :@filter_set, :node_filter, :expression_filter, :filter
def filter_set(name, filters_to_use = nil)
f_set = FilterSet.all[name]

6
lib/capybara/spec/session/find_spec.rb
View File

@ -127,7 +127,7 @@ Capybara::SpecHelper.spec '#find' do
before do
Capybara.add_selector(:beatle) do
xpath { |name| ".//li[contains(@class, 'beatle')][contains(text(), '#{name}')]" }
filter(:type) { |node, type| node[:class].split(/\s+/).include?(type) }
node_filter(:type) { |node, type| node[:class].split(/\s+/).include?(type) }
end
end
@ -151,7 +151,7 @@ Capybara::SpecHelper.spec '#find' do
before do
Capybara.add_selector(:beatle) do
xpath { |name| ".//li[contains(@class, 'beatle')][contains(text(), '#{name}')]" }
filter(:type, default: "drummer") { |node, type| node[:class].split(/\s+/).include?(type) }
node_filter(:type, default: "drummer") { |node, type| node[:class].split(/\s+/).include?(type) }
end
end
@ -174,7 +174,7 @@ Capybara::SpecHelper.spec '#find' do
context "with alternate filter set" do
before do
Capybara::Selector::FilterSet.add(:value) do
filter(:with) { |node, with| node.value == with.to_s }
node_filter(:with) { |node, with| node.value == with.to_s }
end
Capybara.add_selector(:id_with_field_filters) do

14
spec/filter_set_spec.rb
View File

@ -9,7 +9,7 @@ RSpec.describe Capybara::Selector::FilterSet do
it "allows node filters" do
fs = Capybara::Selector::FilterSet.add(:test) do
filter(:node_test, :boolean) { |_node, _value| true }
node_filter(:node_test, :boolean) { |_node, _value| true }
expression_filter(:expression_test, :boolean) { |_expr, _value| true }
end
@ -19,7 +19,7 @@ RSpec.describe Capybara::Selector::FilterSet do
it "allows expression filters" do
fs = Capybara::Selector::FilterSet.add(:test) do
filter(:node_test, :boolean) { |_node, _value| true }
node_filter(:node_test, :boolean) { |_node, _value| true }
expression_filter(:expression_test, :boolean) { |_expr, _value| true }
end
@ -29,10 +29,18 @@ RSpec.describe Capybara::Selector::FilterSet do
it "allows node filter and expression filter with the same name" do
fs = Capybara::Selector::FilterSet.add(:test) do
filter(:test, :boolean) { |_node, _value| true }
node_filter(:test, :boolean) { |_node, _value| true }
expression_filter(:test, :boolean) { |_expr, _value| true }
end
expect(fs.expression_filters[:test]).not_to eq fs.node_filters[:test]
end
it "allows `filter` as an alias of `node_filter`" do
fs = Capybara::Selector::FilterSet.add(:test) do
filter(:node_test, :boolean) { |_node, _value| true }
end
expect(fs.node_filters.keys).to include(:node_test)
end
end

11
spec/selector_spec.rb
View File

@ -49,7 +49,7 @@ RSpec.describe Capybara do
before do
Capybara.add_selector :custom_selector do
css { |css_class| "div.#{css_class}" }
filter(:not_empty, boolean: true, default: true, skip_if: :all) { |node, value| value ^ (node.text == '') }
node_filter(:not_empty, boolean: true, default: true, skip_if: :all) { |node, value| value ^ (node.text == '') }
end
Capybara.add_selector :custom_css_selector do
@ -61,6 +61,15 @@ RSpec.describe Capybara do
end
end
it "supports `filter` as an alias for `node_filter`" do
expect do
Capybara.add_selector :filter_alias_selector do
css { |_unused| "div"}
filter(:something) { |_node, _value| true }
end
end.not_to raise_error
end
describe "adding a selector" do
it "can set default visiblity" do
Capybara.add_selector :hidden_field do