capybara 3.15.1 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12db68d440542fd3dda74f6b7f2dfa36c2eb2b8e1fe973cabbbfe1ebed0fe199
-  data.tar.gz: 9fbdd911c4193831996aa05a086fdfcc9012897e3640d4a4efe37c1df6679514
+  metadata.gz: e11c89bad9b8520ba44314b12052ee3b5845a3bd758a8b96bd29b2cda338a1e9
+  data.tar.gz: 8e52ab3d885733f71c1d0803d646890c788ec15cc8169c364c6497a21a299b54
 SHA512:
-  metadata.gz: d93e604a136e740101b4672947033e4b628df4627337ed3aee11098f0fd1be7ee5f10a6401e6185ac9797a531db8dde6f7d51ca80a4d446468ecb77698140224
-  data.tar.gz: ebdabe24db256bf3d083aafdb4dc16caf51211ae24cde2edca4cae755b97818ffc64f93705f45f98fc11f8e2e03184a2de09fc801dd85f500915cc91c5a0b52d
+  metadata.gz: 16bcc0e6278f54605652cfe31d98647c0426bba37a1d5695ea7970117de9b9410cfe5d3aa8c154d023979ff24250801d01a26c179aad7ae0acb2124e74e375de
+  data.tar.gz: e49ed2c6600f114a259025d5e05076a1e2b670b68611eed7d60f3304c15a0a9faf7e476b15dd63c46bc552bb145fcdeb45694a0aa1f71459346f851734c538c8

data/History.md

@@ -1,11 +1,16 @@
-# Version 3.15.1
-Release date: 2019-04-20
+# Version 3.16
+Release date: 2019-03-28
+
+### Changed
+
+* Ruby 2.4.0+ is now required
+* Selenium driver now defaults to using a persistent http client connection
 
 ### Added
 
-* Suppress some deprecation notices from the latest selenium-webdriver
+* :wait option in predicates now accepts `true` to selectively override when `Capybara.predicates_wait == false`
 
-# Version 3.15.0
+# Version 3.15
 Release date: 2019-03-19
 
 ### Added

data/README.md

@@ -6,7 +6,7 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jnicklas/capybara?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=capybara&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=capybara&package-manager=bundler&version-scheme=semver)
 
-**Note** You are viewing the README for the 3.15.x version of Capybara.
+**Note** You are viewing the README for the 3.16.x version of Capybara.
 
 
 Capybara helps you test web applications by simulating how a real user would
@@ -419,7 +419,7 @@ teamcapybara repo once completely stable.
 
 ### <a name="capybara-webkit"></a>Capybara-webkit
 
