capybara 3.11.1 → 3.12.0

data/spec/result_spec.rb

@@ -72,6 +72,12 @@ RSpec.describe Capybara::Result do
     expect(result[-1].text).to eq 'Delta'
     expect(result[-2, 3].map(&:text)).to eq %w[Gamma Delta]
     expect(result[1..7].map(&:text)).to eq %w[Beta Gamma Delta]
+    expect(result[1...3].map(&:text)).to eq %w[Beta Gamma]
+    expect(result[2..-1].map(&:text)).to eq %w[Gamma Delta]
+    expect(result[2...-1].map(&:text)).to eq %w[Gamma]
+    eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
+      expect(result[2..].map(&:text)).to eq %w[Gamma Delta]
+    TEST
   end
 
   it 'works with filter blocks' do

data/spec/selector_spec.rb

@@ -75,6 +75,7 @@ RSpec.describe Capybara do
 
       Capybara.add_selector :custom_xpath_selector do
         xpath(:valid1, :valid2) { |selector| selector }
+        match { |value| value == 'match_me' }
       end
     end
 
@@ -120,6 +121,26 @@ RSpec.describe Capybara do
       end
     end
 
+    describe '::[]' do
+      it 'can find a selector' do
+        expect(Capybara::Selector[:field]).not_to be_nil
+      end
+
+      it 'raises if no selector found' do
+        expect { Capybara::Selector[:no_exist] }.to raise_error(ArgumentError, /Unknown selector type/)
+      end
+    end
+
+    describe '::for' do
+      it 'finds selector that matches the locator' do
+        expect(Capybara::Selector.for('match_me').name).to eq :custom_xpath_selector
+      end
+
+      it 'returns nil if no match' do
+        expect(Capybara::Selector.for('nothing')).to be nil
+      end
+    end
+
     describe 'xpath' do
       it 'uses filter names passed in' do
         selector = Capybara::Selector.new :test do
@@ -423,12 +444,16 @@ RSpec.describe Capybara do
             expression_filter(:random) { |xpath, _| xpath } # do nothing filter
           end
           example.run
-          Capybara::Selector.all[:link_or_button].expression_filters.delete(:random)
+          Capybara::Selector[:link_or_button].expression_filters.delete(:random)
         end
 
         context 'when modified' do
           it 'should still work' do
+            filter = Capybara::Selector[:link_or_button].expression_filters[:random]
+            allow(filter).to receive(:apply_filter).and_call_original
+
             expect(string.find(:link_or_button, 'click me', random: 'blah').value).to eq 'click me'
+            expect(filter).to have_received(:apply_filter).with(anything, :random, 'blah', anything)
           end
         end
       end

data/spec/selenium_spec_chrome.rb

@@ -12,17 +12,17 @@ browser_options.headless! if ENV['HEADLESS']
 browser_options.add_option(:w3c, !!ENV['W3C'])
 
 Capybara.register_driver :selenium_chrome do |app|
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options).tap do |driver|
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options, timeout: 30).tap do |driver|
     driver.browser.download_path = Capybara.save_path
   end
 end
 
-Capybara.register_driver :selenium_chrome_clear_storage do |app|
+Capybara.register_driver :selenium_chrome_not_clear_storage do |app|
   chrome_options = {
     browser: :chrome,
     options: browser_options
   }
-  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: true, clear_session_storage: true))
+  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: false, clear_session_storage: false))
 end
 
 module TestSessions
@@ -30,8 +30,6 @@ module TestSessions
 end
 
 skipped_tests = %i[response_headers status_code trigger]
-# skip window tests when headless for now - closing a window not supported by chromedriver/chrome
-skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
 
 $stdout.puts `#{Selenium::WebDriver::Chrome.driver_path} --version` if ENV['CI']
 
@@ -39,6 +37,8 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybar
   case example.metadata[:full_description]
   when /#click_link can download a file$/
     skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
+  when /Capybara::Session selenium_chrome Capybara::Window#maximize/
+    pending "Chrome headless doesn't support maximize" if ENV['HEADLESS']
   end
 end
 
@@ -49,32 +49,34 @@ RSpec.describe 'Capybara::Session with chrome' do
 
   context 'storage' do
     describe '#reset!' do
-      it 'does not clear either storage by default' do
+      it 'clears storage by default' do
         @session = TestSessions::Chrome
         @session.visit('/with_js')
         @session.find(:css, '#set-storage').click
         @session.reset!
         @session.visit('/with_js')
-        # expect(@session.driver.browser.local_storage.keys).not_to be_empty
-        # expect(@session.driver.browser.session_storage.keys).not_to be_empty
-        expect(@session.evaluate_script('Object.keys(localStorage)')).not_to be_empty
-        expect(@session.evaluate_script('Object.keys(sessionStorage)')).not_to be_empty
+        expect(@session.evaluate_script('Object.keys(localStorage)')).to be_empty
+        expect(@session.evaluate_script('Object.keys(sessionStorage)')).to be_empty
       end
 
-      it 'clears storage when set' do
-        @session = Capybara::Session.new(:selenium_chrome_clear_storage, TestApp)
+      it 'does not clear storage when false' do
+        @session = Capybara::Session.new(:selenium_chrome_not_clear_storage, TestApp)
         @session.visit('/with_js')
         @session.find(:css, '#set-storage').click
         @session.reset!
         @session.visit('/with_js')
-        # expect(@session.driver.browser.local_storage.keys).to be_empty
-        # expect(@session.driver.browser.session_storage.keys).to be_empty
-        expect(@session.evaluate_script('Object.keys(localStorage)')).to be_empty
-        expect(@session.evaluate_script('Object.keys(sessionStorage)')).to be_empty
+        expect(@session.evaluate_script('Object.keys(localStorage)')).not_to be_empty
+        expect(@session.evaluate_script('Object.keys(sessionStorage)')).not_to be_empty
       end
     end
   end
 
+  context 'timeout' do
+    it 'sets the http client read timeout' do
+      expect(TestSessions::Chrome.driver.browser.send(:bridge).http.read_timeout).to eq 30
+    end
+  end
+
   describe 'filling in Chrome-specific date and time fields with keystrokes' do
     let(:datetime) { Time.new(1983, 6, 19, 6, 30) }
 

data/spec/selenium_spec_chrome_remote.rb

@@ -60,8 +60,6 @@ TestSessions::Chrome.driver.browser.file_detector = lambda do |args|
 end
 
 skipped_tests = %i[response_headers status_code trigger download]
-# skip window tests when headless for now - closing a window not supported by chromedriver/chrome
-skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
 
 Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_REMOTE_DRIVER.to_s, capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]

data/spec/{selenium_spec_marionette.rb → selenium_spec_firefox.rb}

@@ -15,51 +15,51 @@ browser_options.profile = Selenium::WebDriver::Firefox::Profile.new.tap do |prof
   profile['browser.helperApps.neverAsk.saveToDisk'] = 'text/csv'
 end
 
-Capybara.register_driver :selenium_marionette do |app|
+Capybara.register_driver :selenium_firefox do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
     options: browser_options,
+    timeout: 31,
     # Get a trace level log from geckodriver
     # :driver_opts => { args: ['-vv'] }
   )
 end
 
-Capybara.register_driver :selenium_marionette_clear_storage do |app|
+Capybara.register_driver :selenium_firefox_not_clear_storage do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    clear_local_storage: true,
-    clear_session_storage: true,
+    clear_local_storage: false,
+    clear_session_storage: false,
     options: browser_options
   )
 end
 
 module TestSessions
-  SeleniumMarionette = Capybara::Session.new(:selenium_marionette, TestApp)
+  SeleniumFirefox = Capybara::Session.new(:selenium_firefox, TestApp)
 end
 
 skipped_tests = %i[response_headers status_code trigger]
-skipped_tests << :windows if ENV['TRAVIS'] && ENV['SKIP_WINDOW']
 
 $stdout.puts `#{Selenium::WebDriver::Firefox.driver_path} --version` if ENV['CI']
 
-Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, 'selenium', capybara_skip: skipped_tests do |example|
+Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
   when 'Capybara::Session selenium node #click should allow multiple modifiers'
-    pending "Firefox doesn't generate an event for shift+control+click" if marionette_gte?(62, @session) && !Gem.win_platform?
+    pending "Firefox doesn't generate an event for shift+control+click" if firefox_gte?(62, @session) && !Gem.win_platform?
   when /^Capybara::Session selenium node #double_click/
