capybara 3.30.0 → 3.35.3

data/lib/capybara/minitest/spec.rb

@@ -5,192 +5,251 @@ require 'minitest/spec'
 module Capybara
   module Minitest
     module Expectations
-      %w[text content title current_path].each do |assertion|
-        infect_an_assertion "assert_#{assertion}", "must_have_#{assertion}", :reverse
-        infect_an_assertion "refute_#{assertion}", "wont_have_#{assertion}", :reverse
-      end
+      ##
+      # Expectation that there is an ancestor
+      #
+      # @!method must_have_ancestor
+      #   See {Capybara::Node::Matchers#has_ancestor?}
 
-      # rubocop:disable Style/MultilineBlockChain
-      (%w[selector xpath css link button field select table checked_field unchecked_field
-          ancestor sibling].flat_map do |assertion|
-            [%W[assert_#{assertion} must_have_#{assertion}],
-             %W[refute_#{assertion} wont_have_#{assertion}]]
-          end + [%w[assert_all_of_selectors must_have_all_of_selectors],
-                 %w[assert_none_of_selectors must_have_none_of_selectors],
-                 %w[assert_any_of_selectors must_have_any_of_selectors],
-                 %w[assert_matches_style must_match_style]] +
-      %w[selector xpath css].flat_map do |assertion|
-        [%W[assert_matches_#{assertion} must_match_#{assertion}],
-         %W[refute_matches_#{assertion} wont_match_#{assertion}]]
-      end).each do |(meth, new_name)|
-        class_eval <<-ASSERTION, __FILE__, __LINE__ + 1
-          def #{new_name} *args, &block
-            ::Minitest::Expectation.new(self, ::Minitest::Spec.current).#{new_name}(*args, &block)
-          end
-        ASSERTION
+      ##
+      # Expectation that there is button
+      #
+      # @!method must_have_button
+      #   See {Capybara::Node::Matchers#has_button?}
 
-        ::Minitest::Expectation.class_eval <<-ASSERTION, __FILE__, __LINE__ + 1
-          def #{new_name} *args, &block
-            ctx.#{meth}(target, *args, &block)
-          end
-        ASSERTION
-      end
-      # rubocop:enable Style/MultilineBlockChain
+      ##
+      # Expectation that there is no button
+      #
+      # @!method wont_have_button
+      #   See {Capybara::Node::Matchers#has_no_button?}
 
       ##
-      # @deprecated
-      def must_have_style(*args, &block)
-        warn 'must_have_style is deprecated, please use must_match_style'
-        must_match_style(*args, &block)
-      end
+      # Expectation that there is checked_field
+      #
+      # @!method must_have_checked_field
+      #   See {Capybara::Node::Matchers#has_checked_field?}
 
       ##
-      # Expectation that there is xpath
+      # Expectation that there is no checked_field
       #
-      # @!method must_have_xpath
-      #   see Capybara::Node::Matchers#has_xpath?
+      # @!method wont_have_checked_field
+      #   See {Capybara::Node::Matchers#has_no_checked_field?}
 
       ##
-      # Expectation that there is no xpath
+      # Expectation that there is unchecked_field
       #
-      # @!method wont_have_xpath
-      #   see Capybara::Node::Matchers#has_no_xpath?
+      # @!method must_have_unchecked_field
+      #   See {Capybara::Node::Matchers#has_unchecked_field?}
 
       ##
-      # Expectation that there is css
+      # Expectation that there is no unchecked_field
       #
-      # @!method must_have_css
-      #   see Capybara::Node::Matchers#has_css?
+      # @!method wont_have_unchecked_field
+      #   See {Capybara::Node::Matchers#has_no_unchecked_field?}
 
       ##
-      # Expectation that there is no css
+      # Expectation that page content does match
       #
-      # @!method wont_have_css
-      #   see Capybara::Node::Matchers#has_no_css?
+      # @!method must_have_content
+      #   See {Capybara::Node::Matchers#has_content?}
 
       ##
-      # Expectation that there is link
+      # Expectation that page content does not match
       #
-      # @!method must_have_link
-      #   see {Capybara::Node::Matchers#has_link?}
+      # @!method wont_have_content
+      #   See {Capybara::Node::Matchers#has_no_content?}
 
       ##
-      # Expectation that there is no link
+      # Expectation that there is css
       #
-      # @!method wont_have_link
-      # see {Capybara::Node::Matchers#has_no_link?}
+      # @!method must_have_css
+      #   See {Capybara::Node::Matchers#has_css?}
 
       ##
-      # Expectation that there is button
+      # Expectation that there is no css
       #
-      # @!method must_have_button
-      #   see {Capybara::Node::Matchers#has_button?}
+      # @!method wont_have_css
+      #   See {Capybara::Node::Matchers#has_no_css?}
 
       ##
-      # Expectation that there is no button
+      # Expectation that current path matches
       #
-      # @!method wont_have_button
-      #   see {Capybara::Node::Matchers#has_no_button?}
+      # @!method must_have_current_path
+      #   See {Capybara::SessionMatchers#has_current_path?}
+
+      ##
+      # Expectation that current page does not match
+      #
+      # @!method wont_have_current_path
+      #   See {Capybara::SessionMatchers#has_no_current_path?}
 
       ##
       # Expectation that there is field
       #
       # @!method must_have_field
-      #   see {Capybara::Node::Matchers#has_field?}
+      #   See {Capybara::Node::Matchers#has_field?}
 
       ##
       # Expectation that there is no field
       #
       # @!method wont_have_field
-      #   see {Capybara::Node::Matchers#has_no_field?}
+      #   See {Capybara::Node::Matchers#has_no_field?}
 
       ##
-      # Expectation that there is checked_field
+      # Expectation that there is link
       #
-      # @!method must_have_checked_field
-      #   see {Capybara::Node::Matchers#has_checked_field?}
+      # @!method must_have_link
+      #   See {Capybara::Node::Matchers#has_link?}
 
       ##
-      # Expectation that there is no checked_field
+      # Expectation that there is no link
       #
-      # @!method wont_have_chceked_field
+      # @!method wont_have_link
+      #   See {Capybara::Node::Matchers#has_no_link?}
 
       ##
-      # Expectation that there is unchecked_field
+      # Expectation that page text does match
       #
-      # @!method must_have_unchecked_field
-      #   see {Capybara::Node::Matchers#has_unchecked_field?}
+      # @!method must_have_text
+      #   See {Capybara::Node::Matchers#has_text?}
 
       ##
-      # Expectation that there is no unchecked_field
+      # Expectation that page text does not match
       #
-      # @!method wont_have_unchceked_field
+      # @!method wont_have_text
+      #   See {Capybara::Node::Matchers#has_no_text?}
+
+      ##
+      # Expectation that page title does match
+      #
+      # @!method must_have_title
+      #   See {Capybara::Node::DocumentMatchers#has_title?}
+
+      ##
+      # Expectation that page title does not match
+      #
+      # @!method wont_have_title
+      #   See {Capybara::Node::DocumentMatchers#has_no_title?}
 
       ##
       # Expectation that there is select
       #
       # @!method must_have_select
-      #   see {Capybara::Node::Matchers#has_select?}
+      #   See {Capybara::Node::Matchers#has_select?}
 
       ##
       # Expectation that there is no select
       #
       # @!method wont_have_select
-      #   see {Capybara::Node::Matchers#has_no_select?}
+      #   See {Capybara::Node::Matchers#has_no_select?}
 
       ##
-      # Expectation that there is table
+      # Expectation that there is a selector
       #
-      # @!method must_have_table
-      #   see {Capybara::Node::Matchers#has_table?}
+      # @!method must_have_selector
+      #   See {Capybara::Node::Matchers#has_selector?}
 
       ##
-      # Expectation that there is no table
+      # Expectation that there is no selector
       #
-      # @!method wont_have_table
-      #   see {Capybara::Node::Matchers#has_no_table?}
+      # @!method wont_have_selector
+      #   See {Capybara::Node::Matchers#has_no_selector?}
 
       ##
-      # Expectation that page title does match
+      # Expectation that all of the provided selectors are present
       #
-      # @!method must_have_title
-      #   see {Capybara::Node::DocumentMatchers#assert_title}
+      # @!method must_have_all_of_selectors
+      #   See {Capybara::Node::Matchers#assert_all_of_selectors}
 
       ##
-      # Expectation that page title does not match
+      # Expectation that none of the provided selectors are present
       #
-      # @!method wont_have_title
-      #   see {Capybara::Node::DocumentMatchers#assert_no_title}
+      # @!method must_have_none_of_selectors
+      #   See {Capybara::Node::Matchers#assert_none_of_selectors}
 
       ##
-      # Expectation that current path matches
+      # Expectation that any of the provided selectors are present
       #
-      # @!method must_have_current_path
-      #   see {Capybara::SessionMatchers#assert_current_path}
+      # @!method must_have_any_of_selectors
+      #   See {Capybara::Node::Matchers#assert_any_of_selectors}
 
       ##
-      # Expectation that current page does not match
+      # Expectation that there is a sibling
       #
-      # @!method wont_have_current_path
-      #   see {Capybara::SessionMatchers#assert_no_current_path}
+      # @!method must_have_sibling
+      #   See {Capybara::Node::Matchers#has_sibling?}
 
       ##
       # Expectation that element has style
       #
       # @!method must_match_style
-      #   see {Capybara::Node::Matchers#assert_matches_style}
+      #   See {Capybara::Node::Matchers#matches_style?}
 
       ##
-      # Expectation that there is an ancestor
+      # Expectation that there is table
       #
-      # @!method must_have_ancestor
-      #   see Capybara::Node::Matchers#has_ancestor?
+      # @!method must_have_table
+      #   See {Capybara::Node::Matchers#has_table?}
 
       ##
-      # Expectation that there is a sibling
+      # Expectation that there is no table
       #
-      # @!method must_have_sibling
-      #   see Capybara::Node::Matchers#has_sibling?
+      # @!method wont_have_table
+      #   See {Capybara::Node::Matchers#has_no_table?}
+
+      ##
+      # Expectation that there is xpath
+      #
+      # @!method must_have_xpath
+      #   See {Capybara::Node::Matchers#has_xpath?}
+
+      ##
+      # Expectation that there is no xpath
+      #
+      # @!method wont_have_xpath
+      #   See {Capybara::Node::Matchers#has_no_xpath?}
+
+      # This currently doesn't work for Ruby 2.8 due to Minitest not forwarding keyword args separately
+      # %w[text content title current_path].each do |assertion|
+      #   infect_an_assertion "assert_#{assertion}", "must_have_#{assertion}", :reverse
+      #   infect_an_assertion "refute_#{assertion}", "wont_have_#{assertion}", :reverse
+      # end
+
+      # rubocop:disable Style/MultilineBlockChain
+      (%w[text content title current_path
+          selector xpath css link button field select table checked_field unchecked_field
+          ancestor sibling].flat_map do |assertion|
+            [%W[assert_#{assertion} must_have_#{assertion}],
+             %W[refute_#{assertion} wont_have_#{assertion}]]
+          end + [%w[assert_all_of_selectors must_have_all_of_selectors],
+                 %w[assert_none_of_selectors must_have_none_of_selectors],
+                 %w[assert_any_of_selectors must_have_any_of_selectors],
+                 %w[assert_matches_style must_match_style]] +
+      %w[selector xpath css].flat_map do |assertion|
+        [%W[assert_matches_#{assertion} must_match_#{assertion}],
+         %W[refute_matches_#{assertion} wont_match_#{assertion}]]
+      end).each do |(meth, new_name)|
+        class_eval <<-ASSERTION, __FILE__, __LINE__ + 1
+          def #{new_name} *args, **kw_args, &block
+            ::Minitest::Expectation.new(self, ::Minitest::Spec.current).#{new_name}(*args, **kw_args, &block)
+          end
+        ASSERTION
+
+        ::Minitest::Expectation.class_eval <<-ASSERTION, __FILE__, __LINE__ + 1
+          def #{new_name} *args, **kw_args, &block
+            raise "Calling ##{new_name} outside of test." unless ctx
+            ctx.#{meth}(target, *args, **kw_args, &block)
+          end
+        ASSERTION
+      end
+      # rubocop:enable Style/MultilineBlockChain
+
+      ##
+      # @deprecated
+      def must_have_style(*args, **kw_args, &block)
+        warn 'must_have_style is deprecated, please use must_match_style'
+        must_match_style(*args, **kw_args, &block)
+      end
     end
   end
 end

data/lib/capybara/node/actions.rb

@@ -308,16 +308,14 @@ module Capybara
 
       def find_select_or_datalist_input(from, options)
         synchronize(Capybara::Queries::BaseQuery.wait(options, session_options.default_max_wait_time)) do
+          find(:select, from, **options)
+        rescue Capybara::ElementNotFound => select_error # rubocop:disable Naming/RescuedExceptionsVariableName
+          raise if %i[selected with_selected multiple].any? { |option| options.key?(option) }
+
           begin
-            find(:select, from, **options)
-          rescue Capybara::ElementNotFound => select_error # rubocop:disable Naming/RescuedExceptionsVariableName
-            raise if %i[selected with_selected multiple].any? { |option| options.key?(option) }
-
-            begin
-              find(:datalist_input, from, **options)
-            rescue Capybara::ElementNotFound => dlinput_error # rubocop:disable Naming/RescuedExceptionsVariableName
-              raise Capybara::ElementNotFound, "#{select_error.message} and #{dlinput_error.message}"
-            end
+            find(:datalist_input, from, **options)
+          rescue Capybara::ElementNotFound => dlinput_error # rubocop:disable Naming/RescuedExceptionsVariableName
+            raise Capybara::ElementNotFound, "#{select_error.message} and #{dlinput_error.message}"
           end
         end
       end
@@ -365,20 +363,17 @@ module Capybara
       def _check_with_label(selector, checked, locator,
                             allow_label_click: session_options.automatic_label_click, **options)
         options[:allow_self] = true if locator.nil?
-
         synchronize(Capybara::Queries::BaseQuery.wait(options, session_options.default_max_wait_time)) do
+          el = find(selector, locator, **options)
+          el.set(checked)
+        rescue StandardError => e
+          raise unless allow_label_click && catch_error?(e)
+
           begin
-            el = find(selector, locator, **options)
-            el.set(checked)
-          rescue StandardError => e
-            raise unless allow_label_click && catch_error?(e)
-
-            begin
-              el ||= find(selector, locator, **options.merge(visible: :all))
-              el.session.find(:label, for: el, visible: true).click unless el.checked? == checked
-            rescue StandardError # swallow extra errors - raise original
-              raise e
-            end
+            el ||= find(selector, locator, **options.merge(visible: :all))
+            el.session.find(:label, for: el, visible: true, match: :first).click unless el.checked? == checked
+          rescue StandardError # swallow extra errors - raise original
+            raise e
           end
         end
       end

data/lib/capybara/node/base.rb

@@ -103,19 +103,19 @@ module Capybara
 
       # @api private
       def find_css(css, **options)
-        if base.method(:find_css).arity != 1
-          base.find_css(css, **options)
-        else
+        if base.method(:find_css).arity == 1
           base.find_css(css)
+        else
+          base.find_css(css, **options)
         end
       end
 
       # @api private
       def find_xpath(xpath, **options)
-        if base.method(:find_xpath).arity != 1
-          base.find_xpath(xpath, **options)
-        else
+        if base.method(:find_xpath).arity == 1
           base.find_xpath(xpath)
+        else
+          base.find_xpath(xpath, **options)
         end
       end
 

data/lib/capybara/node/element.rb

@@ -27,9 +27,11 @@ module Capybara
         @query_scope = query_scope
         @query = query
         @allow_reload = false
+        @query_idx = nil
       end
 
-      def allow_reload!
+      def allow_reload!(idx = nil)
+        @query_idx = idx
         @allow_reload = true
       end
 
@@ -163,6 +165,7 @@ module Capybara
       #       offset will be from the element center, otherwise it will be from the top left corner of the element
       #     @option options [Integer] y  Y coordinate to offset the click location. If {Capybara.configure w3c_click_offset} is `true` the
       #       offset will be from the element center, otherwise it will be from the top left corner of the element
+      # @option options [Float] delay  Delay between the mouse down and mouse up events in seconds (0)
       # @return [Capybara::Node::Element]  The element
       def click(*keys, **options)
         perform_click_action(keys, **options) do |k, opts|
@@ -176,6 +179,7 @@ module Capybara
       #
       # @macro action_waiting_behavior
       # @macro click_modifiers
+      # @option options [Float] delay  Delay between the mouse down and mouse up events in seconds (0)
       # @return [Capybara::Node::Element]  The element
       def right_click(*keys, **options)
         perform_click_action(keys, **options) do |k, opts|
@@ -407,6 +411,8 @@ module Capybara
       # @option options [Boolean] :html5   When using Chrome/Firefox with Selenium enables to force the use of HTML5
       #                                    (true) or legacy (false) dragging. If not specified the driver will attempt to
       #                                    detect the correct method to use.
+      # @option options [Array<Symbol>,Symbol] :drop_modifiers   Modifier keys which should be held while the dragged element is dropped.
+      #
       #
       # @return [Capybara::Node::Element]  The dragged element
       def drag_to(node, **options)
@@ -429,11 +435,7 @@ module Capybara
       #
       # @return [Capybara::Node::Element]  The element
       def drop(*args)
-        options = args.map do |arg|
-          return arg.to_path if arg.respond_to?(:to_path)
-
-          arg
-        end
+        options = args.map { |arg| arg.respond_to?(:to_path) ? arg.to_path : arg }
         synchronize { base.drop(*options) }
         self
       end
@@ -545,14 +547,13 @@ module Capybara
 
       # @api private
       def reload
-        if @allow_reload
-          begin
-            reloaded = @query.resolve_for(query_scope.reload)&.first
+        return self unless @allow_reload
 
-            @base = reloaded.base if reloaded
-          rescue StandardError => e
-            raise e unless catch_error?(e)
-          end
+        begin
+          reloaded = @query.resolve_for(query_scope.reload)[@query_idx.to_i]
+          @base = reloaded.base if reloaded
+        rescue StandardError => e
+          raise e unless catch_error?(e)
         end
         self
       end