capybara 3.35.2 → 3.37.0

data/lib/capybara/rack_test/node.rb

@@ -108,6 +108,13 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     end
   end
 
+  def readonly?
+    # readonly attribute not valid on these input types
+    return false if input_field? && %w[hidden range color checkbox radio file submit image reset button].include?(type)
+
+    super
+  end
+
   def path
     native.path
   end
@@ -139,10 +146,6 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     end
   end
 
-  def ==(other)
-    native == other.native
-  end
-
 protected
 
   # @api private
@@ -159,7 +162,7 @@ protected
       end.join || ''
       text = "\n#{text}\n" if BLOCK_ELEMENTS.include?(tag_name)
       text
-    else
+    else # rubocop:disable Lint/DuplicateBranch
       ''
     end
   end
@@ -213,7 +216,7 @@ private
     min, max, step = (native['min'] || 0).to_f, (native['max'] || 100).to_f, (native['step'] || 1).to_f
     value = value.to_f
     value = value.clamp(min, max)
-    value = ((value - min) / step).round * step + min
+    value = (((value - min) / step).round * step) + min
     native['value'] = value.clamp(min, max)
   end
 
@@ -241,7 +244,7 @@ private
   end
 
   def follow_link
-    method = self['data-method'] if driver.options[:respect_data_method]
+    method = self['data-method'] || self['data-turbo-method'] if driver.options[:respect_data_method]
     method ||= :get
     driver.follow(method, self[:href].to_s)
   end

data/lib/capybara/registration_container.rb

@@ -19,9 +19,6 @@ module Capybara
     def method_missing(method_name, *args, **options, &block)
       if @registered.respond_to?(method_name)
         Capybara::Helpers.warn "DEPRECATED: Calling '#{method_name}' on the drivers/servers container is deprecated without replacement"
-        # RUBY 2.6 will send an empty hash rather than nothing with **options so fix that
-        return @registered.public_send(method_name, *args, &block) if options.empty?
-
         return @registered.public_send(method_name, *args, **options, &block)
       end
       super

data/lib/capybara/registrations/drivers.rb

@@ -14,7 +14,7 @@ Capybara.register_driver :selenium_headless do |app|
   browser_options = ::Selenium::WebDriver::Firefox::Options.new.tap do |opts|
     opts.add_argument '-headless'
   end
-  Capybara::Selenium::Driver.new(app, **Hash[:browser => :firefox, options_key => browser_options])
+  Capybara::Selenium::Driver.new(app, **{ :browser => :firefox, options_key => browser_options })
 end
 
 Capybara.register_driver :selenium_chrome do |app|
@@ -25,7 +25,7 @@ Capybara.register_driver :selenium_chrome do |app|
     opts.add_argument('--disable-site-isolation-trials')
   end
 
-  Capybara::Selenium::Driver.new(app, **Hash[:browser => :chrome, options_key => browser_options])
+  Capybara::Selenium::Driver.new(app, **{ :browser => :chrome, options_key => browser_options })
 end
 
 Capybara.register_driver :selenium_chrome_headless do |app|
@@ -38,5 +38,5 @@ Capybara.register_driver :selenium_chrome_headless do |app|
     opts.add_argument('--disable-site-isolation-trials')
   end
 
-  Capybara::Selenium::Driver.new(app, **Hash[:browser => :chrome, options_key => browser_options])
+  Capybara::Selenium::Driver.new(app, **{ :browser => :chrome, options_key => browser_options })
 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)
@@ -55,7 +55,7 @@ else
     end
 
     def self.prepended(base)
-      class <<base
+      class << base
         prepend ClassMethods
       end
     end
@@ -70,7 +70,7 @@ else
     end
 
     def self.prepended(base)
-      class <<base
+      class << base
         prepend ClassMethods
       end
     end

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

@@ -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,11 @@ 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
+        expression_filters.chain(node_filters)
+                          .select { |_n, filter| filter.default? }
+                          .each_with_object(options.dup) do |(name, filter), opts|
+          opts[name] = filter.default unless opts.key?(name)
         end
-        options
       end
 
       def add_filter(name, filter_class, *types, matcher: nil, **options, &block)

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')
 
   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,
@@ -313,7 +324,6 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
           end
         end
       end
-    end
   end
 
   def no_such_window_error
@@ -330,6 +340,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 +473,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 +493,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

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

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

@@ -14,7 +14,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def all_text
-    text = driver.evaluate_script('arguments[0].textContent', self)
+    text = driver.evaluate_script('arguments[0].textContent', self) || ''
     text.gsub(/[\u200b\u200e\u200f]/, '')
         .gsub(/[\ \n\f\t\v\u2028\u2029]+/, ' ')
         .gsub(/\A[[:space:]&&[^\u00a0]]+/, '')
@@ -53,6 +53,11 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   #   :none =>  append the new value to the existing value <br/>
   #   :backspace => send backspace keystrokes to clear the field <br/>
   #   Array => an array of keys to send before the value being set, e.g. [[:command, 'a'], :backspace]
+  # @option options [Boolean] :rapid (nil) Whether setting text inputs should use a faster &quot;rapid&quot; mode<br/>
+  #   nil => Text inputs with length greater than 30 characters will be set using a faster driver script mode<br/>
+  #   true => Rapid mode will be used regardless of input length<br/>
+  #   false => Sends keys via conventional mode. This may be required to avoid losing key-presses if you have certain
+  #            Javascript interactions on form inputs<br/>
   def set(value, **options)
     if value.is_a?(Array) && !multiple?
       raise ArgumentError, "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
@@ -199,10 +204,6 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     native.attribute('isContentEditable') == 'true'
   end
 
-  def ==(other)
-    native == other.native
-  end
-
   def path
     driver.evaluate_script GET_XPATH_SCRIPT, self
   end
@@ -218,6 +219,13 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     native.rect
   end
 
+  def shadow_root
+    raise_error '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
+
 protected
 
   def scroll_if_needed
@@ -274,7 +282,7 @@ private
     elsif clear == :backspace
       # Clear field by sending the correct number of backspace keys.
       backspaces = [:backspace] * self.value.to_s.length
-      send_keys(*([:end] + backspaces + [value]))
+      send_keys(:end, *backspaces, value)
     elsif clear.is_a? Array
       send_keys(*clear, value)
     else
@@ -282,7 +290,7 @@ private
       if rapid == true || ((value.length > auto_rapid_set_length) && rapid != false)
         send_keys(value[0..3])
         driver.execute_script RAPID_APPEND_TEXT, self, value[4...-3]
-        send_keys(value[-3..-1])
+        send_keys(value[-3..])
       else
         send_keys(value)
       end
@@ -298,7 +306,7 @@ private
 
     scroll_if_needed do
       action_with_modifiers(click_options) do |action|
-        if block_given?
+        if block
           yield action
         else
           click_options.coords? ? action.click : action.click(native)
@@ -488,6 +496,12 @@ private
     JS
   end
 
+  def native_id
+    # Selenium 3 -> 4 changed the return of ref
+    type_or_id, id = native.ref
+    id || type_or_id
+  end
+
   GET_XPATH_SCRIPT = <<~'JS'
     (function(el, xml){
       var xpath = '';

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

@@ -65,7 +65,7 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
     return super unless native_displayed?
 
     begin
-      bridge.send(:execute, :is_element_displayed, id: native.ref)
+      bridge.send(:execute, :is_element_displayed, id: native_id)
     rescue Selenium::WebDriver::Error::UnknownCommandError
       # If the is_element_displayed command is unknown, no point in trying again
       driver.options[:native_displayed] = false

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

@@ -69,7 +69,7 @@ class Capybara::Selenium::EdgeNode < Capybara::Selenium::Node
     return super unless chrome_edge? && native_displayed?
 
     begin
-      bridge.send(:execute, :is_element_displayed, id: native.ref)
+      bridge.send(:execute, :is_element_displayed, id: native_id)
     rescue Selenium::WebDriver::Error::UnknownCommandError
       # If the is_element_displayed command is unknown, no point in trying again
       driver.options[:native_displayed] = false

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

@@ -76,7 +76,7 @@ class Capybara::Selenium::FirefoxNode < Capybara::Selenium::Node
     return super unless native_displayed?
 
     begin
-      bridge.send(:execute, :is_element_displayed, id: native.ref)
+      bridge.send(:execute, :is_element_displayed, id: native_id)
     rescue Selenium::WebDriver::Error::UnknownCommandError
       # If the is_element_displayed command is unknown, no point in trying again
       driver.options[:native_displayed] = false

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

@@ -14,7 +14,7 @@ class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
       warn 'You are attempting to click a table row which has issues in safaridriver - '\
            'Your test should probably be clicking on a table cell like a user would. '\
            'Clicking the first cell in the row instead.'
-      return find_css('th:first-child,td:first-child')[0].click(keys, options)
+      return find_css('th:first-child,td:first-child')[0].click(keys, **options)
     end
     raise
   rescue ::Selenium::WebDriver::Error::WebDriverError => e
@@ -74,7 +74,7 @@ class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
     if clear == :backspace
       # Clear field by sending the correct number of backspace keys.
       backspaces = [:backspace] * self.value.to_s.length
-      send_keys(*([[:control, 'e']] + backspaces + [value]))
+      send_keys([:control, 'e'], *backspaces, value)
     else
       super.tap do
         # React doesn't see the safaridriver element clear