-    pending "selenium-webdriver/geckodriver doesn't generate double click event" if marionette_lt?(59, @session)
+    pending "selenium-webdriver/geckodriver doesn't generate double click event" if firefox_lt?(59, @session)
   when 'Capybara::Session selenium #accept_prompt should accept the prompt with a blank response when there is a default'
-    pending "Geckodriver doesn't set a blank response in FF < 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1486485" if marionette_lt?(63, @session)
+    pending "Geckodriver doesn't set a blank response in FF < 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1486485" if firefox_lt?(63, @session)
   when 'Capybara::Session selenium #attach_file with multipart form should fire change once for each set of files uploaded'
     pending 'Gekcodriver appends files so we have to first call clear for multiple files which creates an extra change ' \
             'if files are already set'
   when 'Capybara::Session selenium #attach_file with multipart form should fire change once when uploading multiple files from empty'
-    pending "FF < 62 doesn't support setting all files at once" if marionette_lt?(62, @session)
+    pending "FF < 62 doesn't support setting all files at once" if firefox_lt?(62, @session)
   when 'Capybara::Session selenium #accept_confirm should work with nested modals'
-    skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if marionette_gte?(63, @session)
+    skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session)
   when 'Capybara::Session selenium #click_link can download a file'
     skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
   when 'Capybara::Session selenium #reset_session! removes ALL cookies'
@@ -69,8 +69,8 @@ end
 
 RSpec.describe 'Capybara::Session with firefox' do # rubocop:disable RSpec/MultipleDescribes
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::SeleniumMarionette, :selenium_marionette
-  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumMarionette, :selenium_marionette
+  include_examples  'Capybara::Session', TestSessions::SeleniumFirefox, :selenium_firefox
+  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumFirefox, :selenium_firefox
 end
 
 RSpec.describe Capybara::Selenium::Driver do
@@ -125,33 +125,39 @@ RSpec.describe Capybara::Selenium::Driver do
 
   context 'storage' do
     describe '#reset!' do
-      it 'does not clear either storage by default' do
-        @session = TestSessions::SeleniumMarionette
+      it 'clears storage by default' do
+        @session = TestSessions::SeleniumFirefox
         @session.visit('/with_js')
         @session.find(:css, '#set-storage').click
         @session.reset!
         @session.visit('/with_js')
-        expect(@session.driver.browser.local_storage.keys).not_to be_empty
-        expect(@session.driver.browser.session_storage.keys).not_to be_empty
+        expect(@session.driver.browser.local_storage.keys).to be_empty
+        expect(@session.driver.browser.session_storage.keys).to be_empty
       end
 
-      it 'clears storage when set' do
-        @session = Capybara::Session.new(:selenium_marionette_clear_storage, TestApp)
+      it 'does not clear storage when false' do
+        @session = Capybara::Session.new(:selenium_firefox_not_clear_storage, TestApp)
         @session.visit('/with_js')
         @session.find(:css, '#set-storage').click
         @session.reset!
         @session.visit('/with_js')
-        expect(@session.driver.browser.local_storage.keys).to be_empty
-        expect(@session.driver.browser.session_storage.keys).to be_empty
+        expect(@session.driver.browser.local_storage.keys).not_to be_empty
+        expect(@session.driver.browser.session_storage.keys).not_to be_empty
       end
     end
   end
+
+  context 'timeout' do
+    it 'sets the http client read timeout' do
+      expect(TestSessions::SeleniumFirefox.driver.browser.send(:bridge).http.read_timeout).to eq 31
+    end
+  end
 end
 
 RSpec.describe Capybara::Selenium::Node do
   context '#click' do
     it 'warns when attempting on a table row' do
-      session = TestSessions::SeleniumMarionette
+      session = TestSessions::SeleniumFirefox
       session.visit('/tables')
       tr = session.find(:css, '#agent_table tr:first-child')
       allow(tr.base).to receive(:warn)
@@ -160,7 +166,7 @@ RSpec.describe Capybara::Selenium::Node do
     end
 
     it 'should allow multiple modifiers', requires: [:js] do
-      session = TestSessions::SeleniumMarionette
+      session = TestSessions::SeleniumFirefox
       session.visit('with_js')
       # Firefox v62+ doesn't generate an event for control+shift+click
       session.find(:css, '#click-test').click(:alt, :ctrl, :meta)
@@ -171,7 +177,7 @@ RSpec.describe Capybara::Selenium::Node do
 
   context '#send_keys' do
     it 'should process space' do
-      session = TestSessions::SeleniumMarionette
+      session = TestSessions::SeleniumFirefox
       session.visit('/form')
       session.find(:css, '#address1_city').send_keys('ocean', [:shift, :space, 'side'])
       expect(session.find(:css, '#address1_city').value).to eq 'ocean SIDE'

data/spec/selenium_spec_firefox_remote.rb

@@ -56,25 +56,23 @@ TestSessions::RemoteFirefox.driver.browser.file_detector = lambda do |args|
 end
 
 skipped_tests = %i[response_headers status_code trigger download]
-# skip window tests when headless for now - closing a window not supported by chromedriver/chrome
-skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
 
 Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVER.to_s, capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
   when 'Capybara::Session selenium_firefox_remote node #click should allow multiple modifiers'
-    skip "Firefox doesn't generate an event for shift+control+click" if marionette_gte?(62, @session)
+    skip "Firefox doesn't generate an event for shift+control+click" if firefox_gte?(62, @session)
   when 'Capybara::Session selenium_firefox_remote #accept_prompt should accept the prompt with a blank response when there is a default'
-    pending "Geckodriver doesn't set a blank response in FF < 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1486485" if marionette_lt?(63, @session)
+    pending "Geckodriver doesn't set a blank response in FF < 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1486485" if firefox_lt?(63, @session)
   when 'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once for each set of files uploaded'
     pending 'Gekcodriver appends files so we have to first call clear for multiple files which creates an extra change ' \
             'if files are already set'
   when 'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once when uploading multiple files from empty'
-    pending "FF < 62 doesn't support setting all files at once" if marionette_lt?(62, @session)
+    pending "FF < 62 doesn't support setting all files at once" if firefox_lt?(62, @session)
   when 'Capybara::Session selenium_firefox_remote #reset_session! removes ALL cookies'
     pending "Geckodriver doesn't provide a way to remove cookies outside the current domain"
   when /#accept_confirm should work with nested modals$/
     # skip because this is timing based and hence flaky when set to pending
-    skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if marionette_gte?(63, @session)
+    skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session)
   end
 end
 

data/spec/shared_selenium_session.rb

@@ -295,7 +295,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
 
     describe 'Element#drag_to' do
       before do
-        skip "Firefox < 62 doesn't support a DataTransfer constuctor" if marionette_lt?(62.0, session)
+        skip "Firefox < 62 doesn't support a DataTransfer constuctor" if firefox_lt?(62.0, session)
         skip "IE doesn't support a DataTransfer constuctor" if ie?(session)
       end
 
@@ -336,7 +336,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
 
     describe 'Capybara#Node#attach_file' do
       it 'can attach a directory' do
-        pending "Geckodriver doesn't support uploading a directory" if marionette?(session)
+        pending "Geckodriver doesn't support uploading a directory" if firefox?(session)
         pending "Selenium remote doesn't support transferring a directory" if remote?(session)
         pending "Headless Chrome doesn't support directory upload - https://bugs.chromium.org/p/chromedriver/issues/detail?id=2521&q=directory%20upload&colspec=ID%20Status%20Pri%20Owner%20Summary" if chrome?(session) && ENV['HEADLESS']
 

data/spec/spec_helper.rb

@@ -6,17 +6,17 @@ require 'webdrivers' if ENV['CI']
 
 module Capybara
   module SpecHelper
-    def marionette?(session)
+    def firefox?(session)
       browser_name(session) == :firefox &&
         session.driver.browser.capabilities.is_a?(::Selenium::WebDriver::Remote::W3C::Capabilities)
     end
 
-    def marionette_lt?(version, session)
-      marionette?(session) && (session.driver.browser.capabilities[:browser_version].to_f < version)
+    def firefox_lt?(version, session)
+      firefox?(session) && (session.driver.browser.capabilities[:browser_version].to_f < version)
     end
 
-    def marionette_gte?(version, session)
-      marionette?(session) && (session.driver.browser.capabilities[:browser_version].to_f >= version)
+    def firefox_gte?(version, session)
+      firefox?(session) && (session.driver.browser.capabilities[:browser_version].to_f >= version)
     end
 
     def chrome?(session)

data/spec/xpath_builder_spec.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Capybara::Selector::XPathBuilder do
+  let :builder do
+    ::Capybara::Selector::XPathBuilder.new(@xpath)
+  end
+
+  context 'add_attribute_conditions' do
+    it 'adds a single string condition to a single selector' do
+      @xpath = './/div'
+      selector = builder.add_attribute_conditions(random: 'abc')
+      expect(selector).to eq %((.//div)[(./@random = 'abc')])
+    end
+
+    it 'adds multiple string conditions to a single selector' do
+      @xpath = './/div'
+      selector = builder.add_attribute_conditions(random: 'abc', other: 'def')
+      expect(selector).to eq %(((.//div)[(./@random = 'abc')])[(./@other = 'def')])
+    end
+
+    it 'adds a single string condition to a multiple selector' do
+      @xpath = XPath.descendant(:div, :ul)
+      selector = builder.add_attribute_conditions(random: 'abc')
+      expect(selector.to_s).to eq @xpath[XPath.attr(:random) == 'abc'].to_s
+    end
+
+    it 'adds multiple string conditions to a multiple selector' do
+      @xpath = XPath.descendant(:div, :ul)
+      selector = builder.add_attribute_conditions(random: 'abc', other: 'def')
+      expect(selector.to_s).to eq %(.//*[self::div | self::ul][(./@random = 'abc')][(./@other = 'def')])
+    end
+
+    it 'adds simple regexp conditions to a single selector' do
+      @xpath = XPath.descendant(:div)
+      selector = builder.add_attribute_conditions(random: /abc/, other: /def/)
+      expect(selector.to_s).to eq %(.//div[./@random[contains(., 'abc')]][./@other[contains(., 'def')]])
+    end
+
+    it 'adds wildcard regexp conditions to a single selector' do
+      @xpath = './/div'
+      selector = builder.add_attribute_conditions(random: /abc.*def/, other: /def.*ghi/)
+      expect(selector).to eq %(((.//div)[./@random[(contains(., 'abc') and contains(., 'def'))]])[./@other[(contains(., 'def') and contains(., 'ghi'))]])
+    end
+
+    it 'adds alternated regexp conditions to a single selector' do
+      @xpath = XPath.descendant(:div)
+      selector = builder.add_attribute_conditions(random: /abc|def/, other: /def|ghi/)
+      expect(selector.to_s).to eq %(.//div[./@random[(contains(., 'abc') or contains(., 'def'))]][./@other[(contains(., 'def') or contains(., 'ghi'))]])
+    end
+
+    it 'adds alternated regexp conditions to a multiple selector' do
+      @xpath = XPath.descendant(:div, :ul)
+      selector = builder.add_attribute_conditions(other: /def.*ghi|jkl/)
+      expect(selector.to_s).to eq %(.//*[self::div | self::ul][./@other[((contains(., 'def') and contains(., 'ghi')) or contains(., 'jkl'))]])
+    end
+
+    it "returns original selector when regexp can't be substringed" do
+      @xpath = './/div'
+      selector = builder.add_attribute_conditions(other: /.+/)
+      expect(selector).to eq '(.//div)[./@other]'
+    end
+
+    context ':class' do
+      it 'handles string' do
+        @xpath = './/a'
+        selector = builder.add_attribute_conditions(class: 'my_class')
+        expect(selector).to eq %((.//a)[contains(concat(' ', normalize-space(./@class), ' '), ' my_class ')])
+      end
+
+      it 'handles negated strings' do
+        @xpath = XPath.descendant(:a)
+        selector = builder.add_attribute_conditions(class: '!my_class')
+        expect(selector.to_s).to eq @xpath[!XPath.attr(:class).contains_word('my_class')].to_s
+      end
+
+      it 'handles array of strings' do
+        @xpath = './/a'
+        selector = builder.add_attribute_conditions(class: %w[my_class my_other_class])
+        expect(selector).to eq %((.//a)[(contains(concat(' ', normalize-space(./@class), ' '), ' my_class ') and contains(concat(' ', normalize-space(./@class), ' '), ' my_other_class '))])
+      end
+
+      it 'handles array of string when negated included' do
+        @xpath = XPath.descendant(:a)
+        selector = builder.add_attribute_conditions(class: %w[my_class !my_other_class])
+        expect(selector.to_s).to eq @xpath[XPath.attr(:class).contains_word('my_class') & !XPath.attr(:class).contains_word('my_other_class')].to_s
+      end
+    end
+  end
+end