capybara 3.35.2 → 3.39.2

data/lib/capybara/registrations/servers.rb

@@ -5,12 +5,24 @@ Capybara.register_server :default do |app, port, _host|
 end
 
 Capybara.register_server :webrick do |app, port, host, **options|
-  require 'rack/handler/webrick'
+  base_class = begin
+    require 'rack/handler/webrick'
+    Rack
+  rescue LoadError
+    # Rack 3 separated out the webrick handle - no way test currently in Capybaras automated
+    # tests due to Sinatra not yet supporting Rack 3 - experimental
+    require 'rackup/handler/webrick'
+    Rackup
+  end
   options = { Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log.new(nil, 0) }.merge(options)
-  Rack::Handler::WEBrick.run(app, **options)
+  base_class::Handler::WEBrick.run(app, **options)
 end
 
-Capybara.register_server :puma do |app, port, host, **options|
+Capybara.register_server :puma do |app, port, host, **options| # rubocop:disable Metrics/BlockLength
+  begin
+    require 'rackup'
+  rescue LoadError # rubocop:disable Lint/SuppressedException
+  end
   begin
     require 'rack/handler/puma'
   rescue LoadError
@@ -29,17 +41,25 @@ Capybara.register_server :puma do |app, port, host, **options|
 
   conf = Rack::Handler::Puma.config(app, options)
   conf.clamp
-  events = conf.options[:Silent] ? ::Puma::Events.strings : ::Puma::Events.stdio
 
   puma_ver = Gem::Version.new(Puma::Const::PUMA_VERSION)
   require_relative 'patches/puma_ssl' if Gem::Requirement.new('>=4.0.0', '< 4.1.0').satisfied_by?(puma_ver)
 
-  events.log 'Capybara starting Puma...'
-  events.log "* Version #{Puma::Const::PUMA_VERSION} , codename: #{Puma::Const::CODE_NAME}"
-  events.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
+  logger = (defined?(Puma::LogWriter) ? Puma::LogWriter : Puma::Events).then do |cls|
+    conf.options[:Silent] ? cls.strings : cls.stdio
+  end
+  conf.options[:log_writer] = logger
+
+  logger.log 'Capybara starting Puma...'
+  logger.log "* Version #{Puma::Const::PUMA_VERSION} , codename: #{Puma::Const::CODE_NAME}"
+  logger.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
 
-  Puma::Server.new(conf.app, events, conf.options).tap do |s|
-    s.binder.parse conf.options[:binds], s.events
-    s.min_threads, s.max_threads = conf.options[:min_threads], conf.options[:max_threads]
+  Puma::Server.new(
+    conf.app,
+    defined?(Puma::LogWriter) ? nil : logger,
+    conf.options
+  ).tap do |s|
+    s.binder.parse conf.options[:binds], (s.log_writer rescue s.events) # rubocop:disable Style/RescueModifier
+    s.min_threads, s.max_threads = conf.options[:min_threads], conf.options[:max_threads] if s.respond_to? :min_threads=
   end.run.join
 end

data/lib/capybara/rspec/matcher_proxies.rb

@@ -23,7 +23,7 @@ end
 if RUBY_ENGINE == 'jruby'
   # :nocov:
   module Capybara::DSL
-    class <<self
+    class << self
       remove_method :included
 
       def included(base)
@@ -36,7 +36,7 @@ if RUBY_ENGINE == 'jruby'
     end
   end
 
-  if defined?(::RSpec::Matchers)
+  if defined?(RSpec::Matchers)
     module ::RSpec::Matchers
       def self.included(base)
         base.send(:include, ::Capybara::RSpecMatcherProxies) if base.include?(::Capybara::DSL)
@@ -55,7 +55,7 @@ else
     end
 
     def self.prepended(base)
-      class <<base
+      class << base
         prepend ClassMethods
       end
     end
@@ -70,13 +70,13 @@ else
     end
 
     def self.prepended(base)
-      class <<base
+      class << base
         prepend ClassMethods
       end
     end
   end
 
