capybara 3.39.2 → 3.40.0

data/lib/capybara/rspec/matchers.rb

@@ -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

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)

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.rb

@@ -21,12 +21,30 @@ require 'capybara/selector/definition'
 # * **:xpath** - Select elements by XPath expression
 #   * Locator: An XPath expression
 #
+#   ```ruby
+#   page.html # => '<input>'
+#
+#   page.find :xpath, './/input'
+#   ```
+#
 # * **:css** - Select elements by CSS selector
 #   * Locator: A CSS selector
 #
+#   ```ruby
+#   page.html # => '<input>'
+#
+#   page.find :css, 'input'
+#   ```
+#
 # * **:id** - Select element by id
 #   * Locator: (String, Regexp, XPath::Expression) The id of the element to match
 #
+#   ```ruby
+#   page.html # => '<input id="field">'
+#
+#   page.find :id, 'content'
+#   ```
+#
 # * **: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
@@ -43,12 +61,30 @@ require 'capybara/selector/definition'
 #       * :valid (Boolean) - Match fields that are valid/invalid according to HTML5 form validation
 #       * :validation_message (String, Regexp) - Matches the elements current validationMessage
 #
+#   ```ruby
+#   page.html # => '<label for="article_title">Title</label>
+#                   <input id="article_title" name="article[title]" value="Hello world">'
+#
+#   page.find :field, 'article_title'
+#   page.find :field, 'article[title]'
+#   page.find :field, 'Title'
+#   page.find :field, 'Title', type: 'text', with: 'Hello world'
+#   ```
+#
 # * **: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?
 #
+#   ```ruby
+#   page.html # => '<fieldset disabled>
+#                     <legend>Fields (disabled)</legend>
+#                   </fieldset>'
+#
+#   page.find :fieldset, 'Fields (disabled)', disabled: true
+#   ```
+#
 # * **: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.
@@ -57,6 +93,17 @@ require 'capybara/selector/definition'
 #       * :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
 #
+#   ```ruby
+#   page.html # => '<a href="/">Home</a>'
+#
+#   page.find :link, 'Home', href: '/'
+#
+#   page.html # => '<a href="/"><img src="/logo.png" alt="The logo"></a>'
+#
+#   page.find :link, 'The logo', href: '/'
+#   page.find :link, alt: 'The logo', href: '/'
+#   ```
+#
 # * **: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:
@@ -66,11 +113,31 @@ require 'capybara/selector/definition'
 #       * :type (String) - Matches the type attribute
 #       * :disabled (Boolean, :all) - Match disabled buttons (Default: false)
 #
+#   ```ruby
+#   page.html # => '<button>Submit</button>'
+#
+#   page.find :button, 'Submit'
+#
+#   page.html # => '<button name="article[state]" value="draft">Save as draft</button>'
+#
+#   page.find :button, 'Save as draft', name: 'article[state]', value: 'draft'
+#   ```
+#
 # * **:link_or_button** - Find links or buttons
 #   * Locator: See :link and :button selectors
 #   * Filters:
 #       * :disabled (Boolean, :all) - Match disabled buttons? (Default: false)
 #
+#   ```ruby
+#   page.html # => '<a href="/">Home</a>'
+#
+#   page.find :link_or_button, 'Home'
+#
+#   page.html # => '<button>Submit</button>'
+#
+#   page.find :link_or_button, 'Submit'
+#   ```
+#
 # * **: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:
@@ -83,6 +150,16 @@ require 'capybara/selector/definition'
 #       * :valid (Boolean) - Match fields that are valid/invalid according to HTML5 form validation
 #       * :validation_message (String, Regexp) - Matches the elements current validationMessage
 #
+#   ```ruby
+#   page.html # => '<label for="article_body">Body</label>
+#                   <textarea id="article_body" name="article[body]"></textarea>'
+#
+#   page.find :fillable_field, 'article_body'
+#   page.find :fillable_field, 'article[body]'
+#   page.find :fillable_field, 'Body'
+#   page.find :field, 'Body', type: 'textarea'
+#   ```
+#
 # * **:radio_button** - Find radio buttons
 #   * Locator: Match id, {Capybara.configure test_id} attribute, name, or associated label text
 #   * Filters:
@@ -93,6 +170,18 @@ require 'capybara/selector/definition'
 #       * :option (String, Regexp) - Match the current value
 #       * :with - Alias of :option
 #
