capybara 3.17.0 → 3.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e077e28912ed7973882a0394db7eb44c493b0546175f81ef6f15c8ad1ee564c1
-  data.tar.gz: 6efae1078877ffe1578dc28d83f6d8df338dc01a162214c5b3aa3bd625c6a426
+  metadata.gz: 3cb32760328428839877de78f879a68af52098b0d1540c1d0de102acce58bc4b
+  data.tar.gz: b2c40ed521b21b43b4a44e1fe91f38b704e6c85e04829673fcc4493ff8fd217a
 SHA512:
-  metadata.gz: 48d7420e5621c0dafbff830bfa56aba6ccf1d171d9efd0081f30f95f0cc538fa655d6fd5bef5525d13da573f51993f443f89b20af9b2241e4b9194b6ca3d2ae1
-  data.tar.gz: e7470806d56a47cbb6a2b12690816cc0cb569d26032ccae32ad2d832f356d59235f156651a8422ba70259021f9e47a81ad43f4d3e97612891e7e98c6eb1c857e
+  metadata.gz: 69163470d9db2ce8831cad207bbc14aa286181357ac650b909f266fde4e50e2400a851f1451fb0091d54f859f8e270cfe267afbfc8d76b74b6e46f4a2cca21b9
+  data.tar.gz: 48b79d23c6c3c87e9bdcbfd2128a15b475b001699b3b15b79f208772d2dfbc8444f442267ece4d331be25b7489f6c39c869c4edcc017f4d03629d79b09dbbe57

data/History.md

@@ -1,3 +1,14 @@
+# Version 3.18.0
+Release date: 2019-04-22
+
+### Added
+
+* XPath Selector query optimized to make use of Regexp :text option in initial element find
+
+### Fixed
+
+* Workaround issue where Chrome/chromedriver 74 can return the wrong error type when a click is intercepted
+
 # Version 3.17.0
 Release date: 2019-04-18
 

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.17.x version of Capybara.
+**Note** You are viewing the README for the 3.18.x version of Capybara.
 
 
 Capybara helps you test web applications by simulating how a real user would

data/lib/capybara/queries/current_path_query.rb

@@ -22,7 +22,7 @@ module Capybara
         @actual_path = options[:url] ? uri&.to_s : uri&.request_uri
 
         if @expected_path.is_a? Regexp
-          @actual_path.to_s.match(@expected_path)
+          @actual_path.to_s.match?(@expected_path)
         else
           ::Addressable::URI.parse(@expected_path) == ::Addressable::URI.parse(@actual_path)
         end

data/lib/capybara/queries/selector_query.rb

@@ -148,12 +148,22 @@ module Capybara
       end
 
       def xpath_text_conditions
-        (options[:text] || options[:exact_text]).split.map { |txt| XPath.contains(txt) }.reduce(&:&)
+        text = (options[:text] || options[:exact_text])
+        case text
+        when String
+          text.split.map { |txt| XPath.contains(txt) }.reduce(&:&)
+        when Regexp
+          condition = XPath.current
+          condition = condition.uppercase if text.casefold?
+          Selector::RegexpDisassembler.new(text).alternated_substrings.map do |strs|
+            strs.flat_map(&:split).map { |str| condition.contains(str) }.reduce(:&)
+          end.reduce(:|)
+        end
       end
 
       def try_text_match_in_expression?
         first_try? &&
-          (options[:text] || options[:exact_text]).is_a?(String) &&
+          (options[:text] || options[:exact_text]) &&
           @resolved_node&.respond_to?(:session) &&
           @resolved_node.session.driver.wait?
       end
@@ -436,7 +446,7 @@ module Capybara
       def matches_text_regexp?(node, regexp)
         text_visible = visible
         text_visible = :all if text_visible == :hidden
-        !!node.text(text_visible, normalize_ws: normalize_ws).match(regexp)
+        node.text(text_visible, normalize_ws: normalize_ws).match?(regexp)
       end
 
       def default_visibility

data/lib/capybara/queries/title_query.rb

@@ -13,7 +13,7 @@ module Capybara
       end
 
       def resolves_for?(node)
-        (@actual_title = node.title).match(@search_regexp)
+        (@actual_title = node.title).match?(@search_regexp)
       end
 
       def failure_message

data/lib/capybara/selector.rb

@@ -120,7 +120,7 @@ Capybara.add_selector(:link, locator_type: [String, Symbol]) do
 
   node_filter(:href) do |node, href|
     # If not a Regexp it's been handled in the main XPath
-    (href.is_a?(Regexp) ? node[:href].match(href) : true).tap do |res|
+    (href.is_a?(Regexp) ? node[:href].match?(href) : true).tap do |res|
       add_error "Expected href to match #{href.inspect} but it was #{node[:href].inspect}" unless res
     end
   end

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

@@ -38,6 +38,13 @@ module Capybara::Selenium::Driver::ChromeDriver
 
 private
 
+  def clear_storage
+    # Chrome errors if attempt to clear storage on about:blank
+    # In W3C mode it crashes chromedriver
+    url = current_url
+    super unless url.nil? || url.start_with?('about:')
+  end
+
   def delete_all_cookies
     execute_cdp('Network.clearBrowserCookies')
   rescue *cdp_unsupported_errors

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