-  Capybara::DSL.prepend ::Capybara::DSLRSpecProxyInstaller
+  Capybara::DSL.prepend Capybara::DSLRSpecProxyInstaller
 
-  ::RSpec::Matchers.prepend ::Capybara::RSpecMatcherProxyInstaller if defined?(::RSpec::Matchers)
+  RSpec::Matchers.prepend Capybara::RSpecMatcherProxyInstaller if defined?(RSpec::Matchers)
 end

data/lib/capybara/rspec/matchers/base.rb

@@ -47,14 +47,16 @@ module Capybara
       end
 
       class WrappedElementMatcher < Base
-        def matches?(actual)
+        def matches?(actual, &filter_block)
+          @filter_block ||= filter_block
           element_matches?(wrap(actual))
         rescue Capybara::ExpectationNotMet => e
           @failure_message = e.message
           false
         end
 
-        def does_not_match?(actual)
+        def does_not_match?(actual, &filter_block)
+          @filter_block ||= filter_block
           element_does_not_match?(wrap(actual))
         rescue Capybara::ExpectationNotMet => e
           @failure_message_when_negated = e.message
@@ -86,12 +88,12 @@ module Capybara
           @matcher = matcher
         end
 
-        def matches?(actual)
-          @matcher.does_not_match?(actual)
+        def matches?(actual, &filter_block)
+          @matcher.does_not_match?(actual, &filter_block)
         end
 
-        def does_not_match?(actual)
-          @matcher.matches?(actual)
+        def does_not_match?(actual, &filter_block)
+          @matcher.matches?(actual, &filter_block)
         end
 
         def description

data/lib/capybara/rspec/matchers/compound.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if defined?(::RSpec::Expectations::Version)
+if defined?(RSpec::Expectations::Version)
   module Capybara
     module RSpecMatchers
       module Matchers

data/lib/capybara/rspec/matchers/have_selector.rb

@@ -8,10 +8,10 @@ module Capybara
       class HaveSelector < CountableWrappedElementMatcher
         def initialize(*args, **kw_args, &filter_block)
           super
-          if (RUBY_VERSION >= '2.7') && (@args.size < 2) && @kw_args.keys.any?(String) # rubocop:disable Style/GuardClause
-            @args.push(@kw_args)
-            @kw_args = {}
-          end
+          return unless (@args.size < 2) && @kw_args.keys.any?(String)
+
+          @args.push(@kw_args)
+          @kw_args = {}
         end
 
         def element_matches?(el)
@@ -64,7 +64,7 @@ module Capybara
           el.assert_any_of_selectors(*@args, **session_query_options, &@filter_block)
         end
 
-        def does_not_match?(_actual)
+        def does_not_match?(el)
           el.assert_none_of_selectors(*@args, **session_query_options, &@filter_block)
         end
 

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|
@@ -177,15 +177,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

@@ -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|
@@ -60,4 +61,8 @@ Capybara.add_selector(:button, locator_type: [String, Symbol]) do
       (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.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
 

data/lib/capybara/selector.rb

@@ -14,6 +14,7 @@ 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
 #

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.0.0.alpha6', '< 4.8.0')
 
   attr_reader :app, :options
 
@@ -43,7 +43,7 @@ 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
+      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."
       end
 
@@ -148,8 +148,13 @@ 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)
@@ -249,7 +254,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 +304,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,
@@ -304,16 +315,18 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       ].tap do |errors|
         unless selenium_4?
           ::Selenium::WebDriver.logger.suppress_deprecations do
-            errors.concat [
+            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
       end
-    end
   end
 
   def no_such_window_error
@@ -330,6 +343,10 @@ private
     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
@@ -459,12 +476,16 @@ 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 Selenium::WebDriver::Element
+    when *element_types
       build_node(arg)
     else
       arg
@@ -475,10 +496,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

@@ -10,7 +10,7 @@ module Capybara::Selenium::Driver::FirefoxDriver
   end
 
   def self.w3c?(driver)
-    (defined?(Selenium::WebDriver::VERSION) && (Selenium::WebDriver::VERSION.to_f >= 4)) ||
+    (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
@@ -52,7 +52,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);