-Note: `capybara-webkit` depends on QtWebkit which went EOL quite some time ago. There has been an attempt to revive the project but `capybara-webkit` is not yet (AFAIK) compatible with the revived version of QtWebKit (could be a good OSS project for someone) and as such is still limited to an old version of QtWebKit.  This means its support for modern JS and CSS is severely limited.
+Note: `capybara-webkit` depends on QtWebkit which went end-of-life quite some time ago. There has been an attempt to revive the project but `capybara-webkit` is not yet (as far as I know) compatible with the revived version of QtWebKit (could be a good open source project for someone) and as such is still limited to an old version of QtWebKit.  This means its support for modern JS and CSS is severely limited.
 
 The [capybara-webkit driver](https://github.com/thoughtbot/capybara-webkit) is for true headless
 testing. It uses QtWebKit to start a rendering engine process. It can execute JavaScript as well.

data/lib/capybara/helpers.rb

@@ -3,7 +3,7 @@
 module Capybara
   # @api private
   module Helpers
-  module_function
+  module_function # rubocop:disable Layout/IndentationWidth
 
     ##
     # @deprecated

data/lib/capybara/node/actions.rb

@@ -8,7 +8,7 @@ module Capybara
       #   and continuously retry finding the element until either the element is found or the time
       #   expires. The length of time +find+ will wait is controlled through {Capybara.default_max_wait_time}
       #
-      #   @option options [false, Numeric] wait (Capybara.default_max_wait_time) Maximum time to wait for matching element to appear.
+      #   @option options [false, true, Numeric] wait (Capybara.default_max_wait_time) Maximum time to wait for matching element to appear.
 
       ##
       #

data/lib/capybara/node/base.rb

@@ -76,7 +76,7 @@ module Capybara
       def synchronize(seconds = nil, errors: nil)
         return yield if session.synchronized
 
-        seconds = session_options.default_max_wait_time if seconds.nil?
+        seconds = session_options.default_max_wait_time if [nil, true].include? seconds
         session.synchronized = true
         timer = Capybara::Helpers.timer(expire_in: seconds)
         begin

data/lib/capybara/node/finders.rb

@@ -13,7 +13,7 @@ module Capybara
       #   and continuously retry finding the element until either the element is found or the time
       #   expires. The length of time +find+ will wait is controlled through {Capybara.default_max_wait_time}
       #   and defaults to 2 seconds.
-      #   @option options [false, Numeric] wait (Capybara.default_max_wait_time) Maximum time to wait for matching element to appear.
+      #   @option options [false, true, Numeric] wait (Capybara.default_max_wait_time) Maximum time to wait for matching element to appear.
       #
       #  page.find('#foo').find('.bar')
       #  page.find(:xpath, './/div[contains(., "bar")]')

data/lib/capybara/queries/base_query.rb

@@ -98,7 +98,7 @@ module Capybara
 
         invalid_names = invalid_keys.map(&:inspect).join(', ')
         valid_names = valid_keys.map(&:inspect).join(', ')
-        raise ArgumentError, "invalid keys #{invalid_names}, should be one of #{valid_names}"
+        raise ArgumentError, "Invalid option(s) #{invalid_names}, should be one of #{valid_names}"
       end
     end
   end

data/lib/capybara/queries/selector_query.rb

@@ -271,7 +271,7 @@ module Capybara
 
       def assert_valid_keys
         unless VALID_MATCH.include?(match)
-          raise ArgumentError, "invalid option #{match.inspect} for :match, should be one of #{VALID_MATCH.map(&:inspect).join(', ')}"
+          raise ArgumentError, "Invalid option #{match.inspect} for :match, should be one of #{VALID_MATCH.map(&:inspect).join(', ')}"
         end
 
         unhandled_options = @options.keys.reject do |option_name|
@@ -284,7 +284,7 @@ module Capybara
 
         invalid_names = unhandled_options.map(&:inspect).join(', ')
         valid_names = (valid_keys - [:allow_self]).map(&:inspect).join(', ')
-        raise ArgumentError, "invalid keys #{invalid_names}, should be one of #{valid_names}"
+        raise ArgumentError, "Invalid option(s) #{invalid_names}, should be one of #{valid_names}"
       end
 
       def filtered_expression(expr)

data/lib/capybara/rack_test/form.rb

@@ -56,7 +56,7 @@ private
   end
 
   def request_method
-    self[:method] =~ /post/i ? :post : :get
+    self[:method].to_s.match?(/post/i) ? :post : :get
   end
 
   def merge_param!(params, key, value)

data/lib/capybara/rspec/matchers.rb

@@ -107,7 +107,7 @@ module Capybara
     #   See {Capybara::Node::Matchers#has_unchecked_field?}
 
     # RSpec matcher for text content
-    # See {Capybara::SessionMatchers#assert_text}
+    # See {Capybara::Node::Matchers#assert_text}
     def have_text(*args)
       Matchers::HaveText.new(*args)
     end

data/lib/capybara/selector.rb

@@ -459,100 +459,92 @@ Capybara.add_selector(:table, locator_type: [String, Symbol]) do
   expression_filter(:with_cols, valid_values: [Array]) do |xpath, cols|
     col_conditions = cols.map do |col|
       if col.is_a? Hash
-        col.reduce(nil) do |xp, (header, cell)|
-          header_xp = XPath.descendant(:th)[XPath.string.n.is(header)]
-          cell_xp = XPath.descendant(:tr)[header_xp].descendant(:td)
-          next cell_xp[XPath.string.n.is(cell)] unless xp
-
-          table_ancestor = XPath.ancestor(:table)[1]
-          xp = XPath::Expression.new(:join, table_ancestor, xp)
-          cell_xp[XPath.string.n.is(cell) & XPath.position.equals(xp.preceding_sibling(:td).count.plus(1))]
+        col.reduce(nil) do |xp, (header, cell_str)|
+          header = XPath.descendant(:th)[XPath.string.n.is(header)]
+          td = XPath.descendant(:tr)[header].descendant(:td)
+          cell_condition = XPath.string.n.is(cell_str)
+          cell_condition &= prev_col_position?(XPath.ancestor(:table)[1].join(xp)) if xp
+          td[cell_condition]
         end
       else
-        cells_xp = col.reduce(nil) do |xp, cell|
-          cell_conditions = [XPath.string.n.is(cell)]
-          if xp
-            prev_row_xp = XPath::Expression.new(:join, XPath.ancestor(:tr)[1].preceding_sibling(:tr), xp)
-            cell_conditions << XPath.position.equals(prev_row_xp.preceding_sibling(:td).count.plus(1))
+        cells_xp = col.reduce(nil) do |prev_cell, cell_str|
+          cell_condition = XPath.string.n.is(cell_str)
+
+          if prev_cell
+            prev_cell = XPath.ancestor(:tr)[1].preceding_sibling(:tr).join(prev_cell)
+            cell_condition &= prev_col_position?(prev_cell)
           end
-          XPath.descendant(:td)[cell_conditions.reduce :&]
+
+          XPath.descendant(:td)[cell_condition]
         end
-        XPath::Expression.new(:join, XPath.descendant(:tr), cells_xp)
+        XPath.descendant(:tr).join(cells_xp)
       end
     end.reduce(:&)
     xpath[col_conditions]
   end
 
   expression_filter(:cols, valid_values: [Array]) do |xpath, cols|
-    raise ArgumentError, ":cols must be an Array of Arrays" unless cols.all? { |col| col.is_a? Array }
+    raise ArgumentError, ':cols must be an Array of Arrays' unless cols.all? { |col| col.is_a? Array }
 
     rows = cols.transpose
-    xpath = xpath[XPath.descendant(:tbody).descendant(:tr).count.equals(rows.size) | (XPath.descendant(:tr).count.equals(rows.size) & ~XPath.descendant(:tbody))]
-
-    col_conditions = rows.map do |row|
-      row_conditions = row.map do |cell|
-        XPath.self(:td)[XPath.string.n.is(cell)]
-      end
-      row_conditions = row_conditions.reverse.reduce do |cond, cell|
-        cell[XPath.following_sibling[cond]]
-      end
-      row_xpath = XPath.descendant(:tr)[XPath.descendant(:td)[row_conditions]]
-      row_xpath[XPath.descendant(:td).count.equals(row.size)]
-    end.reduce(:&)
-
-    xpath[col_conditions]
+    col_conditions = rows.map { |row| match_row(row, match_size: true) }.reduce(:&)
+    xpath[match_row_count(rows.size)][col_conditions]
   end
 
   expression_filter(:with_rows, valid_values: [Array]) do |xpath, rows|
-    rows_conditions = rows.map do |row|
-      if row.is_a? Hash
-        row_conditions = row.map do |header, cell|
-          header_xp = XPath.ancestor(:table)[1].descendant(:tr)[1].descendant(:th)[XPath.string.n.is(header)]
-          XPath.descendant(:td)[
-            XPath.string.n.is(cell) & XPath.position.equals(header_xp.preceding_sibling.count.plus(1))
-          ]
-        end.reduce(:&)
-        XPath.descendant(:tr)[row_conditions]
-      else
-        row_conditions = row.map do |cell|
-          XPath.self(:td)[XPath.string.n.is(cell)]
-        end
-        row_conditions = row_conditions.reverse.reduce do |cond, cell|
-          cell[XPath.following_sibling[cond]]
-        end
-        XPath.descendant(:tr)[XPath.descendant(:td)[row_conditions]]
-      end
-    end.reduce(:&)
+    rows_conditions = rows.map { |row| match_row(row) }.reduce(:&)
     xpath[rows_conditions]
   end
 
   expression_filter(:rows, valid_values: [Array]) do |xpath, rows|
-    xpath = xpath[XPath.descendant(:tbody).descendant(:tr).count.equals(rows.size) | (XPath.descendant(:tr).count.equals(rows.size) & ~XPath.descendant(:tbody))]
-    rows_conditions = rows.map do |row|
-      row_xpath = if row.is_a? Hash
-        row_conditions = row.map do |header, cell|
-          header_xp = XPath.ancestor(:table)[1].descendant(:tr)[1].descendant(:th)[XPath.string.n.is(header)]
-          XPath.descendant(:td)[
-            XPath.string.n.is(cell) & XPath.position.equals(header_xp.preceding_sibling.count.plus(1))
-          ]
-        end.reduce(:&)
-        XPath.descendant(:tr)[row_conditions]
+    rows_conditions = rows.map { |row| match_row(row, match_size: true) }.reduce(:&)
+    xpath[match_row_count(rows.size)][rows_conditions]
+  end
+
+  describe_expression_filters do |caption: nil, **|
+    " with caption \"#{caption}\"" if caption
+  end
+
+  def prev_col_position?(cell)
+    XPath.position.equals(cell_position(cell))
+  end
+
+  def cell_position(cell)
+    cell.preceding_sibling(:td).count.plus(1)
+  end
+
+  def match_row(row, match_size: false)
+    xp = XPath.descendant(:tr)[
+      if row.is_a? Hash
+        row_match_cells_to_headers(row)
       else
-        row_conditions = row.map do |cell|
-          XPath.self(:td)[XPath.string.n.is(cell)]
-        end
-        row_conditions = row_conditions.reverse.reduce do |cond, cell|
-          cell[XPath.following_sibling[cond]]
-        end
-        XPath.descendant(:tr)[XPath.descendant(:td)[row_conditions]]
+        XPath.descendant(:td)[row_match_ordered_cells(row)]
       end
-      row_xpath[XPath.descendant(:td).count.equals(row.size)]
+    ]
+    xp = xp[XPath.descendant(:td).count.equals(row.size)] if match_size
+    xp
+  end
+
+  def match_row_count(size)
+    XPath.descendant(:tbody).descendant(:tr).count.equals(size) | (XPath.descendant(:tr).count.equals(size) & ~XPath.descendant(:tbody))
+  end
+
+  def row_match_cells_to_headers(row)
+    row.map do |header, cell|
+      header_xp = XPath.ancestor(:table)[1].descendant(:tr)[1].descendant(:th)[XPath.string.n.is(header)]
+      XPath.descendant(:td)[
+        XPath.string.n.is(cell) & XPath.position.equals(header_xp.preceding_sibling.count.plus(1))
+      ]
     end.reduce(:&)
-    xpath[rows_conditions]
   end
 
-  describe_expression_filters do |caption: nil, **|
-    " with caption \"#{caption}\"" if caption
+  def row_match_ordered_cells(row)
+    row_conditions = row.map do |cell|
+      XPath.self(:td)[XPath.string.n.is(cell)]
+    end
+    row_conditions.reverse.reduce do |cond, cell|
+      cell[XPath.following_sibling[cond]]
+    end
   end
 end
 

data/lib/capybara/selector/css.rb

@@ -7,13 +7,13 @@ module Capybara
         value = str.dup
         out = +''
         out << value.slice!(0...1) if value =~ /^[-_]/
-        out << (value[0] =~ NMSTART ? value.slice!(0...1) : escape_char(value.slice!(0...1)))
+        out << (value[0].match?(NMSTART) ? value.slice!(0...1) : escape_char(value.slice!(0...1)))
         out << value.gsub(/[^a-zA-Z0-9_-]/) { |char| escape_char char }
         out
       end
 
       def self.escape_char(char)
-        char =~ %r{[ -/:-~]} ? "\\#{char}" : format('\\%06x', char.ord)
+        char.match?(%r{[ -/:-~]}) ? "\\#{char}" : format('\\%06x', char.ord)
       end
 
       def self.split(css)

data/lib/capybara/selector/xpath_extensions.rb

@@ -7,3 +7,11 @@ module XPath
     end
   end
 end
+
+module XPath
+  module DSL
+    def join(*expressions)
+      XPath::Expression.new(:join, *[self, expressions].flatten)
+    end
+  end
+end

data/lib/capybara/selenium/driver.rb

@@ -16,7 +16,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def self.load_selenium
     require 'selenium-webdriver'
-    require 'capybara/selenium/logger_suppressor'
+    require 'capybara/selenium/patches/persistent_client'
     warn "Warning: You're using an unsupported version of selenium-webdriver, please upgrade." if Gem.loaded_specs['selenium-webdriver'].version < Gem::Version.new('3.5.0')
   rescue LoadError => err
     raise err if err.message !~ /selenium-webdriver/
@@ -26,8 +26,12 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def browser
     @browser ||= begin
-      if options[:timeout]
-        options[:http_client] ||= Selenium::WebDriver::Remote::Http::Default.new(read_timeout: options[:timeout])
+      options[:http_client] ||= begin
+        if options[:timeout]
+          ::Capybara::Selenium::PersistentClient.new(read_timeout: options[:timeout])
+        else
+          ::Capybara::Selenium::PersistentClient.new
+        end
       end
       processed_options = options.reject { |key, _val| SPECIAL_OPTIONS.include?(key) }
       Selenium::WebDriver.for(options[:browser], processed_options).tap do |driver|
@@ -111,7 +115,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
       navigated = true
       # Ensure the page is empty and trigger an UnhandledAlertError for any modals that appear during unload
       wait_for_empty_page(timer)
-    rescue *unhandled_alert_errors
+    rescue Selenium::WebDriver::Error::UnhandledAlertError, Selenium::WebDriver::Error::UnexpectedAlertOpenError
       # This error is thrown if an unhandled alert is on the page
       # Firefox appears to automatically dismiss this alert, chrome does not
       # We'll try to accept it
@@ -178,7 +182,10 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.window_handles
   end
 
-  def open_new_window
+  def open_new_window(kind = :tab)
+    browser.manage.new_window(kind)
+  rescue NoMethodError, Selenium::WebDriver::Error::WebDriverError
+    # If not supported by the driver or browser default to using JS
     browser.execute_script('window.open();')
   end
 
@@ -219,24 +226,19 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   end
 
   def invalid_element_errors
-    errors = [
+    [
       ::Selenium::WebDriver::Error::StaleElementReferenceError,
+      ::Selenium::WebDriver::Error::UnhandledError,
+      ::Selenium::WebDriver::Error::ElementNotVisibleError,
+      ::Selenium::WebDriver::Error::InvalidSelectorError, # Work around a chromedriver go_back/go_forward race condition
       ::Selenium::WebDriver::Error::ElementNotInteractableError,
-      ::Selenium::WebDriver::Error::InvalidSelectorError, # Work around chromedriver go_back/go_forward race condition
       ::Selenium::WebDriver::Error::ElementClickInterceptedError,
+      ::Selenium::WebDriver::Error::InvalidElementStateError,
+      ::Selenium::WebDriver::Error::ElementNotSelectableError,
+      ::Selenium::WebDriver::Error::ElementNotSelectableError,
       ::Selenium::WebDriver::Error::NoSuchElementError, # IE
       ::Selenium::WebDriver::Error::InvalidArgumentError # IE
     ]
-
-    ::Selenium::WebDriver.logger.suppress_deprecations do
-      errors.concat [
-        ::Selenium::WebDriver::Error::UnhandledError,
-        ::Selenium::WebDriver::Error::ElementNotVisibleError,
-        ::Selenium::WebDriver::Error::InvalidElementStateError,
-        ::Selenium::WebDriver::Error::ElementNotSelectableError
-      ]
-    end
-    errors
   end
 
   def no_such_window_error
@@ -252,24 +254,12 @@ private
   def clear_browser_state
     delete_all_cookies
     clear_storage
-  rescue *clear_browser_state_errors # rubocop:disable Lint/HandleExceptions
+  rescue Selenium::WebDriver::Error::UnhandledError # rubocop:disable Lint/HandleExceptions
     # delete_all_cookies fails when we've previously gone
     # to about:blank, so we rescue this error and do nothing
     # instead.
   end
 
-  def clear_browser_state_errors
-    ::Selenium::WebDriver.logger.suppress_deprecations do
-      [Selenium::WebDriver::Error::UnhandledError, Selenium::WebDriver::Error::UnknownError]
-    end
-  end
-
-  def unhandled_alert_errors
-    ::Selenium::WebDriver.logger.suppress_deprecations do
-      [Selenium::WebDriver::Error::UnhandledAlertError, Selenium::WebDriver::Error::UnexpectedAlertOpenError]
-    end
-  end
-
   def delete_all_cookies
     @browser.manage.delete_all_cookies
   end
@@ -340,19 +330,13 @@ private
       wait.until do
         alert = @browser.switch_to.alert
         regexp = text.is_a?(Regexp) ? text : Regexp.escape(text.to_s)
-        alert.text.match(regexp) ? alert : nil
+        alert.text.match?(regexp) ? alert : nil
       end
-    rescue *find_modal_errors
+    rescue Selenium::WebDriver::Error::TimeOutError
       raise Capybara::ModalNotFound, "Unable to find modal dialog#{" with #{text}" if text}"
     end
   end
 
-  def find_modal_errors
-    ::Selenium::WebDriver.logger.suppress_deprecations do
-      [Selenium::WebDriver::Error::TimeoutError, Selenium::WebDriver::Error::TimeOutError]
-    end
-  end
-
   def silenced_unknown_error_message?(msg)
     silenced_unknown_error_messages.any? { |regex| msg =~ regex }
   end
@@ -366,7 +350,7 @@ private
     when Array
       arg.map { |arr| unwrap_script_result(arr) }
     when Hash
-      arg.each { |key, value| arg[key] = unwrap_script_result(value) }
+      arg.transform_values! { |value| unwrap_script_result(value) }
     when Selenium::WebDriver::Element
       build_node(arg)
     else

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

@@ -40,17 +40,11 @@ private
 
   def delete_all_cookies
     execute_cdp('Network.clearBrowserCookies')
-  rescue *cdp_unsupported_errors
+  rescue Selenium::WebDriver::Error::UnhandledError, Selenium::WebDriver::Error::WebDriverError
     # If the CDP clear isn't supported do original limited clear
     super
   end
 
-  def cdp_unsupported_errors
-    ::Selenium::WebDriver.logger.suppress_deprecations do
-      [Selenium::WebDriver::Error::UnhandledError, Selenium::WebDriver::Error::WebDriverError]
-    end
-  end
-
   def execute_cdp(cmd, params = {})
     args = { cmd: cmd, params: params }
     result = bridge.http.call(:post, "session/#{bridge.session_id}/goog/cdp/execute", args)

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

@@ -3,7 +3,7 @@
 require 'capybara/selenium/nodes/safari_node'
 
 module Capybara::Selenium::Driver::SafariDriver
-private
+private # rubocop:disable Layout/IndentationWidth
 
   def build_node(native_node, initial_cache = {})
     ::Capybara::Selenium::SafariNode.new(self, native_node, initial_cache)

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

@@ -2,7 +2,9 @@
 
 class Capybara::Selenium::Node
   module Html5Drag
-  private
+  # Implement methods to emulate HTML5 drag and drop
+
+  private # rubocop:disable Layout/IndentationWidth
 
     def html5_drag_to(element)
       driver.execute_script MOUSEDOWN_TRACKER

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

@@ -14,10 +14,8 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
 
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
     super(value)
-  rescue *file_errors => err
-    if err.message =~ /File not found : .+\n.+/m
-      raise ArgumentError, "Selenium < 3.14 with remote Chrome doesn't support multiple file upload" if e.message.match?(/File not found : .+\n.+/m)
-    end
+  rescue ::Selenium::WebDriver::Error::ExpectedError => err
+    raise ArgumentError, "Selenium < 3.14 with remote Chrome doesn't support multiple file upload" if err.message.match?(/File not found : .+\n.+/m)
 
     raise
   end
@@ -30,12 +28,6 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
 
 private
 
-  def file_errors
-    ::Selenium::WebDriver.logger.suppress_deprecations do
-      [::Selenium::WebDriver::Error::ExpectedError]
-    end
-  end
-
   def bridge
     driver.browser.send(:bridge)
   end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Capybara
+  module Selenium
+    class PersistentClient < ::Selenium::WebDriver::Remote::Http::Default
+      def close
+        super
+        @http.finish if @http&.started?
+      end
+
+    private
+
+      def http
+        super.tap do |http|
+          http.start unless http.started?
+        end
+      end
+    end
+  end
+end

data/lib/capybara/session.rb

@@ -263,7 +263,7 @@ module Capybara
 
       if base_uri && [nil, 'http', 'https'].include?(visit_uri.scheme)
         if visit_uri.relative?
-          visit_uri_parts = visit_uri.to_hash.delete_if { |_k, value| value.nil? }
+          visit_uri_parts = visit_uri.to_hash.compact
 
           # Useful to people deploying to a subdirectory
           # and/or single page apps where only the url fragment changes
@@ -458,9 +458,13 @@ module Capybara
     #
     # @return [Capybara::Window]   window that has been opened
     #
-    def open_new_window
+    def open_new_window(kind = :tab)
       window_opened_by do
-        driver.open_new_window
+        if driver.method(:open_new_window).arity.zero?
+          driver.open_new_window
+        else
+          driver.open_new_window(kind)
+        end
       end
     end
 
@@ -850,7 +854,7 @@ module Capybara
       when Array
         arg.map { |subarg| element_script_result(subarg) }
       when Hash
-        arg.each { |key, value| arg[key] = element_script_result(value) }
+        arg.transform_values! { |value| element_script_result(value) }
       when Capybara::Driver::Node
         Capybara::Node::Element.new(self, arg, nil, nil)
       else

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

@@ -108,7 +108,7 @@ Capybara::SpecHelper.spec '#find' do
 
     it 'should warn if passed a non-valid locator type' do
       expect_any_instance_of(Kernel).to receive(:warn).with(/must respond to to_xpath or be an instance of String/)
-      expect { @session.find(:xpath, 123) }.to raise_error # rubocop:disable RSpec/UnspecifiedException
+      expect { @session.find(:xpath, 123) }.to raise_error Exception # The exact error is not yet well defined
     end
   end
 

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

@@ -113,13 +113,20 @@ Capybara::SpecHelper.spec '#has_css?' do
   end
 
   context 'with predicates_wait == false' do
-    it 'should not wait for content to appear', requires: [:js] do
+    before do
       Capybara.predicates_wait = false
-      Capybara.default_max_wait_time = 2
+      Capybara.default_max_wait_time = 5
       @session.visit('/with_js')
       @session.click_link('Click me')
+    end
+
+    it 'should not wait for content to appear', requires: [:js] do
       expect(@session.has_css?("input[type='submit'][value='New Here']")).to be false
     end
+
+    it 'should should the default wait time if true is passed for :wait', requires: [:js] do
+      expect(@session.has_css?("input[type='submit'][value='New Here']", wait: true)).to be true
+    end
   end
 
   context 'with between' do

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

@@ -49,8 +49,8 @@ Capybara::SpecHelper.spec '#has_table?' do
         %w[Thomas Walpole Oceanside],
         %w[Danilo Wilkinson Johnsonville],
         %w[Vern Konopelski Everette],
-        ["Ratke", "Lawrence", "East Sorayashire"],
-        ["Palmer", "Sawayn", "West Trinidad"]
+        ['Ratke', 'Lawrence', 'East Sorayashire'],
+        ['Palmer', 'Sawayn', 'West Trinidad']
       ])
   end
 