@@ -26,6 +26,15 @@ class Capybara::Selenium::ChromeNode < Capybara::Selenium::Node
     html5_drag_to(element)
   end
 
+  def click(*)
+    super
+  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/)
+
+    raise
+  end
+
 private
 
   def file_errors

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

@@ -40,10 +40,12 @@ class Capybara::Selenium::SafariNode < Capybara::Selenium::Node
   end
 
   def disabled?
-    return true if super || (self[:disabled] == 'true')
+    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?

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

@@ -37,7 +37,9 @@ Capybara::SpecHelper.spec '#assert_current_path' do
   end
 
   it 'should not cause an exception when current_url is nil' do
-    allow_any_instance_of(Capybara::Session).to receive(:current_url).and_return(nil)
+    allow(@session).to receive(:current_url).and_return(nil)
+    allow(@session.page).to receive(:current_url).and_return(nil) if @session.respond_to? :page
+
     expect { @session.assert_current_path(nil) }.not_to raise_error
   end
 end
@@ -65,7 +67,8 @@ Capybara::SpecHelper.spec '#assert_no_current_path?' do
   end
 
   it 'should not cause an exception when current_url is nil' do
-    allow_any_instance_of(Capybara::Session).to receive(:current_url).and_return(nil)
+    allow(@session).to receive(:current_url).and_return(nil)
+    allow(@session.page).to receive(:current_url).and_return(nil) if @session.respond_to? :page
 
     expect { @session.assert_no_current_path('/with_html') }.not_to raise_error
   end

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

@@ -107,8 +107,8 @@ Capybara::SpecHelper.spec '#find' do
     end
 
     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 Exception # The exact error is not yet well defined
+      expect { @session.find(:xpath, 123) }.to raise_error(Exception) # The exact error is not yet well defined
+        .and output(/must respond to to_xpath or be an instance of String/).to_stderr
     end
   end
 
@@ -263,9 +263,8 @@ Capybara::SpecHelper.spec '#find' do
     end
 
     it 'warns when the option has no effect' do
-      expect_any_instance_of(Kernel).to receive(:warn)
-        .with('The :exact option only has an effect on queries using the XPath#is method. Using it with the query "#test_field" has no effect.')
-      @session.find(:css, '#test_field', exact: true)
+      expect { @session.find(:css, '#test_field', exact: true) }.to \
+        output(/^The :exact option only has an effect on queries using the XPath#is method. Using it with the query "#test_field" has no effect/).to_stderr
     end
   end
 

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

@@ -81,7 +81,8 @@ Capybara::SpecHelper.spec '#has_current_path?' do
   end
 
   it 'should not raise an exception if the current_url is nil' do
-    allow_any_instance_of(Capybara::Session).to receive(:current_url).and_return(nil)
+    allow(@session).to receive(:current_url).and_return(nil)
+    allow(@session.page).to receive(:current_url).and_return(nil) if @session.respond_to? :page
 
     # Without ignore_query option
     expect do
@@ -121,7 +122,8 @@ Capybara::SpecHelper.spec '#has_no_current_path?' do
   end
 
   it 'should not raise an exception if the current_url is nil' do
-    allow_any_instance_of(Capybara::Session).to receive(:current_url).and_return(nil)
+    allow(@session).to receive(:current_url).and_return(nil)
+    allow(@session.page).to receive(:current_url).and_return(nil) if @session.respond_to? :page
 
     # Without ignore_query option
     expect do

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

@@ -24,8 +24,8 @@ Capybara::SpecHelper.spec '#matches_style?', requires: [:css] do
   end
 
   it 'deprecated has_style?' do
-    expect_any_instance_of(Kernel).to receive(:warn).once
-    have_style(display: /^bl/)
+    expect { have_style(display: /^bl/) }.to \
+      output(/have_style is deprecated/).to_stderr
 
     el = @session.find(:css, '#first')
     allow(el).to receive(:warn).and_return(nil)

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

@@ -143,8 +143,8 @@ Capybara::SpecHelper.spec '#select' do
     end
 
     it 'should warn' do
-      expect_any_instance_of(Capybara::Node::Element).to receive(:warn).once
-      @session.select('Other', from: 'form_title')
+      expect { @session.select('Other', from: 'form_title') }.to \
+        output(/^Attempt to select disabled option: Other/).to_stderr
     end
   end
 

data/lib/capybara/version.rb

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

data/spec/rack_test_spec.rb

@@ -80,11 +80,11 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
 
     describe '#fill_in' do
       it 'should warn that :fill_options are not supported' do
-        allow_any_instance_of(Capybara::RackTest::Node).to receive(:warn)
         session.visit '/with_html'
-        field = session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true }
+
+        expect { session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true } }.to \
+          output(/^Options passed to Node#set but the RackTest driver doesn't support any - ignoring/).to_stderr
         expect(session).to have_field('test_field', with: 'not_monkey')
-        expect(field.base).to have_received(:warn).with("Options passed to Node#set but the RackTest driver doesn't support any - ignoring")
       end
     end
 

data/spec/result_spec.rb

@@ -85,25 +85,6 @@ RSpec.describe Capybara::Result do
     expect(result.size).to eq 1
   end
 
-  it 'should catch invalid element errors during filtering' do
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:text).and_raise(StandardError)
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(
-      instance_double('Capybara::Session', driver: instance_double('Capybara::Driver::Base', invalid_element_errors: [StandardError], wait?: false))
-    )
-    result = string.all('//li', text: 'Alpha')
-    expect(result.size).to eq 0
-  end
-
-  it 'should return non-invalid element errors during filtering' do
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:text).and_raise(StandardError)
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(
-      instance_double('Capybara::Session', driver: instance_double('Capybara::Driver::Base', invalid_element_errors: [ArgumentError], wait?: false))
-    )
-    expect do
-      string.all('//li', text: 'Alpha').to_a
-    end.to raise_error(StandardError)
-  end
-
   # Not a great test but it indirectly tests what is needed
   it 'should evaluate filters lazily for idx' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?