+#   ```ruby
+#   page.html # => '<input type="radio" id="article_state_published" name="article[state]" value="published" checked>
+#                   <label for="article_state_published">Published</label>
+#                   <input type="radio" id="article_state_draft" name="article[state]" value="draft">
+#                   <label for="article_state_draft">Draft</label>'
+#
+#   page.find :radio_button, 'article_state_published'
+#   page.find :radio_button, 'article[state]', option: 'published'
+#   page.find :radio_button, 'Published', checked: true
+#   page.find :radio_button, 'Draft', unchecked: true
+#   ```
+#
 # * **:checkbox** - Find checkboxes
 #   * Locator: Match id, {Capybara.configure test_id} attribute, name, or associated label text
 #   * Filters:
@@ -103,6 +192,15 @@ require 'capybara/selector/definition'
 #       * :with (String, Regexp) - Match the current value
 #       * :option - Alias of :with
 #
+#   ```ruby
+#   page.html # => '<input type="checkbox" id="registration_terms" name="registration[terms]" value="true">
+#                   <label for="registration_terms">I agree to terms and conditions</label>'
+#
+#   page.find :checkbox, 'registration_terms'
+#   page.find :checkbox, 'registration[terms]'
+#   page.find :checkbox, 'I agree to terms and conditions', unchecked: true
+#   ```
+#
 # * **:select** - Find select elements
 #   * Locator: Match id, {Capybara.configure test_id} attribute, name, placeholder, or associated label text
 #   * Filters:
@@ -117,12 +215,40 @@ require 'capybara/selector/definition'
 #       * :selected (String, Array<String>) - Match the selection(s)
 #       * :with_selected (String, Array<String>) - Partial match the selection(s)
 #
+#   ```ruby
+#   page.html # => '<label for="article_category">Category</label>
+#                   <select id="article_category" name="article[category]">
+#                     <option value="General" checked></option>
+#                     <option value="Other"></option>
+#                   </select>'
+#
+#   page.find :select, 'article_category'
+#   page.find :select, 'article[category]'
+#   page.find :select, 'Category'
+#   page.find :select, 'Category', selected: 'General'
+#   page.find :select, with_options: ['General']
+#   page.find :select, with_options: ['Other']
+#   page.find :select, options: ['General', 'Other']
+#   page.find :select, options: ['General'] # => raises Capybara::ElementNotFound
+#   ```
+#
 # * **:option** - Find option elements
 #   * Locator: Match text of option
 #   * Filters:
 #       * :disabled (Boolean) - Match disabled option
 #       * :selected (Boolean) - Match selected option
 #
+#   ```ruby
+#   page.html # => '<option value="General" checked></option>
+#                   <option value="Disabled" disabled></option>
+#                   <option value="Other"></option>'
+#
+#   page.find :option, 'General'
+#   page.find :option, 'General', selected: true
+#   page.find :option, 'Disabled', disabled: true
+#   page.find :option, 'Other', selected: false
+#   ```
+#
 # * **:datalist_input** - Find input field with datalist completion
 #   * Locator: Matches against the id, {Capybara.configure test_id} attribute, name,
 #     placeholder, or associated label text
@@ -133,11 +259,42 @@ require 'capybara/selector/definition'
 #       * :options (Array<String>) - Exact match options
 #       * :with_options (Array<String>) - Partial match options
 #
+#   ```ruby
+#   page.html # => '<label for="ice_cream_flavor">Flavor</label>
+#                   <input list="ice_cream_flavors" id="ice_cream_flavor" name="ice_cream[flavor]">
+#                   <datalist id="ice_cream_flavors">
+#                     <option value="Chocolate"></option>
+#                     <option value="Strawberry"></option>
+#                     <option value="Vanilla"></option>
+#                   </datalist>'
+#
+#   page.find :datalist_input, 'ice_cream_flavor'
+#   page.find :datalist_input, 'ice_cream[flavor]'
+#   page.find :datalist_input, 'Flavor'
+#   page.find :datalist_input, with_options: ['Chocolate', 'Strawberry']
+#   page.find :datalist_input, options: ['Chocolate', 'Strawberry', 'Vanilla']
+#   page.find :datalist_input, options: ['Chocolate'] # => raises Capybara::ElementNotFound
+#   ```
+#
 # * **:datalist_option** - Find datalist option
 #   * Locator: Match text or value of option
 #   * Filters:
 #       * :disabled (Boolean) - Match disabled option
 #
+#   ```ruby
+#   page.html # => '<datalist>
+#                     <option value="Chocolate"></option>
+#                     <option value="Strawberry"></option>
+#                     <option value="Vanilla"></option>
+#                     <option value="Forbidden" disabled></option>
+#                   </datalist>'
+#
+#   page.find :datalist_option, 'Chocolate'
+#   page.find :datalist_option, 'Strawberry'
+#   page.find :datalist_option, 'Vanilla'
+#   page.find :datalist_option, 'Forbidden', disabled: true
+#   ```
+#
 # * **:file_field** - Find file input elements
 #   * Locator: Match id, {Capybara.configure test_id} attribute, name, or associated label text
 #   * Filters:
