capybara 3.23.0 → 3.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99599c60a1bafbd60b15e476dbaff54e5692358aed4e55908a40d537ebf00194
-  data.tar.gz: 26cb00377b6c80746e29838c8a22630a90786d73fa588e0ab9b3dd09fb7de9b9
+  metadata.gz: 2ea1da81bd27199aadc0d73d61e33b7ff0ea9911114acc375ea2e6f798a49eb4
+  data.tar.gz: 30279a8a5ab221ae029bc95625c7c82ad11cdf68d91ef6be33e7a0b022268537
 SHA512:
-  metadata.gz: ea61766410acfe21525a56d25d44960a3c178b4d2c210bbc1f28bcc6c925f2bcbeeb1fd821a3618f94a775d7054291b3b831e411a75a0cb1ad6dd3ca517c0e91
-  data.tar.gz: de3a8a91967058710ebc0e30953cb22ea1fae30f5475ab32599a0c088ce032cba385721fe79a84cb5f81597bfc8b230afd5dabfb8e28391c1d7102453e251832
+  metadata.gz: 0b8d7f760540297a204ae5eb0dac8b9450e8961652de87d543ae114edb9af6a48219db7c55a40e004d49847431ef545cc5628a6bbde858e58921209f984852d2
+  data.tar.gz: 56d10157a97fd98f7e2e23c98fc21f0dc0f70f53338a271c9fa22b639648d919134fe1c7c803be43f435a9618d49e2517ccce5d207139635c49d9f6f18a66bd6

data/History.md

@@ -1,3 +1,20 @@
+# Version 3.24.0
+Release date: 2079-06-13
+
+### Added
+
+* Log access when using the Selenium driver with Chrome 75 in W3C mode has been reenabled.
+
+### Changed
+
+* Selenium driver now selects all current content and then sends keys rather than clearing field by JS
+  and then sending keys when setting values to text inputs in order to more closely simulate user behavior
+
+### Fixed
+
+* Relative paths passed to `attach_file` will be assumed to be relative to the current working directory when using the
+  Selenium driver
+
 # Version 3.23.0
 Release date: 2019-06-10
 

data/README.md

@@ -7,8 +7,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.23.x version of Capybara.
-
+**Note** You are viewing the README for the 3.24.x version of Capybara.
 
 Capybara helps you test web applications by simulating how a real user would
 interact with your app. It is agnostic about the driver running your tests and

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

@@ -6,7 +6,7 @@ require 'capybara/selenium/patches/logs'
 module Capybara::Selenium::Driver::ChromeDriver
   def self.extended(base)
     bridge = base.send(:bridge)
-    bridge.extend Capybara::Selenium::ChromeLogs unless bridge.respond_to?(:available_log_types)
+    bridge.extend Capybara::Selenium::ChromeLogs unless bridge.respond_to?(:log)
   end
 
   def fullscreen_window(handle)
@@ -90,9 +90,13 @@ private
   end
 
   def execute_cdp(cmd, params = {})
-    args = { cmd: cmd, params: params }
-    result = bridge.http.call(:post, "session/#{bridge.session_id}/goog/cdp/execute", args)
-    result['value']
+    if browser.respond_to? :execute_cdp
+      browser.execute_cdp(cmd, params)
+    else
+      args = { cmd: cmd, params: params }
+      result = bridge.http.call(:post, "session/#{bridge.session_id}/goog/cdp/execute", args)
+      result['value']
+    end
   end
 
   def build_node(native_node, initial_cache = {})

data/lib/capybara/selenium/node.rb

@@ -224,10 +224,7 @@ private
     elsif clear.is_a? Array
       send_keys(*clear, value)
     else
-      # Clear field by JavaScript assignment of the value property.
-      # Script can change a readonly element which user input cannot, so
-      # don't execute if readonly.
-      driver.execute_script "if (!arguments[0].readOnly){ arguments[0].value = '' }", self unless clear == :none
+      driver.execute_script 'arguments[0].select()', self unless clear == :none
       send_keys(value)
     end
   end
@@ -303,7 +300,7 @@ private
 
   def set_file(value) # rubocop:disable Naming/AccessorMethodName
     path_names = value.to_s.empty? ? [] : value
-    native.send_keys(Array(path_names).join("\n"))
+    native.send_keys(Array(path_names).map(&File.method(:expand_path)).join("\n"))
   end
 
   def set_content_editable(value) # rubocop:disable Naming/AccessorMethodName

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

@@ -34,6 +34,8 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
 
   def click(*)
     super
+  rescue ::Selenium::WebDriver::Error::ElementClickInterceptedError
+    raise
   rescue ::Selenium::WebDriver::Error::WebDriverError => e
     # chromedriver 74 (at least on mac) raises the wrong error for this
     raise ::Selenium::WebDriver::Error::ElementClickInterceptedError, e.message if e.message.match?(/element click intercepted/)

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

@@ -16,7 +16,9 @@ class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
       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'

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

@@ -4,16 +4,43 @@ module Capybara
   module Selenium
     module ChromeLogs
       LOG_MSG = <<~MSG
