capybara 3.38.0 → 3.39.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163cb499d23bf17278c9912462fb3fb337b2d28b764a95c5ed3f9c4af3f1c317
-  data.tar.gz: 7010ef4e7f6af6c4d78ae58a05846c2607864d6fe24d05c49747fc1e1ded8675
+  metadata.gz: b566dd2ce046b95741f9a3d75782ed30e4de0df17455f797d5700e2f41878b50
+  data.tar.gz: e6e0107c091c49a9cd37bce916bd286a5351b3d6ca60fe4a24a52ff4b835f318
 SHA512:
-  metadata.gz: 66ac2676f22d83ec1a4478f68a8f7f095c9c9f9396eb1b5c1bf34803e15e19ed02c1f1342731d55787219ddd2d9d0829eb0c76ef702c4e07ac3a0b19a9c2aaec
-  data.tar.gz: f35c37f9ccdcdd58c1c76c80cf58eb8c62b0878bb40ff1dd6191978978409b41adabbc34013868e30a5ec4f33d077532ad8c1a90fdf0138dd524703c5168a001
+  metadata.gz: db95d42045034d3fd15406ea2d18b900c5d1dc382abb45beec9175555389e5cad1fffc8ef31acbb52e909682e2548be2a20af30c835b5b129c991b89ba1f6a76
+  data.tar.gz: 8d2de2c2fc6be233ed858ce4ba8d793b4bb7e6d530e66b697576229aba3780edf0928dca6333bb4141a4241b2404a15c845803db3c3222524a8d29c7076eb810

data/History.md

@@ -1,3 +1,30 @@
+# Version 3.39.1
+Release date: 2023-05-12
+
+### Fixed
+
+* Fix usage of Selenium logger
+
+# Version 3.39.0
+Release date: 2023-04-02
+
+### Added
+
+* Support `:target` filter option on `:link` selector [Yudai Takada]
+* Experimental Rack 3 support
+* Text normalization performance improvements [Brandon Weaver]
+
+### Fixed
+
+* MS Edge button click [Brian J. Bayer]
+* Options/Capabilities choosing based on Selenium versions
+* Support for base versions [Matijs van Zuijlen]
+* ExpectedError not defined in Selenium 4+
+* Filter block forwarding to a number of matchers [Christophe Bliard]
+###  Changed
+
+* Dropped support for rack 1.x
+
 # Version 3.38.0
 Release date: 2022-11-03
 

data/lib/capybara/node/actions.rb

@@ -383,7 +383,7 @@ module Capybara
         end
       end
 
-      UPDATE_STYLE_SCRIPT = <<~'JS'
+      UPDATE_STYLE_SCRIPT = <<~JS
         this.capybara_style_cache = this.style.cssText;
         var css = arguments[0];
         for (var prop in css){
@@ -393,20 +393,20 @@ module Capybara
         }
       JS
 
-      RESET_STYLE_SCRIPT = <<~'JS'
+      RESET_STYLE_SCRIPT = <<~JS
         if (this.hasOwnProperty('capybara_style_cache')) {
           this.style.cssText = this.capybara_style_cache;
           delete this.capybara_style_cache;
         }
       JS
 
-      DATALIST_OPTIONS_SCRIPT = <<~'JS'
+      DATALIST_OPTIONS_SCRIPT = <<~JS
         Array.prototype.slice.call((this.list||{}).options || []).
           filter(function(el){ return !el.disabled }).
           map(function(el){ return { "value": el.value, "label": el.label} })
       JS
 
