Don't rename already specific errors in Safari driver

teamcapybara · Jun 11, 2019 · a13eaa6 · a13eaa6
1 parent d06378a
commit a13eaa6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/capybara/selenium/nodes/safari_node.rb b/lib/capybara/selenium/nodes/safari_node.rb
@@ -16,7 +16,9 @@ def click(keys = [], **options)
       return find_css('th:first-child,td:first-child')[0].click(keys, options)
     end
     raise
-  rescue ::Selenium::WebDriver::Error::WebDriverError
+  rescue ::Selenium::WebDriver::Error::WebDriverError => e
+    raise unless e.instance_of? ::Selenium::WebDriver::Error::WebDriverError
+
     # Safari doesn't return a specific error here - assume it's an ElementNotInteractableError
     raise ::Selenium::WebDriver::Error::ElementNotInteractableError,
           'Non distinct error raised in #click, translated to ElementNotInteractableError for retry'

diff --git a/lib/capybara/spec/test_app.rb b/lib/capybara/spec/test_app.rb
@@ -212,6 +212,10 @@ def initialize(string1, msg)
     end
   end
 
+  get '/apple-touch-icon-precomposed.png' do
+    halt(404)
+  end
+
   class << self
     attr_accessor :form_post_count
   end