@@ -145,11 +302,31 @@ require 'capybara/selector/definition'
 #       * :disabled (Boolean, :all) - Match disabled field? (Default: false)
 #       * :multiple (Boolean) - Match field that accepts multiple values
 #
+#   ```ruby
+#   page.html # => '<label for="article_banner_image">Banner Image</label>
+#                   <input type="file" id="article_banner_image" name="article[banner_image]">'
+#
+#   page.find :file_field, 'article_banner_image'
+#   page.find :file_field, 'article[banner_image]'
+#   page.find :file_field, 'Banner Image'
+#   page.find :file_field, 'Banner Image', name: 'article[banner_image]'
+#   page.find :field, 'Banner Image', type: 'file'
+#   ```
+#
 # * **: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
 #
+#   ```ruby
+#   page.html # => '<label for="article_title">Title</label>
+#                   <input id="article_title" name="article[title]">'
+#
+#   page.find :label, 'Title'
+#   page.find :label, 'Title', for: 'article_title'
+#   page.find :label, 'Title', for: page.find('article[title]')
+#   ```
+#
 # * **:table** - Find table elements
 #   * Locator: id, {Capybara.configure test_id}, or caption text of table
 #   * Filters:
@@ -159,19 +336,93 @@ require 'capybara/selector/definition'
 #       * :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
 #
+#   ```ruby
+#   page.html # => '<table>
+#                     <caption>A table</caption>
+#                     <tr>
+#                       <th>A</th>
+#                       <th>B</th>
+#                     </tr>
+#                     <tr>
+#                       <td>1</td>
+#                       <td>2</td>
+#                     </tr>
+#                     <tr>
+#                       <td>3</td>
+#                       <td>4</td>
+#                     </tr>
+#                   </table>'
+#
+#   page.find :table, 'A table'
+#   page.find :table, with_rows: [
+#     { 'A' => '1', 'B' => '2' },
+#     { 'A' => '3', 'B' => '4' },
+#   ]
+#   page.find :table, with_rows: [
+#     ['1', '2'],
+#     ['3', '4'],
+#   ]
+#   page.find :table, rows: [
+#     { 'A' => '1', 'B' => '2' },
+#     { 'A' => '3', 'B' => '4' },
+#   ]
+#   page.find :table, rows: [
+#     ['1', '2'],
+#     ['3', '4'],
+#   ]
+#   page.find :table, rows: [ ['1', '2'] ] # => raises Capybara::ElementNotFound
+#   ```
+#
 # * **:table_row** - Find table row
 #   * Locator: Array<String>, Hash<String, String> table row `<td>` contents - visibility of `<td>` elements is not considered
 #
+#   ```ruby
+#   page.html # => '<table>
+#                     <tr>
+#                       <th>A</th>
+#                       <th>B</th>
+#                     </tr>
+#                     <tr>
+#                       <td>1</td>
+#                       <td>2</td>
+#                     </tr>
+#                     <tr>
+#                       <td>3</td>
+#                       <td>4</td>
+#                     </tr>
+#                   </table>'
+#
+#   page.find :table_row, 'A' => '1', 'B' => '2'
+#   page.find :table_row, 'A' => '3', 'B' => '4'
+#   ```
+#
 # * **:frame** - Find frame/iframe elements
 #   * Locator: Match id, {Capybara.configure test_id} attribute, or name
 #   * Filters:
 #       * :name (String) - Match name attribute
 #
+#   ```ruby
+#   page.html # => '<iframe id="embed_frame" name="embed" src="https://example.com/embed"></iframe>'
+#
+#   page.find :frame, 'embed_frame'
+#   page.find :frame, 'embed'
+#   page.find :frame, name: 'embed'
+#   ```
+#
 # * **:element**
 #   * Locator: Type of element ('div', 'a', etc) - if not specified defaults to '*'
 #   * Filters:
 #       * :\<any> (String, Regexp) - Match on any specified element attribute
 #
+#   ```ruby
+#   page.html # => '<button type="button" role="menuitemcheckbox" aria-checked="true">Check me</button>
+#
+#   page.find :element, 'button'
+#   page.find :element, type: 'button', text: 'Check me'
+#   page.find :element, role: 'menuitemcheckbox'
+#   page.find :element, role: /checkbox/, 'aria-checked': 'true'
+#   ```
+#
 class Capybara::Selector; end # rubocop:disable Lint/EmptyClass
 
 Capybara::Selector::FilterSet.add(:_field) do