-      CAPTURE_FILE_ELEMENT_SCRIPT = <<~'JS'
+      CAPTURE_FILE_ELEMENT_SCRIPT = <<~JS
         document.addEventListener('click', function file_catcher(e){
           if (e.target.matches("input[type='file']")) {
             window._capybara_clicked_file_input = e.target;

data/lib/capybara/node/finders.rb

@@ -149,6 +149,8 @@ module Capybara
       #   @option options [String, Regexp] id         Match links with the id provided
       #   @option options [String] title              Match links with the title provided
       #   @option options [String] alt                Match links with a contained img element whose alt matches
+      #   @option options [String, Boolean] download  Match links with the download provided
+      #   @option options [String] target             Match links with the target provided
       #   @option options [String, Array<String>, Regexp] class    Match links that match the class(es) provided
       # @return [Capybara::Node::Element]   The found element
       #

data/lib/capybara/node/whitespace_normalizer.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Capybara
+  module Node
+    ##
+    #
+    # {Capybara::Node::WhitespaceNormalizer} provides methods that
+    # help to normalize the spacing of text content inside of
+    # {Capybara::Node::Element}s by removing various unicode
+    # spacing and directional markings.
+    #
+    module WhitespaceNormalizer
+      # Unicode for NBSP, or  
+      NON_BREAKING_SPACE = "\u00a0"
+      LINE_SEPERATOR = "\u2028"
+      PARAGRAPH_SEPERATOR = "\u2029"
+
+      # All spaces except for NBSP
+      BREAKING_SPACES = "[[:space:]&&[^#{NON_BREAKING_SPACE}]]"
+
+      # Whitespace we want to substitute with plain spaces
+      SQUEEZED_SPACES = " \n\f\t\v#{LINE_SEPERATOR}#{PARAGRAPH_SEPERATOR}"
+
+      # Any whitespace at the front of text
+      LEADING_SPACES = /\A#{BREAKING_SPACES}+/.freeze
+
+      # Any whitespace at the end of text
+      TRAILING_SPACES = /#{BREAKING_SPACES}+\z/.freeze
+
+      # "Invisible" space character
+      ZERO_WIDTH_SPACE = "\u200b"
+
+      # Signifies text is read left to right
+      LEFT_TO_RIGHT_MARK = "\u200e"
+
+      # Signifies text is read right to left
+      RIGHT_TO_LEFT_MARK = "\u200f"
+
+      # Characters we want to truncate from text
+      REMOVED_CHARACTERS = [ZERO_WIDTH_SPACE, LEFT_TO_RIGHT_MARK, RIGHT_TO_LEFT_MARK].join
+
+      # Matches multiple empty lines
+      EMPTY_LINES = /[\ \n]*\n[\ \n]*/.freeze
+
+      ##
+      #
+      # Normalizes the spacing of a node's text to be similar to
+      # what matchers might expect.
+      #
+      # @param text [String]
+      # @return [String]
+      #
+      def normalize_spacing(text)
+        text
+          .delete(REMOVED_CHARACTERS)
+          .tr(SQUEEZED_SPACES, ' ')
+          .squeeze(' ')
+          .sub(LEADING_SPACES, '')
+          .sub(TRAILING_SPACES, '')
+          .tr(NON_BREAKING_SPACE, ' ')
+      end
+
+      ##
+      #
+      # Variant on {Capybara::Node::Normalizer#normalize_spacing} that
+      # targets the whitespace of visible elements only.
+      #
+      # @param text [String]
+      # @return [String]
+      #
+      def normalize_visible_spacing(text)
+        text
+          .squeeze(' ')
+          .gsub(EMPTY_LINES, "\n")
+          .sub(LEADING_SPACES, '')
+          .sub(TRAILING_SPACES, '')
+          .tr(NON_BREAKING_SPACE, ' ')
+      end
+    end
+  end
+end

data/lib/capybara/rack_test/node.rb

@@ -1,25 +1,19 @@
 # frozen_string_literal: true
 
 require 'capybara/rack_test/errors'
+require 'capybara/node/whitespace_normalizer'
 
 class Capybara::RackTest::Node < Capybara::Driver::Node
+  include Capybara::Node::WhitespaceNormalizer
+
   BLOCK_ELEMENTS = %w[p h1 h2 h3 h4 h5 h6 ol ul pre address blockquote dl div fieldset form hr noscript table].freeze
 
   def all_text
-    native.text
-          .gsub(/[\u200b\u200e\u200f]/, '')
-          .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
-          .gsub(/\A[[:space:]&&[^\u00a0]]+/, '')
-          .gsub(/[[:space:]&&[^\u00a0]]+\z/, '')
-          .tr("\u00a0", ' ')
+    normalize_spacing(native.text)
   end
 
   def visible_text
-    displayed_text.squeeze(' ')
-                  .gsub(/[\ \n]*\n[\ \n]*/, "\n")
-                  .gsub(/\A[[:space:]&&[^\u00a0]]+/, '')
-                  .gsub(/[[:space:]&&[^\u00a0]]+\z/, '')
-                  .tr("\u00a0", ' ')
+    normalize_visible_spacing(displayed_text)
   end
 
   def [](name)
@@ -153,9 +147,11 @@ protected
     if !string_node.visible?(check_ancestor)
       ''
     elsif native.text?
-      native.text
-            .gsub(/[\u200b\u200e\u200f]/, '')
-            .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
+      native
+        .text
+        .delete(REMOVED_CHARACTERS)
+        .tr(SQUEEZED_SPACES, ' ')
+        .squeeze(' ')
     elsif native.element?
       text = native.children.map do |child|
         Capybara::RackTest::Node.new(driver, child).displayed_text(check_ancestor: false)
@@ -235,7 +231,14 @@ private
       end
       native.remove
     else
-      native['value'] = value.to_s
+      value.to_s.tap do |set_value|
+        if set_value.end_with?("\n") && form&.css('input, textarea')&.count
+          native['value'] = set_value.to_s.chop
+          Capybara::RackTest::Form.new(driver, form).submit(self)
+        else
+          native['value'] = set_value
+        end
+      end
     end
   end
 

data/lib/capybara/registrations/drivers.rb

@@ -11,7 +11,7 @@ end
 Capybara.register_driver :selenium_headless do |app|
   version = Capybara::Selenium::Driver.load_selenium
   options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
-  browser_options = ::Selenium::WebDriver::Firefox::Options.new.tap do |opts|
+  browser_options = Selenium::WebDriver::Firefox::Options.new.tap do |opts|
     opts.add_argument '-headless'
   end
   Capybara::Selenium::Driver.new(app, **{ :browser => :firefox, options_key => browser_options })
@@ -20,7 +20,7 @@ end
 Capybara.register_driver :selenium_chrome do |app|
   version = Capybara::Selenium::Driver.load_selenium
   options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+  browser_options = Selenium::WebDriver::Chrome::Options.new.tap do |opts|
     # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary
     opts.add_argument('--disable-site-isolation-trials')
   end
@@ -31,7 +31,7 @@ end
 Capybara.register_driver :selenium_chrome_headless do |app|
   version = Capybara::Selenium::Driver.load_selenium
   options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+  browser_options = Selenium::WebDriver::Chrome::Options.new.tap do |opts|
     opts.add_argument('--headless')
     opts.add_argument('--disable-gpu') if Gem.win_platform?
     # Workaround https://bugs.chromium.org/p/chromedriver/issues/detail?id=2650&q=load&sort=-id&colspec=ID%20Status%20Pri%20Owner%20Summary

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| # rubocop:disable Metrics/BlockLength
+  begin
+    require 'rackup'
+  rescue LoadError # rubocop:disable Lint/SuppressedException
+  end
   begin
     require 'rack/handler/puma'
   rescue LoadError
@@ -33,7 +45,7 @@ Capybara.register_server :puma do |app, port, host, **options| # rubocop:disable
   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)
 
-  logger = (defined?(::Puma::LogWriter) ? ::Puma::LogWriter : ::Puma::Events).then do |cls|
+  logger = (defined?(Puma::LogWriter) ? Puma::LogWriter : Puma::Events).then do |cls|
     conf.options[:Silent] ? cls.strings : cls.stdio
   end
   conf.options[:log_writer] = logger
@@ -44,7 +56,7 @@ Capybara.register_server :puma do |app, port, host, **options| # rubocop:disable
 
   Puma::Server.new(
     conf.app,
-    defined?(::Puma::LogWriter) ? nil : logger,
+    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

data/lib/capybara/rspec/matcher_proxies.rb

@@ -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)
@@ -76,7 +76,7 @@ else
     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/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/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
 
@@ -315,16 +315,16 @@ 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.concat([::Selenium::WebDriver::Error::DetachedShadowRootError])
+          errors.push(::Selenium::WebDriver::Error::DetachedShadowRootError)
         end
       end
   end

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

@@ -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/extensions/html5_drag.rb

@@ -166,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);

data/lib/capybara/selenium/logger_suppressor.rb

@@ -3,7 +3,7 @@
 module Capybara
   module Selenium
     module DeprecationSuppressor
-      def initialize(*)
+      def initialize(...)
         @suppress_for_capybara = false
         super
       end
@@ -31,7 +31,7 @@ module Capybara
     end
 
     module ErrorSuppressor
-      def for_code(*)
+      def for_code(...)
         ::Selenium::WebDriver.logger.suppress_deprecations do
           super
         end

data/lib/capybara/selenium/node.rb

@@ -4,8 +4,10 @@
 
 require 'capybara/selenium/extensions/find'
 require 'capybara/selenium/extensions/scroll'
+require 'capybara/node/whitespace_normalizer'
 
 class Capybara::Selenium::Node < Capybara::Driver::Node
+  include Capybara::Node::WhitespaceNormalizer
   include Capybara::Selenium::Find
   include Capybara::Selenium::Scroll
 
@@ -17,11 +19,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
 
   def all_text
     text = driver.evaluate_script('arguments[0].textContent', self) || ''
-    text.gsub(/[\u200b\u200e\u200f]/, '')
-        .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
-        .gsub(/\A[[:space:]&&[^\u00a0]]+/, '')
-        .gsub(/[[:space:]&&[^\u00a0]]+\z/, '')
-        .tr("\u00a0", ' ')
+    normalize_spacing(text)
   end
 
   def [](name)
@@ -221,7 +219,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def shadow_root
-    raise_error 'You must be using Selenium 4.1+ for shadow_root support' unless native.respond_to? :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)
@@ -237,7 +235,7 @@ protected
   end
 
   def scroll_to_center
