capybara 3.1.1 → 3.2.0

data/lib/capybara/queries/sibling_query.rb

@@ -16,7 +16,7 @@ module Capybara
 
       def description
         desc = super
-        sibling_query = @sibling_node && @sibling_node.instance_variable_get(:@query)
+        sibling_query = @sibling_node&.instance_variable_get(:@query)
         desc += " that is a sibling of #{sibling_query.description}" if sibling_query
         desc
       end

data/lib/capybara/queries/text_query.rb

@@ -50,15 +50,15 @@ module Capybara
       end
 
       def build_message(report_on_invisible)
-        message = "".dup
+        message = +""
         unless (COUNT_KEYS & @options.keys).empty?
           message << " but found #{@count} #{Capybara::Helpers.declension('time', 'times', @count)}"
         end
         message << " in #{@actual_text.inspect}"
 
         details_message = []
-        details_message << case_insensitive_message if @node and !@expected_text.is_a? Regexp
-        details_message << invisible_message if @node and check_visible_text? and report_on_invisible
+        details_message << case_insensitive_message if @node && check_case_insensitive?
+        details_message << invisible_message if @node && check_visible_text? && report_on_invisible
         details_message.compact!
 
         message << ". (However, #{details_message.join(' and ')}.)" unless details_message.empty?
@@ -75,10 +75,11 @@ module Capybara
       def invisible_message
         invisible_text = text(@node, :all)
         invisible_count = invisible_text.scan(@search_regexp).size
-        if invisible_count != @count
-          "it was found #{invisible_count} #{Capybara::Helpers.declension('time', 'times', invisible_count)} including non-visible text"
-        end
-      rescue # An error getting the non-visible text (if element goes out of scope) should not affect the response
+        return if invisible_count == @count
+        "it was found #{invisible_count} #{Capybara::Helpers.declension('time', 'times', invisible_count)} including non-visible text"
+      rescue StandardError
+        # An error getting the non-visible text (if element goes out of scope) should not affect the response
+        nil
       end
 
       def valid_keys
@@ -89,6 +90,10 @@ module Capybara
         @type == :visible
       end
 
+      def check_case_insensitive?
+        !@expected_text.is_a?(Regexp)
+      end
+
       def text(node, query_type)
         node.text(query_type)
       end

data/lib/capybara/rack_test/browser.rb

@@ -34,7 +34,7 @@ class Capybara::RackTest::Browser
   end
 
   def follow(method, path, **attributes)