data/lib/capybara/selenium/driver.rb

@@ -12,7 +12,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     clear_session_storage: nil
   }.freeze
   SPECIAL_OPTIONS = %i[browser clear_local_storage clear_session_storage timeout native_displayed].freeze
-  CAPS_VERSION = Gem::Requirement.new('> 4.0.0.alpha6', '< 4.8.0')
+  CAPS_VERSION = Gem::Requirement.new('< 4.8.0')
 
   attr_reader :app, :options
 
@@ -21,10 +21,8 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
     def load_selenium
       require 'selenium-webdriver'
-      require 'capybara/selenium/logger_suppressor'
       require 'capybara/selenium/patches/atoms'
       require 'capybara/selenium/patches/is_displayed'
-      require 'capybara/selenium/patches/action_pauser'
 
       # Look up the version of `selenium-webdriver` to
       # see if it's a version we support.
@@ -43,8 +41,8 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
           Gem::Version.new(Selenium::WebDriver::VERSION)
         end
 
-      unless Gem::Requirement.new('>= 3.142.7').satisfied_by? @selenium_webdriver_version
-        warn "Warning: You're using an unsupported version of selenium-webdriver, please upgrade."
+      unless Gem::Requirement.new('>= 4.8').satisfied_by? @selenium_webdriver_version
+        warn "Warning: You're using an unsupported version of selenium-webdriver, please upgrade to 4.8+."
       end
 
       @selenium_webdriver_version
@@ -72,16 +70,9 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
           ::Capybara::Selenium::PersistentClient.new
         end
       end
-      processed_options = options.reject { |key, _val| SPECIAL_OPTIONS.include?(key) }
-
-      @browser = if options[:browser] == :firefox &&
-                    RUBY_VERSION >= '3.0' &&
-                    Capybara::Selenium::Driver.selenium_webdriver_version <= Gem::Version.new('4.0.0.alpha1')
-        # selenium-webdriver 3.x doesn't correctly pass options through for Firefox with Ruby 3 so workaround that
-        Selenium::WebDriver::Firefox::Driver.new(**processed_options)
-      else
-        Selenium::WebDriver.for(options[:browser], processed_options)
-      end
+      processed_options = options.except(*SPECIAL_OPTIONS)
+
+      @browser = Selenium::WebDriver.for(options[:browser], processed_options)
 
       specialize_driver
       setup_exit_handler
@@ -157,8 +148,8 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     native_active_element.send_keys(*args)
   end
 
-  def save_screenshot(path, **_options)
-    browser.save_screenshot(path)
+  def save_screenshot(path, **options)
+    browser.save_screenshot(path, **options)
   end
 
   def reset!
@@ -313,16 +304,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
         ::Selenium::WebDriver::Error::NoSuchElementError, # IE
         ::Selenium::WebDriver::Error::InvalidArgumentError # IE
       ].tap do |errors|
-        unless selenium_4?
-          ::Selenium::WebDriver.logger.suppress_deprecations do
-            errors.push(
-              ::Selenium::WebDriver::Error::UnhandledError,
-              ::Selenium::WebDriver::Error::ElementNotVisibleError,
-              ::Selenium::WebDriver::Error::InvalidElementStateError,
-              ::Selenium::WebDriver::Error::ElementNotSelectableError
-            )
-          end
-        end
         if defined?(::Selenium::WebDriver::Error::DetachedShadowRootError)
           errors.push(::Selenium::WebDriver::Error::DetachedShadowRootError)
         end
@@ -335,10 +316,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
 private
 
-  def selenium_4?
-    defined?(Selenium::WebDriver::VERSION) && (Selenium::WebDriver::VERSION.to_f >= 4)
-  end
-
   def native_args(args)
     args.map { |arg| arg.is_a?(Capybara::Selenium::Node) ? arg.native : arg }
   end
@@ -361,10 +338,7 @@ private
   end
 
   def unhandled_alert_errors
-    @unhandled_alert_errors ||= with_legacy_error(
-      [Selenium::WebDriver::Error::UnexpectedAlertOpenError],
-      'UnhandledAlertError'
-    )
+    @unhandled_alert_errors ||= [Selenium::WebDriver::Error::UnexpectedAlertOpenError]
   end
 
   def delete_all_cookies
@@ -454,17 +428,7 @@ private
   end
 
   def find_modal_errors
