capybara 3.15.0 → 3.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 023614c44b5551f29984d882a7fb13b5ff240f589eff090cfb24c4f3a2787a47
-  data.tar.gz: c5c1cd40b59700f743325cca40efbe9fd68df776c7f16f6d351336400e86cdd4
+  metadata.gz: 12db68d440542fd3dda74f6b7f2dfa36c2eb2b8e1fe973cabbbfe1ebed0fe199
+  data.tar.gz: 9fbdd911c4193831996aa05a086fdfcc9012897e3640d4a4efe37c1df6679514
 SHA512:
-  metadata.gz: a76732bb72e5e5daefaf55a2bc4c895ef56d109905b9b3b2a5c96e229d97d783f1044dd6971ed21d4e63e55200a5e00a4641f50698f79346767fe498a5b894ad
-  data.tar.gz: ac8d9499807a093c26ca861ed204087702b1a3713b757c6e9d84d43f399b38db36b3b1ab28471413dfd385b442b7636abe9f16194ae4ef17395a16d5e92b7a1c
+  metadata.gz: d93e604a136e740101b4672947033e4b628df4627337ed3aee11098f0fd1be7ee5f10a6401e6185ac9797a531db8dde6f7d51ca80a4d446468ecb77698140224
+  data.tar.gz: ebdabe24db256bf3d083aafdb4dc16caf51211ae24cde2edca4cae755b97818ffc64f93705f45f98fc11f8e2e03184a2de09fc801dd85f500915cc91c5a0b52d

data/History.md

@@ -1,4 +1,11 @@
-# Version 3.15
+# Version 3.15.1
+Release date: 2019-04-20
+
+### Added
+
+* Suppress some deprecation notices from the latest selenium-webdriver
+
+# Version 3.15.0
 Release date: 2019-03-19
 
 ### Added

data/lib/capybara/selenium/driver.rb

@@ -16,6 +16,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   def self.load_selenium
     require 'selenium-webdriver'
+    require 'capybara/selenium/logger_suppressor'
     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/
@@ -110,7 +111,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 Selenium::WebDriver::Error::UnhandledAlertError, Selenium::WebDriver::Error::UnexpectedAlertOpenError
+    rescue *unhandled_alert_errors
       # 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
@@ -218,19 +219,24 @@ 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
@@ -246,12 +252,24 @@ private
   def clear_browser_state
     delete_all_cookies
     clear_storage
-  rescue Selenium::WebDriver::Error::UnhandledError # rubocop:disable Lint/HandleExceptions
+  rescue *clear_browser_state_errors # 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
@@ -324,11 +342,17 @@ private
         regexp = text.is_a?(Regexp) ? text : Regexp.escape(text.to_s)
         alert.text.match(regexp) ? alert : nil
       end
-    rescue Selenium::WebDriver::Error::TimeOutError
+    rescue *find_modal_errors
       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

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

@@ -40,11 +40,17 @@ private
 
   def delete_all_cookies
     execute_cdp('Network.clearBrowserCookies')
-  rescue Selenium::WebDriver::Error::UnhandledError, Selenium::WebDriver::Error::WebDriverError
+  rescue *cdp_unsupported_errors
     # 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/logger_suppressor.rb

@@ -0,0 +1,29 @@
+# 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

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

@@ -14,9 +14,9 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
 
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
     super(value)
-  rescue ::Selenium::WebDriver::Error::ExpectedError => err
+  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"
+      raise ArgumentError, "Selenium < 3.14 with remote Chrome doesn't support multiple file upload" if e.message.match?(/File not found : .+\n.+/m)
     end
 
     raise
@@ -30,6 +30,12 @@ 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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.15.0
+  version: 3.15.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -414,6 +414,7 @@ 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