capybara 3.35.0 → 3.40.0

data/lib/capybara/rspec/matchers.rb

@@ -15,36 +15,36 @@ module Capybara
     # RSpec matcher for whether the element(s) matching a given selector exist.
     #
     # @see Capybara::Node::Matchers#assert_selector
-    def have_selector(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveSelector.new(*args, **kw_args, &optional_filter_block)
+    def have_selector(...)
+      Matchers::HaveSelector.new(...)
     end
 
     # RSpec matcher for whether the element(s) matching a group of selectors exist.
     #
     # @see Capybara::Node::Matchers#assert_all_of_selectors
-    def have_all_of_selectors(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveAllSelectors.new(*args, **kw_args, &optional_filter_block)
+    def have_all_of_selectors(...)
+      Matchers::HaveAllSelectors.new(...)
     end
 
     # RSpec matcher for whether no element(s) matching a group of selectors exist.
     #
     # @see Capybara::Node::Matchers#assert_none_of_selectors
-    def have_none_of_selectors(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveNoSelectors.new(*args, **kw_args, &optional_filter_block)
+    def have_none_of_selectors(...)
+      Matchers::HaveNoSelectors.new(...)
     end
 
     # RSpec matcher for whether the element(s) matching any of a group of selectors exist.
     #
     # @see Capybara::Node::Matchers#assert_any_of_selectors
-    def have_any_of_selectors(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveAnySelectors.new(*args, **kw_args, &optional_filter_block)
+    def have_any_of_selectors(...)
+      Matchers::HaveAnySelectors.new(...)
     end
 
     # RSpec matcher for whether the current element matches a given selector.
     #
     # @see Capybara::Node::Matchers#assert_matches_selector
-    def match_selector(*args, **kw_args, &optional_filter_block)
-      Matchers::MatchSelector.new(*args, **kw_args, &optional_filter_block)
+    def match_selector(...)
+      Matchers::MatchSelector.new(...)
     end
 
     %i[css xpath].each do |selector|
@@ -77,12 +77,17 @@ module Capybara
     #
     #   @see Capybara::Node::Matchers#matches_css?
 
-    %i[link button field select table].each do |selector|
+    %i[link button field select table element].each do |selector|
       define_method "have_#{selector}" do |locator = nil, **options, &optional_filter_block|
         Matchers::HaveSelector.new(selector, locator, **options, &optional_filter_block)
       end
     end
 
+    # @!method have_element(locator = nil, **options, &optional_filter_block)
+    #   RSpec matcher for elements.
+    #
+    #   @see Capybara::Node::Matchers#has_element?
+
     # @!method have_link(locator = nil, **options, &optional_filter_block)
     #   RSpec matcher for links.
     #
@@ -161,7 +166,7 @@ module Capybara
 
     %w[selector css xpath text title current_path link button
        field checked_field unchecked_field select table
-       sibling ancestor].each do |matcher_type|
+       sibling ancestor element].each do |matcher_type|
       define_method "have_no_#{matcher_type}" do |*args, **kw_args, &optional_filter_block|
         Matchers::NegatedMatcher.new(send("have_#{matcher_type}", *args, **kw_args, &optional_filter_block))
       end
@@ -177,15 +182,15 @@ module Capybara
     # RSpec matcher for whether sibling element(s) matching a given selector exist.
     #
     # @see Capybara::Node::Matchers#assert_sibling
-    def have_sibling(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveSibling.new(*args, **kw_args, &optional_filter_block)
+    def have_sibling(...)
+      Matchers::HaveSibling.new(...)
     end
 
     # RSpec matcher for whether ancestor element(s) matching a given selector exist.
     #
     # @see Capybara::Node::Matchers#assert_ancestor
-    def have_ancestor(*args, **kw_args, &optional_filter_block)
-      Matchers::HaveAncestor.new(*args, **kw_args, &optional_filter_block)
+    def have_ancestor(...)
+      Matchers::HaveAncestor.new(...)
     end
 
     ##

data/lib/capybara/selector/builders/css_builder.rb

@@ -76,7 +76,7 @@ module Capybara
         else
           cls = Array(classes).reject { |c| c.is_a? Regexp }.group_by { |cl| cl.match?(/^!(?!!!)/) }
           [(cls[false].to_a.map { |cl| ".#{Capybara::Selector::CSS.escape(cl.sub(/^!!/, ''))}" } +
-          cls[true].to_a.map { |cl| ":not(.#{Capybara::Selector::CSS.escape(cl.slice(1..-1))})" }).join]
+          cls[true].to_a.map { |cl| ":not(.#{Capybara::Selector::CSS.escape(cl.slice(1..))})" }).join]
         end
       end
     end

data/lib/capybara/selector/builders/xpath_builder.rb

@@ -51,7 +51,7 @@ module Capybara
         else
           Array(classes).reject { |c| c.is_a? Regexp }.map do |klass|
             if klass.match?(/^!(?!!!)/)
-              !XPath.attr(:class).contains_word(klass.slice(1..-1))
+              !XPath.attr(:class).contains_word(klass.slice(1..))
             else
               XPath.attr(:class).contains_word(klass.sub(/^!!/, ''))
             end

data/lib/capybara/selector/css.rb

@@ -23,11 +23,11 @@ module Capybara
       end
 
       S = '\u{80}-\u{D7FF}\u{E000}-\u{FFFD}\u{10000}-\u{10FFFF}'
-      H = /[0-9a-fA-F]/.freeze
-      UNICODE  = /\\#{H}{1,6}[ \t\r\n\f]?/.freeze
-      NONASCII = /[#{S}]/.freeze
-      ESCAPE   = /#{UNICODE}|\\[ -~#{S}]/.freeze
-      NMSTART = /[_a-zA-Z]|#{NONASCII}|#{ESCAPE}/.freeze
+      H = /[0-9a-fA-F]/
+      UNICODE  = /\\#{H}{1,6}[ \t\r\n\f]?/
+      NONASCII = /[#{S}]/
+      ESCAPE   = /#{UNICODE}|\\[ -~#{S}]/
+      NMSTART = /[_a-zA-Z]|#{NONASCII}|#{ESCAPE}/
 
       class Splitter
         def split(css)
@@ -43,7 +43,7 @@ module Capybara
               when '"', "'"
                 selector << parse_string(char, str)
               when '\\'
-                selector << char + str.getc
+                selector << (char + str.getc)
               when ','
                 selectors << selector.strip
                 selector.clear

data/lib/capybara/selector/definition/button.rb

@@ -14,16 +14,17 @@ Capybara.add_selector(:button, locator_type: [String, Symbol]) do
                      XPath.string.n.is(locator) |
                      XPath.descendant(:img)[XPath.attr(:alt).is(locator)]
 
-      input_btn_xpath = input_btn_xpath[locator_matchers] + locate_label(locator).descendant(input_btn_xpath)
-      btn_xpath = btn_xpath[btn_matchers] + locate_label(locator).descendant(btn_xpath)
+      label_contains_xpath = locate_label(locator).descendant[labellable_elements]
+      input_btn_xpath = input_btn_xpath[locator_matchers]
+      btn_xpath = btn_xpath[btn_matchers]
       aria_btn_xpath = aria_btn_xpath[btn_matchers]
 
       alt_matches = XPath.attr(:alt).is(locator)
       alt_matches |= XPath.attr(:'aria-label').is(locator) if enable_aria_label
-      image_btn_xpath = image_btn_xpath[alt_matches] + locate_label(locator).descendant(image_btn_xpath)
+      image_btn_xpath = image_btn_xpath[alt_matches]
     end
 
-    btn_xpaths = [input_btn_xpath, btn_xpath, image_btn_xpath]
+    btn_xpaths = [input_btn_xpath, btn_xpath, image_btn_xpath, label_contains_xpath].compact
     btn_xpaths << aria_btn_xpath if enable_aria_role
 
     %i[value title type].inject(btn_xpaths.inject(&:union)) do |memo, ef|
@@ -57,7 +58,11 @@ Capybara.add_selector(:button, locator_type: [String, Symbol]) do
       XPath.attr(:title).is(locator),
       (XPath.attr(:id) == XPath.anywhere(:label)[XPath.string.n.is(locator)].attr(:for)),
       (XPath.attr(:'aria-label').is(locator) if config.enable_aria_label),
-      (XPath.attr(test_id) == locator if config.test_id)
+      (XPath.attr(config.test_id) == locator if config.test_id)
     ].compact.inject(&:|)
   end
+
+  def labellable_elements
+    (XPath.self(:input) & XPath.attr(:type).one_of('submit', 'reset', 'image', 'button')) | XPath.self(:button)
+  end
 end

data/lib/capybara/selector/definition/checkbox.rb

@@ -2,7 +2,7 @@
 
 Capybara.add_selector(:checkbox, locator_type: [String, Symbol]) do
   xpath do |locator, allow_self: nil, **options|
-    xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input)[
+    xpath = XPath.axis(allow_self ? :'descendant-or-self' : :descendant, :input)[
       XPath.attr(:type) == 'checkbox'
     ]
     locate_field(xpath, locator, **options)

data/lib/capybara/selector/definition/file_field.rb

@@ -3,7 +3,7 @@
 Capybara.add_selector(:file_field, locator_type: [String, Symbol]) do
   label 'file field'
   xpath do |locator, allow_self: nil, **options|
-    xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input)[
+    xpath = XPath.axis(allow_self ? :'descendant-or-self' : :descendant, :input)[
       XPath.attr(:type) == 'file'
     ]
     locate_field(xpath, locator, **options)

data/lib/capybara/selector/definition/fillable_field.rb

@@ -3,7 +3,7 @@
 Capybara.add_selector(:fillable_field, locator_type: [String, Symbol]) do
   label 'field'
   xpath do |locator, allow_self: nil, **options|
-    xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input, :textarea)[
+    xpath = XPath.axis(allow_self ? :'descendant-or-self' : :descendant, :input, :textarea)[
       !XPath.attr(:type).one_of('submit', 'image', 'radio', 'checkbox', 'hidden', 'file')
     ]
     locate_field(xpath, locator, **options)

data/lib/capybara/selector/definition/link.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Capybara.add_selector(:link, locator_type: [String, Symbol]) do
-  xpath do |locator, href: true, alt: nil, title: nil, **|
+  xpath do |locator, href: true, alt: nil, title: nil, target: nil, **|
     xpath = XPath.descendant(:a)
     xpath = builder(xpath).add_attribute_conditions(href: href) unless href == false
 
@@ -25,6 +25,7 @@ Capybara.add_selector(:link, locator_type: [String, Symbol]) do
 
     xpath = xpath[find_by_attr(:title, title)]
     xpath = xpath[XPath.descendant(:img)[XPath.attr(:alt) == alt]] if alt
+    xpath = xpath[find_by_attr(:target, target)] if target
 
     xpath
   end

data/lib/capybara/selector/definition/radio_button.rb

@@ -3,7 +3,7 @@
 Capybara.add_selector(:radio_button, locator_type: [String, Symbol]) do
   label 'radio button'
   xpath do |locator, allow_self: nil, **options|
-    xpath = XPath.axis(allow_self ? :"descendant-or-self" : :descendant, :input)[
+    xpath = XPath.axis(allow_self ? :'descendant-or-self' : :descendant, :input)[
       XPath.attr(:type) == 'radio'
     ]
     locate_field(xpath, locator, **options)

data/lib/capybara/selector/definition/table.rb

@@ -93,7 +93,7 @@ Capybara.add_selector(:table, locator_type: [String, Symbol]) do
     row.map do |header, cell|
       header_xp = XPath.ancestor(:table)[1].descendant(:tr)[1].descendant(:th)[XPath.string.n.is(header)]
       XPath.descendant(:td)[
-        XPath.string.n.is(cell) & XPath.position.equals(header_xp.preceding_sibling.count.plus(1))
+        XPath.string.n.is(cell) & header_xp.boolean & XPath.position.equals(header_xp.preceding_sibling.count.plus(1))
       ]
     end.reduce(:&)
   end

data/lib/capybara/selector/definition/table_row.rb

@@ -7,14 +7,14 @@ Capybara.add_selector(:table_row, locator_type: [Array, Hash]) do
       locator.reduce(xpath) do |xp, (header, cell)|
         header_xp = XPath.ancestor(:table)[1].descendant(:tr)[1].descendant(:th)[XPath.string.n.is(header)]
         cell_xp = XPath.descendant(:td)[
-          XPath.string.n.is(cell) & XPath.position.equals(header_xp.preceding_sibling.count.plus(1))
+          XPath.string.n.is(cell) & header_xp.boolean & XPath.position.equals(header_xp.preceding_sibling.count.plus(1))
         ]
         xp.where(cell_xp)
       end
     else
       initial_td = XPath.descendant(:td)[XPath.string.n.is(locator.shift)]
       tds = locator.reverse.map { |cell| XPath.following_sibling(:td)[XPath.string.n.is(cell)] }
-                   .reduce { |xp, cell| xp.where(cell) }
+                   .reduce { |xp, cell| cell.where(xp) }
       xpath[initial_td[tds]]
     end
   end

data/lib/capybara/selector/definition.rb

@@ -203,7 +203,7 @@ module Capybara
 
       ##
       #
-      # Set the default visibility mode that shouble be used if no visibile option is passed when using the selector.
+      # Set the default visibility mode that should be used if no visible option is passed when using the selector.
       # If not specified will default to the behavior indicated by Capybara.ignore_hidden_elements
       #
       # @param [Symbol] default_visibility  Only find elements with the specified visibility:
@@ -260,7 +260,9 @@ module Capybara
 
       def parameter_names(block)
         key_types = %i[key keyreq]
-        block.parameters.select { |(type, _name)| key_types.include? type }.map { |(_type, name)| name }
+        # user filter_map when we drop dupport for 2.6
+        # block.parameters.select { |(type, _name)| key_types.include? type }.map { |(_, name)| name }
+        block.parameters.filter_map { |(type, name)| name if key_types.include? type }
       end
 
       def expression(type, allowed_filters, &block)

data/lib/capybara/selector/filter_set.rb

@@ -101,13 +101,10 @@ module Capybara
     private
 
       def options_with_defaults(options)
-        options = options.dup
-        [expression_filters, node_filters].each do |filters|
-          filters.select { |_n, filter| filter.default? }.each do |name, filter|
-            options[name] = filter.default unless options.key?(name)
-          end
-        end
-        options
+        expression_filters
+          .chain(node_filters)
+          .filter_map { |name, filter| [name, filter.default] if filter.default? }
+          .to_h.merge!(options)
       end
 
       def add_filter(name, filter_class, *types, matcher: nil, **options, &block)

data/lib/capybara/selector/regexp_disassembler.rb

@@ -69,11 +69,8 @@ module Capybara
         suffixes = [[]]
         strs.reverse_each do |str|
           if str.is_a? Set
-            prefixes = str.each_with_object([]) { |s, memo| memo.concat combine(s) }
-
-            result = []
-            prefixes.product(suffixes) { |pair| result << pair.flatten(1) }
-            suffixes = result
+            prefixes = str.flat_map { |s| combine(s) }
+            suffixes = prefixes.product(suffixes).map { |pair| pair.flatten(1) }
           else
             suffixes.each { |arr| arr.unshift str }
           end

data/lib/capybara/selector/selector.rb

@@ -66,7 +66,11 @@ module Capybara
       end
     ensure
       unless locator_valid?(locator)
-        warn "Locator #{locator.class}:#{locator.inspect} for selector #{name.inspect} must #{locator_description}. This will raise an error in a future version of Capybara."
+        Capybara::Helpers.warn(
+          "Locator #{locator.class}:#{locator.inspect} for selector #{name.inspect} must #{locator_description}. " \
+          'This will raise an error in a future version of Capybara. ' \
+          "Called from: #{Capybara::Helpers.filter_backtrace(caller)}"
+        )
       end
     end