capybara 2.15.1 → 3.36.0

data/lib/capybara/selector.rb

@@ -1,542 +1,243 @@
 # frozen_string_literal: true
-require 'capybara/selector/selector'
-Capybara::Selector::FilterSet.add(:_field) do
-  filter(:checked, :boolean) { |node, value| not(value ^ node.checked?) }
-  filter(:unchecked, :boolean) { |node, value| (value ^ node.checked?) }
-  filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
-  filter(:multiple, :boolean) { |node, value| !(value ^ node.multiple?) }
-
-  expression_filter(:name) { |xpath, val| xpath[XPath.attr(:name).equals(val)] }
-  expression_filter(:placeholder) { |xpath, val| xpath[XPath.attr(:placeholder).equals(val)] }
-
-  describe do |options|
-    desc, states = String.new, []
-    states << 'checked' if options[:checked] || (options[:unchecked] == false)
-    states << 'not checked' if options[:unchecked] || (options[:checked] == false)
-    states << 'disabled' if options[:disabled] == true
-    states << 'not disabled' if options[:disabled] == false
-    desc << " that is #{states.join(' and ')}" unless states.empty?
-    desc << " with the multiple attribute" if options[:multiple] == true
-    desc << " without the multiple attribute" if options[:multiple] == false
-    desc
-  end
-end
-
-##
-#
-# Select elements by XPath expression
-#
-# @locator An XPath expression
-#
-Capybara.add_selector(:xpath) do
-  xpath { |xpath| xpath }
-end
-
-##
-#
-# Select elements by CSS selector
-#
-# @locator A CSS selector
-#
-Capybara.add_selector(:css) do
-  css { |css| css }
-end
-
-##
-#
-# Select element by id
-#
-# @locator The id of the element to match
-#
-Capybara.add_selector(:id) do
-  xpath { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
-end
-
-##
-#
-# Select field elements (input [not of type submit, image, or hidden], textarea, select)
-#
-# @locator Matches against the id, name, or placeholder
-# @filter [String] :id  Matches the id attribute
-# @filter [String] :name  Matches the name attribute
-# @filter [String] :placeholder  Matches the placeholder attribute
-# @filter [String] :type Matches the type attribute of the field or element type for 'textarea' and 'select'
-# @filter [Boolean] :readonly
-# @filter [String] :with  Matches the current value of the field
-# @filter [String, Array<String>] :class  Matches the class(es) provided
-# @filter [Boolean] :checked Match checked fields?
-# @filter [Boolean] :unchecked Match unchecked fields?
-# @filter [Boolean] :disabled Match disabled field?
-# @filter [Boolean] :multiple Match fields that accept multiple values
-Capybara.add_selector(:field) do
-  xpath do |locator, options|
-    xpath = XPath.descendant(:input, :textarea, :select)[~XPath.attr(:type).one_of('submit', 'image', 'hidden')]
-    locate_field(xpath, locator, options)
-  end
-
-  expression_filter(:type) do |expr, type|
-    type = type.to_s
-    if ['textarea', 'select'].include?(type)
-      expr.axis(:self, type.to_sym)
-    else
-      expr[XPath.attr(:type).equals(type)]
-    end
-  end
-
-  filter_set(:_field) # checked/unchecked/disabled/multiple/name/placeholder
-
-  filter(:readonly, :boolean) { |node, value| not(value ^ node.readonly?) }
-  filter(:with) do |node, with|
-    with.is_a?(Regexp) ? node.value =~ with : node.value == with.to_s
-  end
-  describe do |options|
-    desc = String.new
-    (expression_filters.keys - [:type]).each { |ef| desc << " with #{ef} #{options[ef]}" if options.has_key?(ef) }
-    desc << " of type #{options[:type].inspect}" if options[:type]
-    desc << " with value #{options[:with].to_s.inspect}" if options.has_key?(:with)
-    desc
-  end
-end
-
-##
-#
-# Select fieldset elements
-#
-# @locator Matches id or contents of wrapped legend
-#
-# @filter [String] :id Matches id attribute
-# @filter [String] :legend Matches contents of wrapped legend
-# @filter [String, Array<String>] :class Matches the class(es) provided
-#
-Capybara.add_selector(:fieldset) do
-  xpath(:legend) do |locator, options|
-    xpath = XPath.descendant(:fieldset)
-    xpath = xpath[XPath.attr(:id).equals(locator.to_s).or XPath.child(:legend)[XPath.string.n.is(locator.to_s)]] unless locator.nil?
-    xpath = xpath[XPath.child(:legend)[XPath.string.n.is(options[:legend])]] if options[:legend]
-    xpath
-  end
-end
-
-##
-#
-# Find links ( <a> elements with an href attribute )
-#
-# @locator Matches the id or title attributes, or the string content of the link, or the alt attribute of a contained img element
-#
-# @filter [String] :id  Matches the id attribute
-# @filter [String] :title Matches the title attribute
-# @filter [String] :alt Matches the alt attribute of a contained img element
-# @filter [String] :class Matches the class(es) provided
-# @filter [String, Regexp,nil] :href  Matches the normalized href of the link, if nil will find <a> elements with no href attribute
-#
-Capybara.add_selector(:link) do
-  xpath(:title, :alt) do |locator, options={}|
-    xpath = XPath.descendant(:a)
-    xpath = if options.fetch(:href, true).nil?
-      xpath[~XPath.attr(:href)]
-    else
-      xpath[XPath.attr(:href)]
-    end
-    unless locator.nil?
-      locator = locator.to_s
-      matchers = XPath.attr(:id).equals(locator).or(
-                 XPath.string.n.is(locator)).or(
-                 XPath.attr(:title).is(locator)).or(
-                 XPath.descendant(:img)[XPath.attr(:alt).is(locator)])
-      matchers = matchers.or XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
-      xpath = xpath[matchers]
-    end
-    xpath = [:title].inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
-    xpath = xpath[XPath.descendant(:img)[XPath.attr(:alt).equals(options[:alt])]] if options[:alt]
-    xpath
-  end
-
-  filter(:href) do |node, href|
-    case href
-    when nil
-      true
-    when Regexp
-      node[:href].match href
-    else
-      node.first(:xpath, XPath.axis(:self)[XPath.attr(:href).equals(href.to_s)], minimum: 0)
-    end
-  end
-
-  describe do |options|
-    desc = String.new()
-    desc << " with href #{options[:href].inspect}" if options[:href]
-    desc << " with no href attribute" if options.fetch(:href, true).nil?
-  end
-end
-
-##
-#
-#  Find buttons ( input [of type submit, reset, image, button] or button elements )
-#
-# @locator Matches the id, value, or title attributes, string content of a button, or the alt attribute of an image type button or of a descendant image of a button
-#
-# @filter [String] :id  Matches the id attribute
-# @filter [String] :title Matches the title attribute
-# @filter [String] :class Matches the class(es) provided
-# @filter [String] :value Matches the value of an input button
-#
-Capybara.add_selector(:button) do
-  xpath(:value, :title) do |locator, options={}|
-    input_btn_xpath = XPath.descendant(:input)[XPath.attr(:type).one_of('submit', 'reset', 'image', 'button')]
-    btn_xpath = XPath.descendant(:button)
-    image_btn_xpath = XPath.descendant(:input)[XPath.attr(:type).equals('image')]
-
-    unless locator.nil?
-      locator = locator.to_s
-      locator_matches = XPath.attr(:id).equals(locator).or XPath.attr(:value).is(locator).or XPath.attr(:title).is(locator)
-      locator_matches = locator_matches.or XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
-
-      input_btn_xpath = input_btn_xpath[locator_matches]
-
-      btn_xpath = btn_xpath[locator_matches.or XPath.string.n.is(locator).or XPath.descendant(:img)[XPath.attr(:alt).is(locator)]]
-
-      alt_matches = XPath.attr(:alt).is(locator)
-      alt_matches = alt_matches.or XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
-      image_btn_xpath = image_btn_xpath[alt_matches]
-    end
-
-    res_xpath = input_btn_xpath.union(btn_xpath).union(image_btn_xpath)
 
-    res_xpath = expression_filters.keys.inject(res_xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
-
-    res_xpath
-  end
-
-  filter(:disabled, :boolean, default: false, skip_if: :all) { |node, value| not(value ^ node.disabled?) }
-
-  describe do |options|
-    desc = String.new
-    desc << " that is disabled" if options[:disabled] == true
-    desc << describe_all_expression_filters(options)
-    desc
-  end
-end
-
-##
-#
-# Find links or buttons
-#
-Capybara.add_selector(:link_or_button) do
-  label "link or button"
-  xpath do |locator, options|
-    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" or not(value ^ node.disabled?) }
-
-  describe { |options| " that is disabled" if options[:disabled] }
-end
-
-##
-#
-# Find text fillable fields ( textarea, input [not of type submit, image, radio, checkbox, hidden, file] )
-#
-# @locator Matches against the id, name, or placeholder
-# @filter [String] :id  Matches the id attribute
-# @filter [String] :name  Matches the name attribute
-# @filter [String] :placeholder  Matches the placeholder attribute
-# @filter [String] :with  Matches the current value of the field
-# @filter [String] :type Matches the type attribute of the field or element type for 'textarea'
-# @filter [String, Array<String>] :class  Matches the class(es) provided
-# @filter [Boolean] :disabled Match disabled field?
-# @filter [Boolean] :multiple Match fields that accept multiple values
-#
-Capybara.add_selector(:fillable_field) do
-  label "field"
-  xpath do |locator, options|
-    xpath = XPath.descendant(:input, :textarea)[~XPath.attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')]
-    locate_field(xpath, locator, options)
-  end
-
-  expression_filter(:type) do |expr, type|
-    type = type.to_s
-    if ['textarea'].include?(type)
-      expr.axis(:self, type.to_sym)
-    else
-      expr[XPath.attr(:type).equals(type)]
-    end
-  end
-
-  filter_set(:_field, [:disabled, :multiple, :name, :placeholder])
-
-  filter(:with) do |node, with|
-    with.is_a?(Regexp) ? node.value =~ with : node.value == with.to_s
-  end
-
-  describe do |options|
-    desc = String.new
-    desc << describe_all_expression_filters(options)
-    desc << " with value #{options[:with].to_s.inspect}" if options.has_key?(:with)
-    desc
-  end
-end
-
-##
-#
-# Find radio buttons
-#
-# @locator Match id, name, or associated label text
-# @filter [String] :id  Matches the id attribute
-# @filter [String] :name  Matches the name attribute
-# @filter [String, Array<String>] :class  Matches the class(es) provided
-# @filter [Boolean] :checked Match checked fields?
-# @filter [Boolean] :unchecked Match unchecked fields?
-# @filter [Boolean] :disabled Match disabled field?
-# @filter [String] :option Match the value
-#
-Capybara.add_selector(:radio_button) do
-  label "radio button"
-  xpath do |locator, options|
-    xpath = XPath.descendant(:input)[XPath.attr(:type).equals('radio')]
-    locate_field(xpath, locator, options)
-  end
-
-  filter_set(:_field, [:checked, :unchecked, :disabled, :name])
-
-  filter(:option)  { |node, value|  node.value == value.to_s }
-
-  describe do |options|
-    desc = String.new
-    desc << " with value #{options[:option].inspect}" if options[:option]
-    desc << describe_all_expression_filters(options)
-    desc
-  end
-end
-
-##
-#
-# Find checkboxes
-#
-# @locator Match id, name, or associated label text
-# @filter [String] :id  Matches the id attribute
-# @filter [String] :name  Matches the name attribute
-# @filter [String, Array<String>] :class  Matches the class(es) provided
-# @filter [Boolean] :checked Match checked fields?
-# @filter [Boolean] :unchecked Match unchecked fields?
-# @filter [Boolean] :disabled Match disabled field?
-# @filter [String] :option Match the value
-#
-Capybara.add_selector(:checkbox) do
-  xpath do |locator, options|
-    xpath = XPath.descendant(:input)[XPath.attr(:type).equals('checkbox')]
-    locate_field(xpath, locator, options)
-  end
-
-  filter_set(:_field, [:checked, :unchecked, :disabled, :name])
-
-  filter(:option)  { |node, value|  node.value == value.to_s }
-
-  describe do |options|
-    desc = String.new
-    desc << " with value #{options[:option].inspect}" if options[:option]
-    desc << describe_all_expression_filters(options)
-    desc
-  end
-end
-
-##
-#
-# Find select elements
-#
-# @locator Match id, name, placeholder, or associated label text
-# @filter [String] :id  Matches the id attribute
-# @filter [String] :name  Matches the name attribute
-# @filter [String] :placeholder  Matches the placeholder attribute
-# @filter [String, Array<String>] :class  Matches the class(es) provided
-# @filter [Boolean] :disabled Match disabled field?
-# @filter [Boolean] :multiple Match fields that accept multiple values
-# @filter [Array<String>] :options Exact match options
-# @filter [Array<String>] :with_options Partial match options
-# @filter [String, Array<String>] :selected Match the selection(s)
-# @filter [String, Array<String>] :with_selected Partial match the selection(s)
-#
-Capybara.add_selector(:select) do
-  label "select box"
-  xpath do |locator, options|
-    xpath = XPath.descendant(:select)
-    locate_field(xpath, locator, options)
-  end
-
-  filter_set(:_field, [:disabled, :multiple, :name, :placeholder])
+require 'capybara/selector/xpath_extensions'
+require 'capybara/selector/selector'
+require 'capybara/selector/definition'
+
+#
+# All Selectors below support the listed selector specific filters in addition to the following system-wide filters
+#   * :id (String, Regexp, XPath::Expression) - Matches the id attribute
+#   * :class (String, Array<String | Regexp>, Regexp, XPath::Expression) - Matches the class(es) provided
+#   * :style (String, Regexp, Hash<String, String>) - Match on elements style
+#   * :above (Element) - Match elements above the passed element on the page
+#   * :below (Element) - Match elements below the passed element on the page
+#   * :left_of (Element) - Match elements left of the passed element on the page
+#   * :right_of (Element) - Match elements right of the passed element on the page
+#   * :near (Element) - Match elements near (within 50px) the passed element on the page
+#   * :focused (Boolean) - Match elements with focus (requires driver support)
+#
+# ### Built-in Selectors
+#
+# * **:xpath** - Select elements by XPath expression
+#   * Locator: An XPath expression
+#
+# * **:css** - Select elements by CSS selector
+#   * Locator: A CSS selector
+#
+# * **:id** - Select element by id
+#   * Locator: (String, Regexp, XPath::Expression) The id of the element to match
+#
+# * **:field** - Select field elements (input [not of type submit, image, or hidden], textarea, select)
+#   * Locator: Matches against the id, {Capybara.configure test_id} attribute, name, placeholder, or
+#     associated label text
+#   * Filters:
+#       * :name (String, Regexp) - Matches the name attribute
+#       * :placeholder (String, Regexp) - Matches the placeholder attribute
+#       * :type (String) - Matches the type attribute of the field or element type for 'textarea' and 'select'
+#       * :readonly (Boolean) - Match on the element being readonly
+#       * :with (String, Regexp) - Matches the current value of the field
+#       * :checked (Boolean) - Match checked fields?
+#       * :unchecked (Boolean) - Match unchecked fields?
+#       * :disabled (Boolean, :all) - Match disabled field? (Default: false)
+#       * :multiple (Boolean) - Match fields that accept multiple values
+#       * :valid (Boolean) - Match fields that are valid/invalid according to HTML5 form validation
+#       * :validation_message (String, Regexp) - Matches the elements current validationMessage
+#
+# * **:fieldset** - Select fieldset elements
+#   * Locator: Matches id, {Capybara.configure test_id}, or contents of wrapped legend
+#   * Filters:
+#       * :legend (String) - Matches contents of wrapped legend
+#       * :disabled (Boolean) - Match disabled fieldset?
+#
+# * **:link** - Find links (`<a>` elements with an href attribute)
+#   * Locator: Matches the id, {Capybara.configure test_id}, or title attributes, or the string content of the link,
+#     or the alt attribute of a contained img element. By default this selector requires a link to have an href attribute.
+#   * Filters:
+#       * :title (String) - Matches the title attribute
+#       * :alt (String) - Matches the alt attribute of a contained img element
+#       * :href (String, Regexp, nil, false) - Matches the normalized href of the link, if nil will find `<a>` elements with no href attribute, if false ignores href presence
+#
+# * **:button** - Find buttons ( input [of type submit, reset, image, button] or button elements )
+#   * Locator: Matches the id, {Capybara.configure test_id} attribute, name, value, or title attributes, string content of a button, or the alt attribute of an image type button or of a descendant image of a button
+#   * Filters:
+#       * :name (String, Regexp) - Matches the name attribute
+#       * :title (String) - Matches the title attribute
+#       * :value (String) - Matches the value of an input button
+#       * :type (String) - Matches the type attribute
+#       * :disabled (Boolean, :all) - Match disabled buttons (Default: false)
+#
+# * **:link_or_button** - Find links or buttons
+#   * Locator: See :link and :button selectors
+#   * Filters:
+#       * :disabled (Boolean, :all) - Match disabled buttons? (Default: false)
+#
+# * **:fillable_field** - Find text fillable fields ( textarea, input [not of type submit, image, radio, checkbox, hidden, file] )
+#   * Locator: Matches against the id, {Capybara.configure test_id} attribute, name, placeholder, or associated label text
+#   * Filters:
+#       * :name (String, Regexp) - Matches the name attribute
+#       * :placeholder (String, Regexp) - Matches the placeholder attribute
+#       * :with (String, Regexp) - Matches the current value of the field
+#       * :type (String) - Matches the type attribute of the field or element type for 'textarea'
+#       * :disabled (Boolean, :all) - Match disabled field? (Default: false)
+#       * :multiple (Boolean) - Match fields that accept multiple values
+#       * :valid (Boolean) - Match fields that are valid/invalid according to HTML5 form validation
+#       * :validation_message (String, Regexp) - Matches the elements current validationMessage
+#
+# * **:radio_button** - Find radio buttons
+#   * Locator: Match id, {Capybara.configure test_id} attribute, name, or associated label text
+#   * Filters:
+#       * :name (String, Regexp) - Matches the name attribute
+#       * :checked (Boolean) - Match checked fields?
+#       * :unchecked (Boolean) - Match unchecked fields?
+#       * :disabled (Boolean, :all) - Match disabled field? (Default: false)
+#       * :option (String, Regexp) - Match the current value
+#       * :with - Alias of :option
+#
+# * **:checkbox** - Find checkboxes
+#   * Locator: Match id, {Capybara.configure test_id} attribute, name, or associated label text
+#   * Filters:
+#       * :name (String, Regexp) - Matches the name attribute
+#       * :checked (Boolean) - Match checked fields?
+#       * :unchecked (Boolean) - Match unchecked fields?
+#       * :disabled (Boolean, :all) - Match disabled field? (Default: false)
+#       * :with (String, Regexp) - Match the current value
+#       * :option - Alias of :with
+#
+# * **:select** - Find select elements
+#   * Locator: Match id, {Capybara.configure test_id} attribute, name, placeholder, or associated label text
+#   * Filters:
+#       * :name (String, Regexp) - Matches the name attribute
+#       * :placeholder (String, Placeholder) - Matches the placeholder attribute
+#       * :disabled (Boolean, :all) - Match disabled field? (Default: false)
+#       * :multiple (Boolean) - Match fields that accept multiple values
+#       * :options (Array<String>) - Exact match options
+#       * :enabled_options (Array<String>) - Exact match enabled options
+#       * :disabled_options (Array<String>) - Exact match disabled options
+#       * :with_options (Array<String>) - Partial match options
+#       * :selected (String, Array<String>) - Match the selection(s)
+#       * :with_selected (String, Array<String>) - Partial match the selection(s)
+#
+# * **:option** - Find option elements
+#   * Locator: Match text of option
+#   * Filters:
+#       * :disabled (Boolean) - Match disabled option
+#       * :selected (Boolean) - Match selected option
+#
+# * **:datalist_input** - Find input field with datalist completion
+#   * Locator: Matches against the id, {Capybara.configure test_id} attribute, name,
+#     placeholder, or associated label text
+#   * Filters:
+#       * :name (String, Regexp) - Matches the name attribute
+#       * :placeholder (String, Regexp) - Matches the placeholder attribute
+#       * :disabled (Boolean, :all) - Match disabled field? (Default: false)
+#       * :options (Array<String>) - Exact match options
+#       * :with_options (Array<String>) - Partial match options
+#
+# * **:datalist_option** - Find datalist option
+#   * Locator: Match text or value of option
+#   * Filters:
+#       * :disabled (Boolean) - Match disabled option
+#
+# * **:file_field** - Find file input elements
+#   * Locator: Match id, {Capybara.configure test_id} attribute, name, or associated label text
+#   * Filters:
+#       * :name (String, Regexp) - Matches the name attribute
+#       * :disabled (Boolean, :all) - Match disabled field? (Default: false)
+#       * :multiple (Boolean) - Match field that accepts multiple values
+#
+# * **:label** - Find label elements
+#   * Locator: Match id, {Capybara.configure test_id}, or text contents
+#   * Filters:
+#       * :for (Element, String, Regexp) - The element or id of the element associated with the label
+#
+# * **:table** - Find table elements
+#   * Locator: id, {Capybara.configure test_id}, or caption text of table
+#   * Filters:
+#       * :caption (String) - Match text of associated caption
+#       * :with_rows (Array<Array<String>>, Array<Hash<String, String>>) - Partial match `<td>` data - visibility of `<td>` elements is not considered
+#       * :rows (Array<Array<String>>) - Match all `<td>`s - visibility of `<td>` elements is not considered
+#       * :with_cols (Array<Array<String>>, Array<Hash<String, String>>) - Partial match `<td>` data - visibility of `<td>` elements is not considered
+#       * :cols (Array<Array<String>>) - Match all `<td>`s - visibility of `<td>` elements is not considered
+#
+# * **:table_row** - Find table row
+#   * Locator: Array<String>, Hash<String, String> table row `<td>` contents - visibility of `<td>` elements is not considered
+#
+# * **:frame** - Find frame/iframe elements
+#   * Locator: Match id, {Capybara.configure test_id} attribute, or name
+#   * Filters:
+#       * :name (String) - Match name attribute
+#
+# * **:element**
+#   * Locator: Type of element ('div', 'a', etc) - if not specified defaults to '*'
+#   * Filters:
+#       * :\<any> (String, Regexp) - Match on any specified element attribute
+#
+class Capybara::Selector; end # rubocop:disable Lint/EmptyClass
 
-  filter(:options) do |node, options|
-    if node.visible?
-      actual = node.all(:xpath, './/option').map { |option| option.text }
-    else
-      actual = node.all(:xpath, './/option', visible: false).map { |option| option.text(:all) }
+Capybara::Selector::FilterSet.add(:_field) do
+  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(:valid, :boolean) { |node, value| node.evaluate_script('this.validity.valid') == value }
+  node_filter(:name) { |node, value| !value.is_a?(Regexp) || value.match?(node[:name]) }
+  node_filter(:placeholder) { |node, value| !value.is_a?(Regexp) || value.match?(node[:placeholder]) }
+  node_filter(:validation_message) do |node, msg|
+    vm = node[:validationMessage]
+    (msg.is_a?(Regexp) ? msg.match?(vm) : vm == msg.to_s).tap do |res|
+      add_error("Expected validation message to be #{msg.inspect} but was #{vm}") unless res
     end
-    options.sort == actual.sort
   end
 
-  filter(:with_options) do |node, options|
-    finder_settings = { minimum: 0 }
-    if !node.visible?
-      finder_settings[:visible] = false
-    end
-    options.all? { |option| node.first(:option, option, finder_settings) }
+  expression_filter(:name) do |xpath, val|
+    builder(xpath).add_attribute_conditions(name: val)
   end
-
-  filter(:selected) do |node, selected|
-    actual = node.all(:xpath, './/option', visible: false).select(&:selected?).map { |option| option.text(:all) }
-    Array(selected).sort == actual.sort
+  expression_filter(:placeholder) do |xpath, val|
+    builder(xpath).add_attribute_conditions(placeholder: val)
   end
+  expression_filter(:disabled) { |xpath, val| val ? xpath : xpath[~XPath.attr(:disabled)] }
+  expression_filter(:multiple) { |xpath, val| xpath[val ? XPath.attr(:multiple) : ~XPath.attr(:multiple)] }
 
-  filter(:with_selected) do |node, selected|
-    actual = node.all(:xpath, './/option', visible: false).select(&:selected?).map { |option| option.text(:all) }
-    (Array(selected) - actual).empty?
-  end
-
-  describe do |options|
-    desc = String.new
-    desc << " with options #{options[:options].inspect}" if options[:options]
-    desc << " with at least options #{options[:with_options].inspect}" if options[:with_options]
-    desc << " with #{options[:selected].inspect} selected" if options[:selected]
-    desc << " with at least #{options[:with_selected].inspect} selected" if options[:with_selected]
-    desc << describe_all_expression_filters(options)
+  describe(:expression_filters) do |name: nil, placeholder: nil, disabled: nil, multiple: nil, **|
+    desc = +''
+    desc << ' that is not disabled' if disabled == false
+    desc << " with name #{name}" if name
+    desc << " with placeholder #{placeholder}" if placeholder
+    desc << ' with the multiple attribute' if multiple == true
+    desc << ' without the multiple attribute' if multiple == false
     desc
   end
-end
 
-##
-#
-# Find option elements
-#
-# @locator Match text of option
-# @filter [Boolean] :disabled Match disabled option
-# @filter [Boolean] :selected Match selected option
-#
-Capybara.add_selector(:option) do
-  xpath do |locator|
-    xpath = XPath.descendant(:option)
-    xpath = xpath[XPath.string.n.is(locator.to_s)] unless locator.nil?
-    xpath
-  end
-
-  filter(:disabled, :boolean) { |node, value| not(value ^ node.disabled?) }
-  filter(:selected, :boolean) { |node, value| not(value ^ node.selected?) }
-
-  describe do |options|
-    desc = String.new
-    desc << " that is#{' not' unless options[:disabled]} disabled" if options.has_key?(:disabled)
-    desc << " that is#{' not' unless options[:selected]} selected" if options.has_key?(:selected)
-    desc
-  end
-end
-
-##
-#
-# Find file input elements
-#
-# @locator Match id, name, or associated label text
-# @filter [String] :id  Matches the id attribute
-# @filter [String] :name  Matches the name attribute
-# @filter [String, Array<String>] :class  Matches the class(es) provided
-# @filter [Boolean] :disabled Match disabled field?
-# @filter [Boolean] :multiple Match field that accepts multiple values
-#
-Capybara.add_selector(:file_field) do
-  label "file field"
-  xpath do |locator, options|
-    xpath = XPath.descendant(:input)[XPath.attr(:type).equals('file')]
-    locate_field(xpath, locator, options)
-  end
-
-  filter_set(:_field, [:disabled, :multiple, :name])
-
-  describe do |options|
-    desc = String.new
-    desc << describe_all_expression_filters(options)
-    desc
-  end
-end
-
-##
-#
-# Find label elements
-#
-# @locator Match id or text contents
-# @filter [Element, String] :for The element or id of the element associated with the label
-#
-Capybara.add_selector(:label) do
-  label "label"
-  xpath(:for) do |locator, options|
-    xpath = XPath.descendant(:label)
-    xpath = xpath[XPath.string.n.is(locator.to_s).or XPath.attr(:id).equals(locator.to_s)] unless locator.nil?
-    if options.has_key?(:for) && !options[:for].is_a?(Capybara::Node::Element)
-      xpath = xpath[XPath.attr(:for).equals(options[:for].to_s).or((~XPath.attr(:for)).and(XPath.descendant()[XPath.attr(:id).equals(options[:for].to_s)]))]
-    end
-    xpath
-  end
-
-  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]
-      else
-        field_or_value.find_xpath('./ancestor::label[1]').include? node.base
-      end
-    else
-      #Non element values were handled through the expression filter
-      true
-    end
-  end
-
-  describe do |options|
-    desc = String.new
-    desc << " for #{options[:for]}" if options[:for]
-    desc
-  end
-end
-
-##
-#
-# Find table elements
-#
-# @locator id or caption text of table
-# @filter [String] :id Match id attribute of table
-# @filter [String] :caption Match text of associated caption
-# @filter [String, Array<String>] :class  Matches the class(es) provided
-#
-Capybara.add_selector(:table) do
-  xpath(:caption) do |locator, options|
-    xpath = XPath.descendant(:table)
-    xpath = xpath[XPath.attr(:id).equals(locator.to_s).or XPath.descendant(:caption).is(locator.to_s)] unless locator.nil?
-    xpath = xpath[XPath.descendant(:caption).equals(options[:caption])] if options[:caption]
-    xpath
-  end
-
-  describe do |options|
-    desc = String.new
-    desc << " with caption #{options[:caption]}" if options[:caption]
+  describe(:node_filters) do |checked: nil, unchecked: nil, disabled: nil, valid: nil, validation_message: nil, **|
+    desc, states = +'', []
+    states << 'checked' if checked || (unchecked == false)
+    states << 'not checked' if unchecked || (checked == false)
+    states << 'disabled' if disabled == true
+    desc << " that is #{states.join(' and ')}" unless states.empty?
+    desc << ' that is valid' if valid == true
+    desc << ' that is invalid' if valid == false
+    desc << " with validation message #{validation_message.to_s.inspect}" if validation_message
     desc
   end
 end
 
-##
-#
-# Find frame/iframe elements
-#
-# @locator Match id or name
-# @filter [String] :id Match id attribute
-# @filter [String] :name Match name attribute
-# @filter [String, Array<String>] :class  Matches the class(es) provided
-#
-Capybara.add_selector(:frame) do
-  xpath(:name) do |locator, options|
-    xpath = XPath.descendant(:iframe).union(XPath.descendant(:frame))
-    xpath = xpath[XPath.attr(:id).equals(locator.to_s).or XPath.attr(:name).equals(locator)] unless locator.nil?
-    xpath = expression_filters.keys.inject(xpath) { |memo, ef| memo[find_by_attr(ef, options[ef])] }
-    xpath
-  end
-
-  describe do |options|
-    desc = String.new
-    desc << " with name #{options[:name]}" if options[:name]
-    desc
-  end
-end
+require 'capybara/selector/definition/xpath'
+require 'capybara/selector/definition/css'
+require 'capybara/selector/definition/id'
+require 'capybara/selector/definition/field'
+require 'capybara/selector/definition/fieldset'
+require 'capybara/selector/definition/link'
+require 'capybara/selector/definition/button'
+require 'capybara/selector/definition/link_or_button'
+require 'capybara/selector/definition/fillable_field'
+require 'capybara/selector/definition/radio_button'
+require 'capybara/selector/definition/checkbox'
+require 'capybara/selector/definition/select'
+require 'capybara/selector/definition/datalist_input'
+require 'capybara/selector/definition/option'
+require 'capybara/selector/definition/datalist_option'
+require 'capybara/selector/definition/file_field'
+require 'capybara/selector/definition/label'
+require 'capybara/selector/definition/table'
+require 'capybara/selector/definition/table_row'
+require 'capybara/selector/definition/frame'
+require 'capybara/selector/definition/element'