@@ -84,8 +84,8 @@ Capybara::SpecHelper.spec '#has_table?' do
         %w[Thomas Walpole Oceanside],
         %w[Danilo Wilkinson Johnsonville],
         %w[Vern Konopelski Everette],
-        ["Ratke", "Lawrence", "East Sorayashire"],
-        ["Palmer", "Sawayn", "West Trinidad"]
+        ['Ratke', 'Lawrence', 'East Sorayashire'],
+        ['Palmer', 'Sawayn', 'West Trinidad']
       ])
   end
 

data/lib/capybara/spec/spec_helper.rb

@@ -100,7 +100,7 @@ module Capybara
 
     def silence_stream(stream)
       old_stream = stream.dup
-      stream.reopen(RbConfig::CONFIG['host_os'] =~ /rmswin|mingw/ ? 'NUL:' : '/dev/null')
+      stream.reopen(RbConfig::CONFIG['host_os'].match?(/rmswin|mingw/) ? 'NUL:' : '/dev/null')
       stream.sync = true
       yield
     ensure

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.15.1'
+  VERSION = '3.16.0'
 end

data/spec/sauce_spec_chrome.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'selenium-webdriver'
+
+require 'sauce_whisk'
+# require 'shared_selenium_session'
+# require 'rspec/shared_spec_matchers'
+
+Capybara.register_driver :sauce_chrome do |app|
+  options = {
+    selenium_version: '3.141.59',
+    platform: 'macOS 10.12',
+    browser_name: 'chrome',
+    version: '65.0',
+    name: 'Capybara test',
+    build: ENV['TRAVIS_REPO_SLUG'] || "Ruby-RSpec-Selenium: Local-#{Time.now.to_i}",
+    username: ENV['SAUCE_USERNAME'],
+    access_key: ENV['SAUCE_ACCESS_KEY']
+  }
+
+  options.delete(:browser_name)
+
+  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(options)
+  url = 'https://ondemand.saucelabs.com:443/wd/hub'
+
+  Capybara::Selenium::Driver.new(app,
+                                 browser: :remote, url: url,
+                                 desired_capabilities: capabilities,
+                                 options: Selenium::WebDriver::Chrome::Options.new(args: ['']))
+end
+
+CHROME_REMOTE_DRIVER = :sauce_chrome
+
+module TestSessions
+  Chrome = Capybara::Session.new(CHROME_REMOTE_DRIVER, TestApp)
+end
+
+skipped_tests = %i[response_headers status_code trigger download]
+
+Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_REMOTE_DRIVER.to_s, capybara_skip: skipped_tests do |example|
+end