data/spec/selenium_spec_chrome.rb

@@ -7,6 +7,8 @@ require 'rspec/shared_spec_matchers'
 
 CHROME_DRIVER = :selenium_chrome
 
+Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV['CI'] && ENV['W3C']
+
 browser_options = ::Selenium::WebDriver::Chrome::Options.new
 browser_options.headless! if ENV['HEADLESS']
 browser_options.add_option(:w3c, !!ENV['W3C'])
@@ -31,7 +33,7 @@ end
 
 skipped_tests = %i[response_headers status_code trigger]
 
-$stdout.puts `#{Selenium::WebDriver::Chrome.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Chrome) if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]

data/spec/selenium_spec_edge.rb

@@ -16,7 +16,7 @@ end
 
 skipped_tests = %i[response_headers status_code trigger modals]
 
-$stdout.puts `#{Selenium::WebDriver::Edge.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Edge) if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::SeleniumEdge, 'selenium', capybara_skip: skipped_tests do |example|
   case example.metadata[:description]

data/spec/selenium_spec_firefox.rb

@@ -43,7 +43,7 @@ end
 
 skipped_tests = %i[response_headers status_code trigger]
 
-$stdout.puts `#{Selenium::WebDriver::Firefox.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Firefox) if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]

data/spec/selenium_spec_ie.rb

@@ -5,7 +5,13 @@ require 'selenium-webdriver'
 require 'shared_selenium_session'
 require 'rspec/shared_spec_matchers'
 
-::Selenium::WebDriver::IE.driver_path = 'C:\Tools\WebDriver\IEDriverServer.exe' if ENV['CI']
+if ENV['CI']
+  if ::Selenium::WebDriver::Service.respond_to? :driver_path=
+    ::Selenium::WebDriver::IE::Service
+  else
+    ::Selenium::WebDriver::IE
+  end.driver_path = 'C:\Tools\WebDriver\IEDriverServer.exe'
+end
 
 def selenium_host
   ENV.fetch('SELENIUM_HOST', '192.168.56.102')
@@ -58,7 +64,7 @@ TestSessions::SeleniumIE.current_window.resize_to(800, 500)
 
 skipped_tests = %i[response_headers status_code trigger modals hover form_attribute windows]
 
-$stdout.puts `#{Selenium::WebDriver::IE.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::IE) if ENV['CI']
 
 TestSessions::SeleniumIE.current_window.resize_to(1600, 1200)
 

data/spec/selenium_spec_safari.rb

@@ -7,7 +7,11 @@ require 'rspec/shared_spec_matchers'
 
 SAFARI_DRIVER = :selenium_safari
 
-::Selenium::WebDriver::Safari.driver_path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
+if ::Selenium::WebDriver::Service.respond_to? :driver_path=
+  ::Selenium::WebDriver::Safari::Service
+else
+  ::Selenium::WebDriver::Safari
+end.driver_path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
 
 browser_options = ::Selenium::WebDriver::Safari::Options.new
 # browser_options.headless! if ENV['HEADLESS']
@@ -33,7 +37,7 @@ end
 
 skipped_tests = %i[response_headers status_code trigger windows drag]
 
-$stdout.puts `#{Selenium::WebDriver::Safari.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Safari) if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]

data/spec/spec_helper.rb

@@ -52,11 +52,24 @@ module Capybara
     def remote?(session)
       session.driver.browser.is_a? ::Selenium::WebDriver::Remote::Driver
     end
+
+    def self.log_selenium_driver_version(mod)
+      mod = mod::Service if ::Selenium::WebDriver::Service.respond_to? :driver_path
+      path = mod.driver_path
+      path = path.call if path.respond_to? :call
+      $stdout.puts `#{path} --version`
+    end
   end
 end
 
 RSpec.configure do |config|
   Capybara::SpecHelper.configure(config)
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = :expect
+  end
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
   config.filter_run_including focus_: true unless ENV['CI']
   config.run_all_when_everything_filtered = true
   config.after(:suite) { SeleniumStatistics.print_results }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.18.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -334,6 +334,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement