capybara 3.35.0 → 3.40.0

data/lib/capybara/selector.rb

@@ -14,18 +14,37 @@ require 'capybara/selector/definition'
 #   * :left_of (Element) - Match elements left of the passed element on the page
 #   * :right_of (Element) - Match elements right of the passed element on the page
 #   * :near (Element) - Match elements near (within 50px) the passed element on the page
+#   * :focused (Boolean) - Match elements with focus (requires driver support)
 #
 # ### Built-in Selectors
 #
 # * **:xpath** - Select elements by XPath expression
 #   * Locator: An XPath expression
 #
+#   ```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
@@ -42,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.
@@ -56,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:
@@ -65,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:
@@ -82,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:
@@ -92,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:
@@ -102,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:
@@ -116,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
@@ -132,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:
@@ -144,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:
@@ -158,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')
+  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.5.0').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
@@ -148,12 +139,17 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     unwrap_script_result(result)
   end
 
+  def active_element
+    build_node(native_active_element)
+  end
+
   def send_keys(*args)
-    active_element.send_keys(*args)
+    # Should this call the specialized nodes rather than native???
+    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!
@@ -249,7 +245,13 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def open_new_window(kind = :tab)
-    browser.manage.new_window(kind)
+    if browser.switch_to.respond_to?(:new_window)
+      handle = current_window_handle
+      browser.switch_to.new_window(kind)
+      switch_to_window(handle)
+    else
+      browser.manage.new_window(kind)
+    end
   rescue NoMethodError, Selenium::WebDriver::Error::WebDriverError
     # If not supported by the driver or browser default to using JS
     browser.execute_script('window.open();')
@@ -293,7 +295,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def invalid_element_errors
-    @invalid_element_errors ||= begin
+    @invalid_element_errors ||=
       [
         ::Selenium::WebDriver::Error::StaleElementReferenceError,
         ::Selenium::WebDriver::Error::ElementNotInteractableError,
@@ -302,18 +304,10 @@ 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.concat [
-              ::Selenium::WebDriver::Error::UnhandledError,
-              ::Selenium::WebDriver::Error::ElementNotVisibleError,
-              ::Selenium::WebDriver::Error::InvalidElementStateError,
-              ::Selenium::WebDriver::Error::ElementNotSelectableError
-            ]
-          end
+        if defined?(::Selenium::WebDriver::Error::DetachedShadowRootError)
+          errors.push(::Selenium::WebDriver::Error::DetachedShadowRootError)
         end
       end
-    end
   end
 
   def no_such_window_error
@@ -322,14 +316,14 @@ 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
 
+  def native_active_element
+    browser.switch_to.active_element
+  end
+
   def clear_browser_state
     delete_all_cookies
     clear_storage
@@ -344,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
@@ -437,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)
@@ -464,7 +445,7 @@ private
       arg.map { |arr| unwrap_script_result(arr) }
     when Hash
       arg.transform_values! { |value| unwrap_script_result(value) }
-    when Selenium::WebDriver::Element
+    when Selenium::WebDriver::Element, Selenium::WebDriver::ShadowRoot
       build_node(arg)
     else
       arg
@@ -475,10 +456,6 @@ private
     browser
   end
 
-  def active_element
-    browser.switch_to.active_element
-  end
-
   def build_node(native_node, initial_cache = {})
     ::Capybara::Selenium::Node.new(self, native_node, initial_cache)
   end

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

@@ -38,7 +38,7 @@ module Capybara::Selenium::Driver::ChromeDriver
     return unless @browser
 
     switch_to_window(window_handles.first)
-    window_handles.slice(1..-1).each { |win| close_window(win) }
+    window_handles.slice(1..).each { |win| close_window(win) }
     return super if chromedriver_version < 73
 
     timer = Capybara::Helpers.timer(expire_in: 10)

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

@@ -39,7 +39,7 @@ module Capybara::Selenium::Driver::EdgeDriver
     return unless @browser
 
     switch_to_window(window_handles.first)
-    window_handles.slice(1..-1).each { |win| close_window(win) }
+    window_handles.slice(1..).each { |win| close_window(win) }
 
     timer = Capybara::Helpers.timer(expire_in: 10)
     begin
@@ -103,9 +103,13 @@ private
   end
 
   def execute_cdp(cmd, params = {})
-    args = { cmd: cmd, params: params }
-    result = bridge.http.call(:post, "session/#{bridge.session_id}/goog/cdp/execute", args)
-    result['value']
+    if browser.respond_to? :execute_cdp
+      browser.execute_cdp(cmd, **params)
+    else
+      args = { cmd: cmd, params: params }
+      result = bridge.http.call(:post, "session/#{bridge.session_id}/ms/cdp/execute", args)
+      result['value']
+    end
   end
 
   def build_node(native_node, initial_cache = {})
@@ -115,7 +119,7 @@ private
   def edgedriver_version
     @edgedriver_version ||= begin
       caps = browser.capabilities
-      caps['chrome']&.fetch('chromedriverVersion', nil).to_f
+      caps['msedge']&.fetch('msedgedriverVersion', nil).to_f
     end
   end
 end

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) && (Selenium::WebDriver::VERSION.to_f >= 4)) ||
-      driver.browser.capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities)
-  end
 end
 
 module Capybara::Selenium::Driver::W3CFirefoxDriver
@@ -52,7 +47,7 @@ module Capybara::Selenium::Driver::W3CFirefoxDriver
     end
 
     switch_to_window(window_handles.first)
-    window_handles.slice(1..-1).each { |win| close_window(win) }
+    window_handles.slice(1..).each { |win| close_window(win) }
     super
   end
 

data/lib/capybara/selenium/extensions/html5_drag.rb

@@ -39,10 +39,8 @@ class Capybara::Selenium::Node
         input.set_file(args)
         driver.execute_script DROP_FILE, self, input
       else
-        items = args.each_with_object([]) do |arg, arr|
-          arg.each_with_object(arr) do |(type, data), arr_|
-            arr_ << { type: type, data: data }
-          end
+        items = args.flat_map do |arg|
+          arg.map { |(type, data)| { type: type, data: data } }
         end
         driver.execute_script DROP_STRING, items, self
       end
@@ -168,6 +166,9 @@ class Capybara::Selenium::Node
           opts[key + 'Key'] = true;
         }
 
+        var dragEnterEvent = new DragEvent('dragenter', opts);
+        target.dispatchEvent(dragEnterEvent);
+
         // fire 2 dragover events to simulate dragging with a direction
         var entryPoint = pointOnRect(sourceCenter, targetRect)
         var dragOverOpts = Object.assign({clientX: entryPoint.x, clientY: entryPoint.y}, opts);