capybara 3.18.0 → 3.19.0

data/lib/capybara/selenium/driver.rb

@@ -226,10 +226,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     @browser&.quit
   rescue Selenium::WebDriver::Error::SessionNotCreatedError, Errno::ECONNREFUSED # rubocop:disable Lint/HandleExceptions
     # Browser must have already gone
-  rescue Selenium::WebDriver::Error::UnknownError => err
-    unless silenced_unknown_error_message?(err.message) # Most likely already gone
+  rescue Selenium::WebDriver::Error::UnknownError => e
+    unless silenced_unknown_error_message?(e.message) # Most likely already gone
       # probably already gone but not sure - so warn
-      warn "Ignoring Selenium UnknownError during driver quit: #{err.message}"
+      warn "Ignoring Selenium UnknownError during driver quit: #{e.message}"
     end
   ensure
     @browser = nil
@@ -283,13 +283,7 @@ private
   end
 
   def clear_browser_state_errors
-    @clear_browser_state_errors ||= [Selenium::WebDriver::Error::UnknownError].tap do |errors|
-      unless selenium_4?
-        ::Selenium::WebDriver.logger.suppress_deprecations do
-          errors << Selenium::WebDriver::Error::UnhandledError
-        end
-      end
-    end
+    @clear_browser_state_errors ||= [Selenium::WebDriver::Error::UnknownError]
   end
 
   def unhandled_alert_errors

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

@@ -18,8 +18,8 @@ module Capybara::Selenium::Driver::ChromeDriver
 
   def resize_window_to(handle, width, height)
     super
-  rescue Selenium::WebDriver::Error::UnknownError => err
-    raise unless err.message.match?(/failed to change window state/)
+  rescue Selenium::WebDriver::Error::UnknownError => e
+    raise unless e.message.match?(/failed to change window state/)
 
     # Chromedriver doesn't wait long enough for state to change when coming out of fullscreen
     # and raises unnecessary error. Wait a bit and try again.
@@ -53,13 +53,7 @@ private
   end
 
   def cdp_unsupported_errors
-    @cdp_unsupported_errors ||= [Selenium::WebDriver::Error::WebDriverError].tap do |errors|
-      unless selenium_4?
-        ::Selenium::WebDriver.logger.suppress_deprecations do
-          errors << Selenium::WebDriver::Error::UnhandledError
-        end
-      end
-    end
+    @cdp_unsupported_errors ||= [Selenium::WebDriver::Error::WebDriverError]
   end
 
   def execute_cdp(cmd, params = {})

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'capybara/selenium/nodes/ie_node'
+
 module Capybara::Selenium::Driver::InternetExplorerDriver
   def switch_to_frame(frame)
     return super unless frame == :parent
@@ -10,6 +12,12 @@ module Capybara::Selenium::Driver::InternetExplorerDriver
     browser.switch_to.default_content
     handles.tap(&:pop).each { |fh| browser.switch_to.frame(fh) }
   end
+
+private
+
+  def build_node(native_node, initial_cache = {})
+    ::Capybara::Selenium::IENode.new(self, native_node, initial_cache)
+  end
 end
 
 module Capybara::Selenium

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

@@ -87,7 +87,7 @@ module Capybara
       end
 
       def is_displayed_atom # rubocop:disable Naming/PredicateName
-        @@is_displayed_atom ||= begin
+        @@is_displayed_atom ||= begin # rubocop:disable Style/ClassVars
           browser.send(:bridge).send(:read_atom, 'isDisplayed')
                                 rescue StandardError
                                   # If the atom doesn't exist or other error

data/lib/capybara/selenium/logger_suppressor.rb

@@ -3,6 +3,11 @@
 module Capybara
   module Selenium
     module DeprecationSuppressor
+      def initialize(*)
+        @suppress_for_capybara = false
+        super
+      end
+
       def deprecate(*)
         super unless @suppress_for_capybara
       end

data/lib/capybara/selenium/node.rb

@@ -56,10 +56,12 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   def set(value, **options)
     raise ArgumentError, "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}" if value.is_a?(Array) && !multiple?
 
-    tag_name, type = attrs(:tagName, :type)
-    case tag_name.downcase
+    tag_name, type = attrs(:tagName, :type).map { |val| val&.downcase }
+    @tag_name ||= tag_name
+
+    case tag_name
     when 'input'
-      case type.downcase
+      case type
       when 'radio'
         click
       when 'checkbox'
@@ -78,7 +80,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
     when 'textarea'
       set_text(value, options)
     else