-    script = <<-'JS'
+    script = <<-JS
       try {
         arguments[0].scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
       } catch(e) {
@@ -520,7 +518,7 @@ private
   def attrs(*attr_names)
     return attr_names.map { |name| self[name.to_s] } if ENV['CAPYBARA_THOROUGH']
 
-    driver.evaluate_script <<~'JS', self, attr_names.map(&:to_s)
+    driver.evaluate_script <<~JS, self, attr_names.map(&:to_s)
       (function(el, names){
         return names.map(function(name){
           return el[name]
@@ -571,7 +569,7 @@ private
     })(arguments[0], document)
   JS
 
-  OBSCURED_OR_OFFSET_SCRIPT = <<~'JS'
+  OBSCURED_OR_OFFSET_SCRIPT = <<~JS
     (function(el, x, y) {
       var box = el.getBoundingClientRect();
       if (x == null) x = box.width/2;
@@ -588,7 +586,7 @@ private
     })(arguments[0], arguments[1], arguments[2])
   JS
 
-  RAPID_APPEND_TEXT = <<~'JS'
+  RAPID_APPEND_TEXT = <<~JS
     (function(el, value) {
       value = el.value + value;
       if (el.maxLength && el.maxLength != -1){

data/lib/capybara/selenium/nodes/chrome_node.rb

@@ -106,7 +106,11 @@ private
 
   def file_errors
     @file_errors = ::Selenium::WebDriver.logger.suppress_deprecations do
-      [::Selenium::WebDriver::Error::ExpectedError]
+      if defined? ::Selenium::WebDriver::Error::ExpectedError # Selenium < 4
+        [::Selenium::WebDriver::Error::ExpectedError]
+      else
+        []
+      end
     end
   end
 

data/lib/capybara/selenium/nodes/edge_node.rb

@@ -38,7 +38,7 @@ class Capybara::Selenium::EdgeNode < Capybara::Selenium::Node
     html5_drop(*args)
   end
 
-  def click(*)
+  def click(*, **)
     super
   rescue Selenium::WebDriver::Error::InvalidArgumentError => e
     tag_name, type = attrs(:tagName, :type).map { |val| val&.downcase }
@@ -77,11 +77,33 @@ class Capybara::Selenium::EdgeNode < Capybara::Selenium::Node
     end
   end
 
+  def send_keys(*args)
+    args.chunk { |inp| inp.is_a?(String) && inp.match?(/\p{Emoji Presentation}/) }
+        .each do |contains_emoji, inputs|
+      if contains_emoji
+        inputs.join.grapheme_clusters.chunk { |gc| gc.match?(/\p{Emoji Presentation}/) }
+              .each do |emoji, clusters|
+          if emoji
+            driver.send(:execute_cdp, 'Input.insertText', text: clusters.join)
+          else
+            super(clusters.join)
+          end
+        end
+      else
+        super(*inputs)
+      end
+    end
+  end
+
 private
 
   def file_errors
     @file_errors = ::Selenium::WebDriver.logger.suppress_deprecations do
-      [::Selenium::WebDriver::Error::ExpectedError]
+      if defined? ::Selenium::WebDriver::Error::ExpectedError # Selenium < 4
+        [::Selenium::WebDriver::Error::ExpectedError]
+      else
+        []
+      end
     end
   end
 

data/lib/capybara/selenium/patches/action_pauser.rb

@@ -20,7 +20,7 @@ module ActionPauser
   private_constant :Pauser
 end
 
-if defined?(::Selenium::WebDriver::VERSION) && (::Selenium::WebDriver::VERSION.to_f < 4) &&
-   defined?(::Selenium::WebDriver::ActionBuilder)
-  ::Selenium::WebDriver::ActionBuilder.prepend(ActionPauser)
+if defined?(Selenium::WebDriver::VERSION) && (Selenium::WebDriver::VERSION.to_f < 4) &&
+   defined?(Selenium::WebDriver::ActionBuilder)
+  Selenium::WebDriver::ActionBuilder.prepend(ActionPauser)
 end

data/lib/capybara/selenium/patches/atoms.rb

@@ -15,4 +15,4 @@ private
   end
 end
 
-::Selenium::WebDriver::Remote::Bridge.prepend CapybaraAtoms unless ENV['DISABLE_CAPYBARA_SELENIUM_OPTIMIZATIONS']
+Selenium::WebDriver::Remote::Bridge.prepend CapybaraAtoms unless ENV['DISABLE_CAPYBARA_SELENIUM_OPTIMIZATIONS']

data/lib/capybara/selenium/patches/pause_duration_fix.rb

@@ -6,4 +6,4 @@ module PauseDurationFix
   end
 end
 
-::Selenium::WebDriver::Interactions::Pause.prepend PauseDurationFix
+Selenium::WebDriver::Interactions::Pause.prepend PauseDurationFix

data/lib/capybara/server/animation_disabler.rb

@@ -18,8 +18,7 @@ module Capybara
         @app = app
         @disable_css_markup = format(DISABLE_CSS_MARKUP_TEMPLATE,
                                      selector: self.class.selector_for(Capybara.disable_animation))
-        @disable_js_markup = format(DISABLE_JS_MARKUP_TEMPLATE,
-                                    selector: self.class.selector_for(Capybara.disable_animation))
+        @disable_js_markup = +DISABLE_JS_MARKUP_TEMPLATE
       end
 
       def call(env)
@@ -40,7 +39,7 @@ module Capybara
       attr_reader :disable_css_markup, :disable_js_markup
 
       def html_content?(headers)
-        /html/.match?(headers['Content-Type'])
+        /html/.match?(headers['Content-Type']) # rubocop:todo Performance/StringInclude
       end
 
       def insert_disable(html, nonces)

data/lib/capybara/spec/public/test.js

@@ -44,6 +44,10 @@ $(function() {
     $(this).after('<div class="log">DragOver with client position: ' + ev.clientX + ',' + ev.clientY)
     if ($(this).hasClass('drop')) { ev.preventDefault(); }
   });
+  $('#drop_html5, #drop_html5_scroll').on('dragenter', function(ev){
+    $(this).after('<div class="log">DragEnter')
+    if ($(this).hasClass('drop')) { ev.preventDefault(); }
+  });
   $('#drop_html5, #drop_html5_scroll').on('dragleave', function(ev){
     $(this).after('<div class="log">DragLeave with client position: ' + ev.clientX + ',' + ev.clientY)
     if ($(this).hasClass('drop')) { ev.preventDefault(); }

data/lib/capybara/spec/session/all_spec.rb

@@ -31,7 +31,7 @@ Capybara::SpecHelper.spec '#all' do
   it 'should accept an XPath instance', :exact_false do
     @session.visit('/form')
     @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('Name')
-    expect(@xpath).to be_a(::XPath::Union)
+    expect(@xpath).to be_a(XPath::Union)
     @result = @session.all(@xpath).map(&:value)
     expect(@result).to include('Smith', 'John', 'John Smith')
   end