-    @find_modal_errors ||= with_legacy_error([Selenium::WebDriver::Error::TimeoutError], 'TimeOutError')
-  end
-
-  def with_legacy_error(errors, legacy_error)
-    errors.tap do |errs|
-      unless selenium_4?
-        ::Selenium::WebDriver.logger.suppress_deprecations do
-          errs << Selenium::WebDriver::Error.const_get(legacy_error)
-        end
-      end
-    end
+    @find_modal_errors ||= [Selenium::WebDriver::Error::TimeoutError]
   end
 
   def silenced_unknown_error_message?(msg)
@@ -476,16 +440,12 @@ private
   end
 
   def unwrap_script_result(arg)
-    # TODO: move into the case when we drop support for Selenium < 4.1
-    element_types = [Selenium::WebDriver::Element]
-    element_types.push(Selenium::WebDriver::ShadowRoot) if defined?(Selenium::WebDriver::ShadowRoot)
-
     case arg
     when Array
       arg.map { |arr| unwrap_script_result(arr) }
     when Hash
       arg.transform_values! { |value| unwrap_script_result(value) }
-    when *element_types
+    when Selenium::WebDriver::Element, Selenium::WebDriver::ShadowRoot
       build_node(arg)
     else
       arg

data/lib/capybara/selenium/driver_specializations/firefox_driver.rb

@@ -4,15 +4,10 @@ require 'capybara/selenium/nodes/firefox_node'
 
 module Capybara::Selenium::Driver::FirefoxDriver
   def self.extended(driver)
-    driver.extend Capybara::Selenium::Driver::W3CFirefoxDriver if w3c?(driver)
+    driver.extend Capybara::Selenium::Driver::W3CFirefoxDriver
     bridge = driver.send(:bridge)
     bridge.extend Capybara::Selenium::IsDisplayed unless bridge.send(:commands, :is_element_displayed)
   end
-
-  def self.w3c?(driver)
-    (defined?(Selenium::WebDriver::VERSION) && (Gem::Version.new(Selenium::WebDriver::VERSION) >= Gem::Version.new('4'))) ||
-      driver.browser.capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities)
-  end
 end
 
 module Capybara::Selenium::Driver::W3CFirefoxDriver

data/lib/capybara/selenium/node.rb

@@ -132,13 +132,11 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
       target = click_options.coords? ? nil : native
       if click_options.delay.zero?
         action.context_click(target)
-      elsif w3c?
+      else
         action.move_to(target) if target
         action.pointer_down(:right).then do |act|
           action_pause(act, click_options.delay)
         end.pointer_up(:right)
-      else
-        raise ArgumentError, 'Delay is not supported when right clicking with legacy (non-w3c) selenium driver'
       end
     end
   end
@@ -219,8 +217,6 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def shadow_root
-    raise 'You must be using Selenium 4.1+ for shadow_root support' unless native.respond_to? :shadow_root
-
     root = native.shadow_root
     root && build_node(native.shadow_root)
   end
@@ -416,14 +412,8 @@ private
     actions = browser_action.tap do |acts|
       if click_options.coords?
         if click_options.center_offset?
-          if Gem::Version.new(Selenium::WebDriver::VERSION) >= Gem::Version.new('4.3')
-            acts.move_to(native, *click_options.coords)
-          else
-            ::Selenium::WebDriver.logger.suppress_deprecations do
-              acts.move_to(native).move_by(*click_options.coords)
-            end
-          end
-        elsif Gem::Version.new(Selenium::WebDriver::VERSION) >= Gem::Version.new('4.3')
+          acts.move_to(native, *click_options.coords)
+        else
           right_by, down_by = *click_options.coords
           size = native.size
           left_offset = (size[:width] / 2).to_i
@@ -431,10 +421,6 @@ private
           left = -left_offset + right_by
           top = -top_offset + down_by
           acts.move_to(native, left, top)
-        else
-          ::Selenium::WebDriver.logger.suppress_deprecations do
-            acts.move_to(native, *click_options.coords)
-          end
         end
       else
         acts.move_to(native)
@@ -475,21 +461,8 @@ private
     browser.capabilities
   end
 
-  def w3c?
-    (defined?(Selenium::WebDriver::VERSION) && (Gem::Version.new(Selenium::WebDriver::VERSION) >= Gem::Version.new('4'))) ||
-      capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities)
-  end
-
   def action_pause(action, duration)
-    if w3c?
-      if Gem::Version.new(Selenium::WebDriver::VERSION) >= Gem::Version.new('4.2')
-        action.pause(device: action.pointer_inputs.first, duration: duration)
-      else
-        action.pause(action.pointer_inputs.first, duration)
-      end
-    else
-      action.pause(duration)
-    end
+    action.pause(device: action.pointer_inputs.first, duration: duration)
   end
 
   def normalize_keys(keys)