-      set_content_editable(value) if content_editable?
+      set_content_editable(value)
     end
   end
 
@@ -136,7 +138,7 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
 
   def tag_name
-    native.tag_name.downcase
+    @tag_name ||= native.tag_name.downcase
   end
 
   def visible?; boolean_attr(native.displayed?); end
@@ -291,20 +293,24 @@ private
     # Ensure we are focused on the element
     click
 
-    driver.execute_script <<-JS, self
-      var range = document.createRange();
-      var sel = window.getSelection();
-      arguments[0].focus();
-      range.selectNodeContents(arguments[0]);
-      sel.removeAllRanges();
-      sel.addRange(range);
+    editable = driver.execute_script <<-JS, self
+      if (arguments[0].isContentEditable) {
+        var range = document.createRange();
+        var sel = window.getSelection();
+        arguments[0].focus();
+        range.selectNodeContents(arguments[0]);
+        sel.removeAllRanges();
+        sel.addRange(range);
+        return true;
+      }
+      return false;
     JS
 
     # The action api has a speed problem but both chrome and firefox 58 raise errors
     # if we use the faster direct send_keys.  For now just send_keys to the element
     # we've already focused.
     # native.send_keys(value.to_s)
-    browser_action.send_keys(value.to_s).perform
+    browser_action.send_keys(value.to_s).perform if editable
   end
 
   def action_with_modifiers(click_options)

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

@@ -13,6 +13,14 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
   end
 
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
+    # In Chrome 75+ files are appended (due to WebDriver spec - why?) so we have to clear here if its multiple and already set
+    if browser_version >= 75.0
+      driver.execute_script(<<~JS, self)
+        if (arguments[0].multiple && (arguments[0].files.length > 0)){
+          arguments[0].value = null;
+        }
+      JS
+    end
     super(value)
   rescue *file_errors => e
     raise ArgumentError, "Selenium < 3.14 with remote Chrome doesn't support multiple file upload" if e.message.match?(/File not found : .+\n.+/m)
@@ -35,6 +43,18 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
     raise
   end
 
+  def disabled?
+    driver.evaluate_script("arguments[0].matches(':disabled, select:disabled *')", self)
+  end
+
+  def select_option
+    # To optimize to only one check and then click
+    selected_or_disabled = driver.evaluate_script(<<~JS, self)
+      arguments[0].matches(':disabled, select:disabled *, :checked')
+    JS
+    click unless selected_or_disabled
+  end
+
 private
 
   def file_errors
@@ -46,4 +66,14 @@ private
   def bridge
     driver.browser.send(:bridge)
   end
+
+  def w3c?
+    (defined?(Selenium::WebDriver::VERSION) && (Selenium::WebDriver::VERSION.to_f >= 4)) ||
+      driver.browser.capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities)
+  end
+
+  def browser_version
+    caps = driver.browser.capabilities
+    (caps[:browser_version] || caps[:version]).to_f
+  end
 end

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

@@ -18,22 +18,16 @@ class Capybara::Selenium::FirefoxNode < Capybara::Selenium::Node
   end
 
   def disabled?
-    # Not sure exactly what version of FF fixed the below issue, but it is definitely fixed in 61+
-    return super unless browser_version < 61.0
-
-    return true if super
-
-    # workaround for selenium-webdriver/geckodriver reporting elements as enabled when they are nested in disabling elements
-    if %w[option optgroup].include? tag_name
-      find_xpath('parent::*[self::optgroup or self::select]')[0].disabled?
-    else
-      !find_xpath(DISABLED_BY_FIELDSET_XPATH).empty?
-    end
+    driver.evaluate_script("arguments[0].matches(':disabled, select:disabled *')", self)
   end
 
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
     # By default files are appended so we have to clear here if its multiple and already set
-    native.clear if multiple? && driver.evaluate_script('arguments[0].files', self).any?
+    driver.execute_script(<<~JS, self)
+      if (arguments[0].multiple && (arguments[0].files.length > 0)){
+        arguments[0].value = null;
+      }
+    JS
     return super if browser_version >= 62.0
 
     # Workaround lack of support for multiple upload by uploading one at a time
@@ -65,6 +59,14 @@ class Capybara::Selenium::FirefoxNode < Capybara::Selenium::Node
     scroll_if_needed { browser_action.move_to(native, 0, 0).move_to(native).perform }
   end
 