data/spec/shared_selenium_session.rb

@@ -474,8 +474,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         it 'can set and clear a text field' do
           session.visit 'https://reactjs.org/docs/forms.html'
           session.all(:css, 'h2#controlled-components ~ p a', text: 'Try it on CodePen')[0].click
-          sleep 2 # give codepen a chance to stabilize result frame
-          session.within_frame(:css, 'iframe.result-iframe') do
+          session.within_frame(:css, 'iframe.result-iframe[src^="https://s.codepen.io"]', wait: 10) do
             session.fill_in('Name:', with: 'abc')
             session.accept_prompt 'A name was submitted: abc' do
               session.click_button('Submit')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.15.1
+  version: 3.16.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -264,6 +264,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +292,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sauce_whisk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -414,12 +442,12 @@ files:
 - lib/capybara/selenium/extensions/find.rb
 - lib/capybara/selenium/extensions/html5_drag.rb
 - lib/capybara/selenium/extensions/scroll.rb
-- lib/capybara/selenium/logger_suppressor.rb
 - lib/capybara/selenium/node.rb
 - lib/capybara/selenium/nodes/chrome_node.rb
 - lib/capybara/selenium/nodes/firefox_node.rb
 - lib/capybara/selenium/nodes/safari_node.rb
 - lib/capybara/selenium/patches/pause_duration_fix.rb