-    return if path.gsub(/^#{Regexp.escape(request_path)}/, '').start_with?('#') || path.downcase.start_with?('javascript:')
+    return if fragment_or_script?(path)
     process_and_follow_redirects(method, path, attributes, 'HTTP_REFERER' => current_url)
   end
 
@@ -63,9 +63,7 @@ class Capybara::RackTest::Browser
     new_uri.host ||= @current_host
     new_uri.port ||= @current_port unless new_uri.default_port == @current_port
 
-    @current_scheme = new_uri.scheme
-    @current_host = new_uri.host
-    @current_port = new_uri.port
+    @current_scheme, @current_host, @current_port = new_uri.select(:scheme, :host, :port)
 
     reset_cache!
     send(method, new_uri.to_s, attributes, env.merge(options[:headers] || {}))
@@ -79,9 +77,7 @@ class Capybara::RackTest::Browser
 
   def reset_host!
     uri = URI.parse(driver.session_options.app_host || driver.session_options.default_host)
-    @current_scheme = uri.scheme
-    @current_host = uri.host
-    @current_port = uri.port
+    @current_scheme, @current_host, @current_port = uri.select(:scheme, :host, :port)
   end
 
   def reset_cache!
@@ -122,4 +118,10 @@ protected
   rescue Rack::Test::Error
     "/"
   end
+
+private
+
+  def fragment_or_script?(path)
+    path.gsub(/^#{Regexp.escape(request_path)}/, '').start_with?('#') || path.downcase.start_with?('javascript:')
+  end
 end

data/lib/capybara/rack_test/form.rb

@@ -30,12 +30,9 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
 
     native.xpath(form_elements_xpath).map do |field|
       case field.name
-      when 'input'
-        add_input_param(field, params)
-      when 'select'
-        add_select_param(field, params)
-      when 'textarea'
-        add_textarea_param(field, params)
+      when 'input' then add_input_param(field, params)
+      when 'select' then add_select_param(field, params)
+      when 'textarea' then add_textarea_param(field, params)
       end
     end
     merge_param!(params, button[:name], button[:value] || "") if button[:name]
@@ -44,8 +41,8 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
   end
 
   def submit(button)
-    action = (button && button['formaction']) || native['action']
-    method = (button && button['formmethod']) || request_method
+    action = button&.[]('formaction') || native['action']
+    method = button&.[]('formmethod') || request_method
     driver.submit(method, action.to_s, params(button))
   end
 
@@ -66,6 +63,7 @@ private
   end
 
   def merge_param!(params, key, value)
+    key = key.to_s
     if Rack::Utils.respond_to?(:default_query_parser)
       Rack::Utils.default_query_parser.normalize_params(params, key, value, Rack::Utils.param_depth_limit)
     else
@@ -85,7 +83,7 @@ private
     if %w[radio checkbox].include? field['type']
       if field['checked']
         node = Capybara::RackTest::Node.new(driver, field)
-        merge_param!(params, field['name'].to_s, node.value.to_s)
+        merge_param!(params, field['name'], node.value.to_s)
       end
     elsif %w[submit image].include? field['type']
       # TODO: identify the click button here (in document order, rather
@@ -96,29 +94,29 @@ private
           NilUploadedFile.new
         else
           mime_info = MiniMime.lookup_by_filename(value)
-          Rack::Test::UploadedFile.new(value, (mime_info && mime_info.content_type).to_s)
+          Rack::Test::UploadedFile.new(value, mime_info&.content_type&.to_s)
         end
-        merge_param!(params, field['name'].to_s, file)
+        merge_param!(params, field['name'], file)
       else
-        merge_param!(params, field['name'].to_s, File.basename(field['value'].to_s))
+        merge_param!(params, field['name'], File.basename(field['value'].to_s))
       end
     else
-      merge_param!(params, field['name'].to_s, field['value'].to_s)
+      merge_param!(params, field['name'], field['value'].to_s)
     end
   end
 
   def add_select_param(field, params)
-    if field['multiple'] == 'multiple'
+    if field.has_attribute?('multiple')
       field.xpath(".//option[@selected]").each do |option|
-        merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s)
+        merge_param!(params, field['name'], (option['value'] || option.text).to_s)
       end
     else
       option = field.xpath('.//option[@selected]').first || field.xpath('.//option').first
-      merge_param!(params, field['name'].to_s, (option['value'] || option.text).to_s) if option
+      merge_param!(params, field['name'], (option['value'] || option.text).to_s) if option
     end
   end
 
   def add_textarea_param(field, params)
-    merge_param!(params, field['name'].to_s, field['_capybara_raw_value'].to_s.gsub(/\n/, "\r\n"))
+    merge_param!(params, field['name'], field['_capybara_raw_value'].to_s.gsub(/\n/, "\r\n"))
   end
 end

data/lib/capybara/rack_test/node.rb

@@ -55,7 +55,7 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     native.remove_attribute('selected')
   end
 
-  def click(keys = [], offset = {})
+  def click(keys = [], **offset)
     raise ArgumentError, "The RackTest driver does not support click options" unless keys.empty? && offset.empty?
 
     if link?
@@ -218,36 +218,36 @@ private
   end
 
   def submits?
-    (tag_name == 'input' and %w[submit image].include?(type)) || (tag_name == 'button' and [nil, "submit"].include?(type))
+    (tag_name == 'input' && %w[submit image].include?(type)) || (tag_name == 'button' && [nil, "submit"].include?(type))
   end
 
   def checkable?
-    tag_name == 'input' and %w[checkbox radio].include?(type)
+    tag_name == 'input' && %w[checkbox radio].include?(type)
   end
 
 protected
 
   def checkbox_or_radio?(field = self)
-    field && (field.checkbox? || field.radio?)
+    field&.checkbox? || field&.radio?
   end
 
   def checkbox?
     input_field? && type == 'checkbox'
   end
 
-  def input_field?
-    tag_name == 'input'
-  end
-
   def radio?
     input_field? && type == 'radio'
   end
 
-  def textarea?
-    tag_name == "textarea"
-  end
-
   def text_or_password?
     input_field? && (type == 'text' || type == 'password')
   end
+
+  def input_field?
+    tag_name == 'input'
+  end
+
+  def textarea?
+    tag_name == "textarea"
+  end
 end

data/lib/capybara/result.rb

@@ -47,14 +47,27 @@ module Capybara
     end
 
     def [](*args)
-      if (args.size == 1) && ((idx = args[0]).is_a? Integer) && (idx >= 0)
-        @result_cache << @results_enum.next while @result_cache.size <= idx
-        @result_cache[idx]
-      else
+      idx, length = args
+      max_idx = case idx
+      when Integer
+        if !idx.negative?
+          length.nil? ? idx : idx + length - 1
+        else
+          nil
+        end
+      when Range
+        idx.max
+      end
+
+      if max_idx.nil?
         full_results[*args]
+      else
+        loop do
+          break if @result_cache.size > max_idx
+          @result_cache << @results_enum.next
+        end
+        @result_cache[*args]
       end
-    rescue StopIteration
-      return nil
     end
     alias :at :[]
 
@@ -84,10 +97,9 @@ module Capybara
 
       if @query.options[:maximum]
         max_opt = Integer(@query.options[:maximum])
-        begin
-          @result_cache << @results_enum.next while @result_cache.size <= max_opt
-          return 1
-        rescue StopIteration
+        loop do
+          return 1 if @result_cache.size > max_opt
+          @result_cache << @results_enum.next
         end
       end
 
@@ -97,12 +109,11 @@ module Capybara
           break if @result_cache.size > max
           @result_cache << @results_enum.next
         end
-        return 0 if @query.options[:between].include?(@result_cache.size)
-        return -1 if @result_cache.size < min
-        return 1
+        return 0 if @query.options[:between].include? @result_cache.size
+        return @result_cache.size <=> min
       end
 
-      return 0
+      0
     end
 
     def matches_count?
@@ -117,7 +128,7 @@ module Capybara
         message << ", found #{count} #{Capybara::Helpers.declension('match', 'matches', count)}: " << full_results.map(&:text).map(&:inspect).join(", ")
       end
       unless rest.empty?
-        elements = rest.map { |el| el.text rescue "<<ERROR>>" }.map(&:inspect).join(", ")
+        elements = rest.map { |el| el.text rescue "<<ERROR>>" }.map(&:inspect).join(", ") # rubocop:disable Style/RescueModifier
         message << ". Also found " << elements << ", which matched the selector but not all filters."
       end
       message

data/lib/capybara/rspec.rb

@@ -20,9 +20,8 @@ RSpec.configure do |config|
     end
   end
 
-  config.before do
+  config.before do |example|
     if self.class.include?(Capybara::DSL)
-      example = RSpec.current_example
       Capybara.current_driver = Capybara.javascript_driver if example.metadata[:js]
       Capybara.current_driver = example.metadata[:driver] if example.metadata[:driver]
     end

data/lib/capybara/rspec/compound.rb

@@ -6,7 +6,7 @@ module Capybara
       include ::RSpec::Matchers::Composable
 
       def and(matcher)
-        Capybara::RSpecMatchers::Compound::And.new(self, matcher)
+        And.new(self, matcher)
       end
 
       def and_then(matcher)
@@ -14,7 +14,7 @@ module Capybara
       end
 
       def or(matcher)
-        Capybara::RSpecMatchers::Compound::Or.new(self, matcher)
+        Or.new(self, matcher)
       end
 
       class CapybaraEvaluator
@@ -44,7 +44,7 @@ module Capybara
               raise ::Capybara::ElementNotFound unless [matcher_1_matches?, matcher_2_matches?].all?
               true
             end
-          rescue
+          rescue StandardError
             false
           end
         end
@@ -72,7 +72,7 @@ module Capybara
               raise ::Capybara::ElementNotFound unless [matcher_1_matches?, matcher_2_matches?].any?
               true
             end
-          rescue
+          rescue StandardError
             false
           end
         end

data/lib/capybara/rspec/matchers.rb

@@ -25,14 +25,14 @@ module Capybara
         yield(wrap(actual))
       rescue Capybara::ExpectationNotMet => e
         @failure_message = e.message
-        return false
+        false
       end
 
       def wrap_does_not_match?(actual)
         yield(wrap(actual))
       rescue Capybara::ExpectationNotMet => e
         @failure_message_when_negated = e.message
-        return false
+        false
       end
 
       def session_query_args

data/lib/capybara/selector.rb

@@ -2,16 +2,16 @@
 
 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] }
 
   describe do |checked: nil, unchecked: nil, disabled: nil, multiple: nil, **_options|
-    desc, states = "".dup, []
+    desc, states = +"", []
     states << 'checked' if checked || (unchecked == false)
     states << 'not checked' if unchecked || (checked == false)
     states << 'disabled' if disabled == true
@@ -24,54 +24,19 @@ Capybara::Selector::FilterSet.add(:_field) do
 end
 
 # rubocop:disable Metrics/BlockLength
-# rubocop:disable Metrics/ParameterLists
-
-##
-#
-# 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')]
@@ -89,12 +54,12 @@ 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|
-    desc = "".dup
+    desc = +""
     (expression_filters.keys - [:type]).each { |ef| desc << " with #{ef} #{options[ef]}" if options.key?(ef) }
     desc << " of type #{type.inspect}" if type
     desc << " with value #{options[:with].to_s.inspect}" if options.key?(:with)
@@ -102,16 +67,6 @@ Capybara.add_selector(:field) do
   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, legend: nil, **_options|
     xpath = XPath.descendant(:fieldset)
@@ -121,18 +76,6 @@ Capybara.add_selector(:fieldset) do
   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, href: true, enable_aria_label: false, alt: nil, title: nil, **_options|
     xpath = XPath.descendant(:a)
@@ -154,9 +97,9 @@ Capybara.add_selector(:link) do
       matchers = [XPath.attr(:id) == locator,
                   XPath.string.n.is(locator),
                   XPath.attr(:title).is(locator),
-                  XPath.descendant(:img)[XPath.attr(:alt).is(locator)]].reduce(:|)
-      matchers |= XPath.attr(:'aria-label').is(locator) if enable_aria_label
-      xpath = xpath[matchers]
+                  XPath.descendant(:img)[XPath.attr(:alt).is(locator)]]
+      matchers << XPath.attr(:'aria-label').is(locator) if enable_aria_label
+      xpath = xpath[matchers.reduce(:|)]
     end
 
     xpath = xpath[find_by_attr(:title, title)]
@@ -164,31 +107,20 @@ 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
 
   describe do |**options|
-    desc = "".dup
+    desc = +""
     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, :type) do |locator, **options|
+  xpath(:value, :title, :type) do |locator, enable_aria_label: false, **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) == 'image']
@@ -196,14 +128,14 @@ Capybara.add_selector(:button) do
     unless locator.nil?
       locator = locator.to_s
       locator_matches = XPath.attr(:id).equals(locator) | XPath.attr(:value).is(locator) | XPath.attr(:title).is(locator)
-      locator_matches |= XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
+      locator_matches |= XPath.attr(:'aria-label').is(locator) if enable_aria_label
 
       input_btn_xpath = input_btn_xpath[locator_matches]
 
       btn_xpath = btn_xpath[locator_matches | XPath.string.n.is(locator) | XPath.descendant(:img)[XPath.attr(:alt).is(locator)]]
 
       alt_matches = XPath.attr(:alt).is(locator)
-      alt_matches |= XPath.attr(:'aria-label').is(locator) if options[:enable_aria_label]
+      alt_matches |= XPath.attr(:'aria-label').is(locator) if enable_aria_label
       image_btn_xpath = image_btn_xpath[alt_matches]
     end
 
@@ -214,45 +146,27 @@ 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 = "".dup
+    desc = +""
     desc << " that is disabled" if 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 !(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
 
-##
-#
-# 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"
 
@@ -272,31 +186,18 @@ 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
 
   describe do |options|
-    desc = "".dup
+    desc = +""
     desc << describe_all_expression_filters(options)
     desc << " with value #{options[:with].to_s.inspect}" if options.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"
 
@@ -307,29 +208,16 @@ 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 = "".dup
+    desc = +""
     desc << " with value #{option.inspect}" if 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) == 'checkbox']
@@ -338,32 +226,16 @@ 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 = "".dup
+    desc = +""
     desc << " with value #{option.inspect}" if 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"
 
@@ -374,7 +246,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
@@ -384,24 +256,23 @@ Capybara.add_selector(:select) do
   end
 
   expression_filter(:with_options) do |expr, options|
-    options.each do |option|
-      expr = expr[Capybara::Selector.all[:option].call(option)]
+    options.inject(expr) do |xpath, option|
+      xpath[Capybara::Selector.all[:option].call(option)]
     end
-    expr
   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
 
   describe do |options: nil, with_options: nil, selected: nil, with_selected: nil, **opts|
-    desc = "".dup
+    desc = +""
     desc << " with options #{options.inspect}" if options
     desc << " with at least options #{with_options.inspect}" if with_options
     desc << " with #{selected.inspect} selected" if selected
@@ -421,20 +292,19 @@ 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
 
   expression_filter(:with_options) do |expr, options|
-    options.each do |option|
-      expr = expr[XPath.attr(:list) == XPath.anywhere(:datalist)[Capybara::Selector.all[:datalist_option].call(option)].attr(:id)]
+    options.inject(expr) do |xpath, option|
+      xpath[XPath.attr(:list) == XPath.anywhere(:datalist)[Capybara::Selector.all[:datalist_option].call(option)].attr(:id)]
     end
-    expr
   end
 
   describe do |options: nil, with_options: nil, **opts|
-    desc = "".dup
+    desc = +""
     desc << " with options #{options.inspect}" if options
     desc << " with at least options #{with_options.inspect}" if with_options
     desc << describe_all_expression_filters(opts)
@@ -442,14 +312,6 @@ Capybara.add_selector(:datalist_input) do
   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)
@@ -457,11 +319,11 @@ 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 = "".dup
+    desc = +""
     desc << " that is#{' not' unless options[:disabled]} disabled" if options.key?(:disabled)
     desc << " that is#{' not' unless options[:selected]} selected" if options.key?(:selected)
     desc
@@ -478,26 +340,15 @@ 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 = "".dup
+    desc = +""
     desc << " that is#{' not' unless options[:disabled]} disabled" if options.key?(:disabled)
     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|
@@ -508,19 +359,12 @@ Capybara.add_selector(:file_field) do
   filter_set(:_field, %i[disabled multiple name])
 
   describe do |**options|
-    desc = "".dup
+    desc = +""
     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|
@@ -536,7 +380,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]
@@ -544,51 +388,32 @@ Capybara.add_selector(:label) do
         field_or_value.find_xpath('./ancestor::label[1]').include? node.base
       end
     else
-      # Non element values were handled through the expression filter
-      true
+      true # Non element values were handled through the expression filter
     end
   end
 
   describe do |**options|
-    desc = "".dup
+    desc = +""
     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(:caption) do |locator, caption: nil, **_options|
     xpath = XPath.descendant(:table)
     xpath = xpath[(XPath.attr(:id) == locator.to_s) | XPath.descendant(:caption).is(locator.to_s)] unless locator.nil?
-    xpath = xpath[XPath.descendant(:caption) == options[:caption]] if options[:caption]
+    xpath = xpath[XPath.descendant(:caption) == caption] if caption
     xpath
   end
 
   describe do |caption: nil, **_options|
-    desc = "".dup
+    desc = +""
     desc << " with caption #{caption}" if caption
     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))
@@ -598,11 +423,36 @@ Capybara.add_selector(:frame) do
   end
 
   describe do |name: nil, **_options|
-    desc = "".dup
+    desc = +""
     desc << " with name #{name}" if name
     desc
   end
 end
 
+Capybara.add_selector(:element) do
+  xpath do |locator, **_options|
+    XPath.descendant((locator || '@').to_sym)
+  end
+
+  expression_filter(:attributes, matcher: /.+/) do |xpath, name, val|
+    case val
+    when Regexp
+      xpath
+    when XPath::Expression
+      xpath[XPath.attr(name)[val]]
+    else
+      xpath[XPath.attr(name.to_sym) == val]
+    end
+  end
+
+  node_filter(:attributes, matcher: /.+/) do |node, name, val|
+    val.is_a?(Regexp) ? node[name] =~ val : true
+  end
+
+  describe do |**options|
+    desc = +""
+    desc << describe_all_expression_filters(options)
+    desc
+  end
+end
 # rubocop:enable Metrics/BlockLength
-# rubocop:enable Metrics/ParameterLists