+  def select_option
+    # To optimize to only one check and then click
+    selected_or_disabled = driver.evaluate_script(<<~JS, self)
+      arguments[0].matches(':disabled, select:disabled *, :checked')
+    JS
+    click unless selected_or_disabled
+  end
+
 private
 
   def click_with_options(click_options)

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'capybara/selenium/extensions/html5_drag'
+
+class Capybara::Selenium::IENode < Capybara::Selenium::Node
+  def disabled?
+    # TODO: Doesn't work for a bunch of cases - need to get IE running to see if it can be done like this
+    # driver.evaluate_script("arguments[0].msMatchesSelector(':disabled, select:disabled *')", self)
+    super
+  end
+end

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

@@ -19,8 +19,12 @@ class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
   end
 
   def select_option
-    driver.execute_script("arguments[0].closest('select').scrollIntoView()", self)
-    super
+    # To optimize to only one check and then click
+    selected_or_disabled = driver.execute_script(<<~JS, self)
+      arguments[0].closest('select').scrollIntoView();
+      return arguments[0].matches(':disabled, select:disabled *, :checked');
+    JS
+    click unless selected_or_disabled
   end
 
   def unselect_option
@@ -40,16 +44,7 @@ class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
   end
 
   def disabled?
-    return true if super
-
-    # workaround for safaridriver reporting elements as enabled when they are nested in disabling elements
-    if %w[option optgroup].include? tag_name
-      return true if self[:disabled] == 'true'
-
-      find_xpath('parent::*[self::optgroup or self::select]')[0].disabled?
-    else
-      !find_xpath(DISABLED_BY_FIELDSET_XPATH).empty?
-    end
+    driver.evaluate_script("arguments[0].matches(':disabled, select:disabled *')", self)
   end
 
   def set_file(value) # rubocop:disable Naming/AccessorMethodName

data/lib/capybara/server/checker.rb

@@ -12,7 +12,7 @@ module Capybara
 
       def request(&block)
         ssl? ? https_request(&block) : http_request(&block)
-      rescue *TRY_HTTPS_ERRORS # rubocop:disable Naming/RescuedExceptionsVariableName
+      rescue *TRY_HTTPS_ERRORS # _rubocop:disable Naming/RescuedExceptionsVariableName
         res = https_request(&block)
         @ssl = true
         res
@@ -25,11 +25,15 @@ module Capybara
     private
 
       def http_request(&block)
-        Net::HTTP.start(@host, @port, read_timeout: 2, &block)
+        make_request(read_timeout: 2, &block)
       end
 
       def https_request(&block)
-        Net::HTTP.start(@host, @port, ssl_options, &block)
+        make_request(ssl_options, &block)
+      end
+
+      def make_request(**options, &block)
+        Net::HTTP.start(@host, @port, options.merge(max_retries: 0), &block)
       end
 
       def ssl_options

data/lib/capybara/session.rb

@@ -77,7 +77,7 @@ module Capybara
     def initialize(mode, app = nil)
       raise TypeError, 'The second parameter to Session::new should be a rack app if passed.' if app && !app.respond_to?(:call)
 
-      @@instance_created = true
+      @@instance_created = true # rubocop:disable Style/ClassVars
       @mode = mode
       @app = app
       if block_given?
@@ -807,7 +807,7 @@ module Capybara
 
   private
 
-    @@instance_created = false
+    @@instance_created = false # rubocop:disable Style/ClassVars
 
     def driver_args(args)
       args.map { |arg| arg.is_a?(Capybara::Node::Element) ? arg.base : arg }

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

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

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

@@ -235,7 +235,7 @@ Capybara::SpecHelper.spec '#find' do
 
   it 'should accept an XPath instance' do
     @session.visit('/form')
-    @xpath = Capybara::Selector[:fillable_field].call('First Name')
+    @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('First Name')
     expect(@xpath).to be_a(::XPath::Union)
     expect(@session.find(@xpath).value).to eq('John')
   end

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

@@ -24,7 +24,7 @@ Capybara::SpecHelper.spec '#first' do
 
   it 'should accept an XPath instance' do
     @session.visit('/form')
-    @xpath = Capybara::Selector[:fillable_field].call('First Name')
+    @xpath = Capybara::Selector.new(:fillable_field, config: {}, format: :xpath).call('First Name')
     expect(@xpath).to be_a(::XPath::Union)
     expect(@session.first(@xpath).value).to eq('John')
   end

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

@@ -146,7 +146,9 @@ Capybara::SpecHelper.spec '#has_css?' do
   context 'with count' do
     it 'should be true if the content occurs the given number of times' do
       expect(@session).to have_css('p', count: 3)
+      expect(@session).to have_css('p').exactly(3).times
       expect(@session).to have_css('p a#foo', count: 1)
+      expect(@session).to have_css('p a#foo').once
       expect(@session).to have_css('p a.doesnotexist', count: 0)
       expect(@session).to have_css('li', class: /guitar|drummer/, count: 4)
       expect(@session).to have_css('li', id: /john|paul/, class: /guitar|drummer/, count: 2)
@@ -161,6 +163,7 @@ Capybara::SpecHelper.spec '#has_css?' do
 
     it 'should be false if the content occurs a different number of times than the given' do
       expect(@session).not_to have_css('p', count: 6)
+      expect(@session).not_to have_css('p').exactly(5).times
       expect(@session).not_to have_css('p a#foo', count: 2)
       expect(@session).not_to have_css('p a.doesnotexist', count: 1)
     end
@@ -175,6 +178,7 @@ Capybara::SpecHelper.spec '#has_css?' do
     it 'should be true when content occurs same or fewer times than given' do
       expect(@session).to have_css('h2.head', maximum: 5) # edge case
       expect(@session).to have_css('h2', maximum: 10)
+      expect(@session).to have_css('h2').at_most(10).times
       expect(@session).to have_css('p a.doesnotexist', maximum: 1)
       expect(@session).to have_css('p a.doesnotexist', maximum: 0)
     end
@@ -182,6 +186,7 @@ Capybara::SpecHelper.spec '#has_css?' do
     it 'should be false when content occurs more times than given' do
       expect(@session).not_to have_css('h2.head', maximum: 4) # edge case
       expect(@session).not_to have_css('h2', maximum: 3)
+      expect(@session).not_to have_css('h2').at_most(3).times
       expect(@session).not_to have_css('p', maximum: 1)
     end
 
@@ -195,12 +200,14 @@ Capybara::SpecHelper.spec '#has_css?' do
     it 'should be true when content occurs same or more times than given' do
       expect(@session).to have_css('h2.head', minimum: 5) # edge case
       expect(@session).to have_css('h2', minimum: 3)
+      expect(@session).to have_css('h2').at_least(2).times
       expect(@session).to have_css('p a.doesnotexist', minimum: 0)
     end
 
     it 'should be false when content occurs fewer times than given' do
       expect(@session).not_to have_css('h2.head', minimum: 6) # edge case
       expect(@session).not_to have_css('h2', minimum: 8)
+      expect(@session).not_to have_css('h2').at_least(8).times
       expect(@session).not_to have_css('p', minimum: 10)
       expect(@session).not_to have_css('p a.doesnotexist', minimum: 1)
     end

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

@@ -166,12 +166,14 @@ Capybara::SpecHelper.spec '#has_text?' do
     it 'should be true if the text occurs the given number of times' do
       @session.visit('/with_count')
       expect(@session).to have_text('count', count: 2)
+      expect(@session).to have_text('count').exactly(2).times
     end
 
     it 'should be false if the text occurs a different number of times than the given' do
       @session.visit('/with_count')
       expect(@session).not_to have_text('count', count: 0)
       expect(@session).not_to have_text('count', count: 1)
+      expect(@session).not_to have_text('count').once
       expect(@session).not_to have_text(/count/, count: 3)
     end
 
@@ -186,12 +188,14 @@ Capybara::SpecHelper.spec '#has_text?' do
     it 'should be true when text occurs same or fewer times than given' do
       @session.visit('/with_count')
       expect(@session).to have_text('count', maximum: 2)
+      expect(@session).to have_text('count').at_most(2).times
       expect(@session).to have_text(/count/, maximum: 3)
     end
 
     it 'should be false when text occurs more times than given' do
       @session.visit('/with_count')
       expect(@session).not_to have_text('count', maximum: 1)
+      expect(@session).not_to have_text('count').at_most(1).times
       expect(@session).not_to have_text('count', maximum: 0)
     end
 
@@ -206,12 +210,14 @@ Capybara::SpecHelper.spec '#has_text?' do
     it 'should be true when text occurs same or more times than given' do
       @session.visit('/with_count')
       expect(@session).to have_text('count', minimum: 2)
+      expect(@session).to have_text('count').at_least(2).times
       expect(@session).to have_text(/count/, minimum: 0)
     end
 
     it 'should be false when text occurs fewer times than given' do
       @session.visit('/with_count')
       expect(@session).not_to have_text('count', minimum: 3)
+      expect(@session).not_to have_text('count').at_least(3).times
     end
 
     it 'should coerce minimum to an integer' do