+- lib/capybara/selenium/patches/persistent_client.rb
 - lib/capybara/server.rb
 - lib/capybara/server/animation_disabler.rb
 - lib/capybara/server/checker.rb
@@ -585,6 +613,7 @@ files:
 - spec/rspec/views_spec.rb
 - spec/rspec_matchers_spec.rb
 - spec/rspec_spec.rb
+- spec/sauce_spec_chrome.rb
 - spec/selector_spec.rb
 - spec/selenium_spec_chrome.rb
 - spec/selenium_spec_chrome_remote.rb
@@ -612,7 +641,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/capybara/selenium/logger_suppressor.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Capybara
-  module Selenium
-    module DeprecationSuppressor
-      def deprecate(*)
-        super unless @suppress_for_capybara
-      end
-
-      def suppress_deprecations
-        prev_suppress_for_capybara, @suppress_for_capybara = @suppress_for_capybara, true
-        yield
-      ensure
-        @suppress_for_capybara = prev_suppress_for_capybara
-      end
-    end
-
-    module ErrorSuppressor
-      def for_code(*)
-        ::Selenium::WebDriver.logger.suppress_deprecations do
-          super
-        end
-      end
-    end
-  end
-end
-
-Selenium::WebDriver::Logger.prepend Capybara::Selenium::DeprecationSuppressor
-Selenium::WebDriver::Error.singleton_class.prepend Capybara::Selenium::ErrorSuppressor