-        Chromedriver 75+ defaults to W3C mode. The W3C webdriver spec does not define methods for accessing \
-        logs or log types. If you need to access the logs, in the short term, you can configure you driver to not use the W3C mode. \
-        It is unknown how long non-W3C mode will be supported by chromedriver (it won't be supported by selenium-webdriver 4+) \
-        so you may need to consider other solutions in the near future.
+        Chromedriver 75+ defaults to W3C mode. Please upgrade to chromedriver >= \
+        75.0.3770.90 if you need to access logs while in W3C compliant mode.
       MSG
 
-      def method_missing(meth, *) # rubocop:disable Style/MissingRespondToMissing
-        raise NotImplementedError, LOG_MSG if %i[available_log_types log].include? meth
+      COMMANDS = {
+        get_available_log_types: [:get, 'session/:session_id/se/log/types'],
+        get_log: [:post, 'session/:session_id/se/log'],
+        get_log_legacy: [:post, 'session/:session_id/log']
+      }.freeze
 
-        super
+      def commands(command)
+        COMMANDS[command] || super
+      end
+
+      def available_log_types
+        types = execute :get_available_log_types
+        Array(types).map(&:to_sym)
+      rescue ::Selenium::WebDriver::Error::UnknownCommandError
+        raise NotImplementedError, LOG_MSG
+      end
+
+      def log(type)
+        data = begin
+                 execute :get_log, {}, type: type.to_s
+               rescue ::Selenium::WebDriver::Error::UnknownCommandError
+                 execute :get_log_legacy, {}, type: type.to_s
+               end
+
+        Array(data).map do |l|
+          begin
+            ::Selenium::WebDriver::LogEntry.new l.fetch('level', 'UNKNOWN'), l.fetch('timestamp'), l.fetch('message')
+          rescue KeyError
+            next
+          end
+        end
+      rescue ::Selenium::WebDriver::Error::UnknownCommandError
+        raise NotImplementedError, LOG_MSG
       end
     end
   end

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

@@ -13,17 +13,6 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
     FileUtils.rm_rf alternative_path
   end
 
-  around do |example|
-    # Workaround RSpec Issue - https://github.com/rspec/rspec-support/issues/374
-    if respond_to?(:without_partial_double_verification)
-      without_partial_double_verification do
-        example.run
-      end
-    else
-      example.run
-    end
-  end
-
   it 'generates sensible filename' do
     allow(@session.driver).to receive(:save_screenshot)
 

data/lib/capybara/spec/test_app.rb

@@ -212,6 +212,10 @@ class TestApp < Sinatra::Base
     end
   end
 
+  get '/apple-touch-icon-precomposed.png' do
+    halt(404)
+  end
+
   class << self
     attr_accessor :form_post_count
   end

data/lib/capybara/version.rb

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

data/spec/selenium_spec_chrome.rb

@@ -125,16 +125,17 @@ RSpec.describe 'Capybara::Session with chrome' do
   describe 'log access' do
     before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
 
-    it 'errors when getting log types' do
+    it 'does not error getting log types' do
+      skip if Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0]) < Gem::Version.new('75.0.3770.90')
       expect do
         session.driver.browser.manage.logs.available_types
-      end.to raise_error(NotImplementedError, /Chromedriver 75\+ defaults to W3C mode/)
+      end.not_to raise_error
     end
 
-    it 'errors when getting logs' do
+    it 'does not error when getting logs' do
       expect do
         session.driver.browser.manage.logs.get(:browser)
-      end.to raise_error(NotImplementedError, /Chromedriver 75\+ defaults to W3C mode/)
+      end.not_to raise_error
     end
   end
 end

data/spec/selenium_spec_chrome_remote.rb

@@ -80,4 +80,21 @@ RSpec.describe 'Capybara::Session with remote Chrome' do
   it 'is considered to be chrome' do
     expect(session.driver.browser.browser).to eq :chrome
   end
+
+  describe 'log access' do
+    before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
+
+    it 'does not error when getting log types' do
+      skip if Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0]) < Gem::Version.new('75.0.3770.90')
+      expect do
+        session.driver.browser.manage.logs.available_types
+      end.not_to raise_error
+    end
+
+    it 'does not error when getting logs' do
+      expect do
+        session.driver.browser.manage.logs.get(:browser)
+      end.not_to raise_error
+    end
+  end
 end

data/spec/shared_selenium_session.rb

@@ -321,6 +321,13 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         session.click_button('Upload Multiple')
         expect(session.body).to include('5 | ') # number of files
       end
+
+      it 'can attach a relative file' do
+        session.visit('/form')
+        session.attach_file('Single Document', 'spec/fixtures/capybara.csv')
+        session.click_button('Upload Single')
+        expect(session.body).to include('Content-type: text/csv')
+      end
     end
 
     context 'Windows' do

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rspec/expectations'
-require 'webdrivers' if ENV['CI']
+require 'webdrivers' if ENV['CI'] || ENV['WEBDRIVERS']
 require 'selenium_statistics'
 if ENV['TRAVIS']
   require 'coveralls'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.23.0
+  version: 3.24.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable