capybara 3.29.0 → 3.36.0

data/spec/rspec/shared_spec_matchers.rb

@@ -89,29 +89,29 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_css? returns true' do
-          expect(page).to have_css('h1')
+          expect(session).to have_css('h1')
         end
 
         it 'fails if has_css? returns false' do
           expect do
-            expect(page).to have_css('h1#doesnotexist')
+            expect(session).to have_css('h1#doesnotexist')
           end.to raise_error(/expected to find css "h1#doesnotexist" but there were no matches/)
         end
       end
 
       context 'with should_not' do
         it 'passes if has_no_css? returns true' do
-          expect(page).not_to have_css('h1#doesnotexist')
+          expect(session).not_to have_css('h1#doesnotexist')
         end
 
         it 'fails if has_no_css? returns false' do
           expect do
-            expect(page).not_to have_css('h1')
+            expect(session).not_to have_css('h1')
           end.to raise_error(/expected not to find visible css "h1"/)
         end
       end
@@ -158,29 +158,29 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_xpath? returns true' do
-          expect(page).to have_xpath('//h1')
+          expect(session).to have_xpath('//h1')
         end
 
         it 'fails if has_xpath? returns false' do
           expect do
-            expect(page).to have_xpath("//h1[@id='doesnotexist']")
+            expect(session).to have_xpath("//h1[@id='doesnotexist']")
           end.to raise_error(%r{expected to find xpath "//h1\[@id='doesnotexist'\]" but there were no matches})
         end
       end
 
       context 'with should_not' do
         it 'passes if has_no_xpath? returns true' do
-          expect(page).not_to have_xpath('//h1[@id="doesnotexist"]')
+          expect(session).not_to have_xpath('//h1[@id="doesnotexist"]')
         end
 
         it 'fails if has_no_xpath? returns false' do
           expect do
-            expect(page).not_to have_xpath('//h1')
+            expect(session).not_to have_xpath('//h1')
           end.to raise_error(%r{expected not to find visible xpath "//h1"})
         end
       end
@@ -222,35 +222,35 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_selector? returns true' do
-          expect(page).to have_selector('//h1', text: 'test')
+          expect(session).to have_selector('//h1', text: 'test')
         end
 
         it 'fails if has_selector? returns false' do
           expect do
-            expect(page).to have_selector("//h1[@id='doesnotexist']")
+            expect(session).to have_selector("//h1[@id='doesnotexist']")
           end.to raise_error(%r{expected to find xpath "//h1\[@id='doesnotexist'\]" but there were no matches})
         end
 
         it 'includes text in error message' do
           expect do
-            expect(page).to have_selector('//h1', text: 'wrong text')
+            expect(session).to have_selector('//h1', text: 'wrong text')
           end.to raise_error(%r{expected to find visible xpath "//h1" with text "wrong text" but there were no matches})
         end
       end
 
       context 'with should_not' do
         it 'passes if has_no_css? returns true' do
-          expect(page).not_to have_selector(:css, 'h1#doesnotexist')
+          expect(session).not_to have_selector(:css, 'h1#doesnotexist')
         end
 
         it 'fails if has_no_selector? returns false' do
           expect do
-            expect(page).not_to have_selector(:css, 'h1', text: 'test')
+            expect(session).not_to have_selector(:css, 'h1', text: 'test')
           end.to raise_error(/expected not to find visible css "h1" with text "test"/)
         end
       end
@@ -265,7 +265,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
   describe 'have_content matcher' do
     it 'gives proper description' do
-      expect(have_content('Text').description).to eq('text "Text"')
+      expect(have_content('Text').description).to eq('have text "Text"')
     end
 
     context 'on a string' do
@@ -304,21 +304,21 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_content? returns true' do
-          expect(page).to have_content('This is a test')
+          expect(session).to have_content('This is a test')
         end
 
         it 'passes if has_content? returns true using regexp' do
-          expect(page).to have_content(/test/)
+          expect(session).to have_content(/test/)
         end
 
         it 'fails if has_content? returns false' do
           expect do
-            expect(page).to have_content('No such Text')
+            expect(session).to have_content('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
@@ -329,7 +329,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
           it 'fails if has_content? returns false' do
             expect do
-              expect(page).to have_content('No such Text')
+              expect(session).to have_content('No such Text')
             end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
         end
@@ -337,14 +337,26 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
       context 'with should_not' do
         it 'passes if has_no_content? returns true' do
-          expect(page).not_to have_content('No such Text')
+          expect(session).not_to have_content('No such Text')
         end
 
         it 'fails if has_no_content? returns false' do
           expect do
-            expect(page).not_to have_content('This is a test')
+            expect(session).not_to have_content('This is a test')
           end.to raise_error(/expected not to find text "This is a test"/)
         end
+
+        it 'not_to have_content behaves the same as to have_no_content' do
+          Capybara.using_wait_time(5) do
+            expect(session).to have_content('This is a test')
+            start = Time.now
+            expect(session).to have_no_content('No such Text')
+            to_time = Time.now
+            expect(session).not_to have_content('No such Text')
+            not_to_time = Time.now
+            expect(not_to_time - to_time).to be_within(0.5).of(to_time - start)
+          end
+        end
       end
     end
 
@@ -357,7 +369,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
   describe 'have_text matcher' do
     it 'gives proper description' do
-      expect(have_text('Text').description).to eq('text "Text"')
+      expect(have_text('Text').description).to eq('have text "Text"')
     end
 
     context 'on a string' do
@@ -432,30 +444,30 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       before do
-        visit('/with_html')
+        session.visit('/with_html')
       end
 
       context 'with should' do
         it 'passes if has_text? returns true' do
-          expect(page).to have_text('This is a test')
+          expect(session).to have_text('This is a test')
         end
 
         it 'passes if has_text? returns true using regexp' do
-          expect(page).to have_text(/test/)
+          expect(session).to have_text(/test/)
         end
 
         it 'can check for all text' do
-          expect(page).to have_text(:all, 'Some of this text is hidden!')
+          expect(session).to have_text(:all, 'Some of this text is hidden!')
         end
 
         it 'can check for visible text' do
-          expect(page).to have_text(:visible, 'Some of this text is')
-          expect(page).not_to have_text(:visible, 'Some of this text is hidden!')
+          expect(session).to have_text(:visible, 'Some of this text is')
+          expect(session).not_to have_text(:visible, 'Some of this text is hidden!')
         end
 
         it 'fails if has_text? returns false' do
           expect do
-            expect(page).to have_text('No such Text')
+            expect(session).to have_text('No such Text')
           end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
         end
 
@@ -466,7 +478,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
           it 'fails if has_text? returns false' do
             expect do
-              expect(page).to have_text('No such Text')
+              expect(session).to have_text('No such Text')
             end.to raise_error(/expected to find text "No such Text" in "(.*)This is a test(.*)"/)
           end
         end
@@ -474,12 +486,12 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
       context 'with should_not' do
         it 'passes if has_no_text? returns true' do
-          expect(page).not_to have_text('No such Text')
+          expect(session).not_to have_text('No such Text')
         end
 
         it 'fails if has_no_text? returns false' do
           expect do
-            expect(page).not_to have_text('This is a test')
+            expect(session).not_to have_text('This is a test')
           end.to raise_error(/expected not to find text "This is a test"/)
         end
       end
@@ -542,15 +554,15 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       it 'passes if there is such a title' do
-        visit('/with_js')
-        expect(page).to have_title('with_js')
+        session.visit('/with_js')
+        expect(session).to have_title('with_js')
       end
 
       it 'fails if there is no such title' do
-        visit('/with_js')
+        session.visit('/with_js')
         expect do
-          expect(page).to have_title('No such title')
-        end.to raise_error('expected "with_js" to include "No such title"')
+          expect(session).to have_title('No such title')
+        end.to raise_error(/ to include "No such title"/)
       end
 
       context 'with wait' do
@@ -560,14 +572,14 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
         it 'waits if wait time is more than timeout' do
           session.click_link('Change title')
-          using_wait_time 0 do
+          session.using_wait_time 0 do
             expect(session).to have_title('changed title', wait: 2)
           end
         end
 
         it "doesn't wait if wait time is less than timeout" do
           session.click_link('Change title')
-          using_wait_time 3 do
+          session.using_wait_time 3 do
             expect(session).not_to have_title('changed title', wait: 0)
           end
         end
@@ -586,15 +598,15 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
     context 'on a page or node' do
       it 'passes if there is such a current path' do
-        visit('/with_js')
-        expect(page).to have_current_path('/with_js')
+        session.visit('/with_js')
+        expect(session).to have_current_path('/with_js')
       end
 
       it 'fails if there is no such current_path' do
         visit('/with_js')
         expect do
-          expect(page).to have_current_path('/not_with_js')
-        end.to raise_error('expected "/with_js" to equal "/not_with_js"')
+          expect(session).to have_current_path('/not_with_js')
+        end.to raise_error(%r{to equal "/not_with_js"})
       end
 
       context 'with wait' do
@@ -604,14 +616,14 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
 
         it 'waits if wait time is more than timeout' do
           session.click_link('Change page')
-          using_wait_time 0 do
+          session.using_wait_time 0 do
             expect(session).to have_current_path('/with_html', wait: 2)
           end
         end
 
         it "doesn't wait if wait time is less than timeout" do
           session.click_link('Change page')
-          using_wait_time 0 do
+          session.using_wait_time 0 do
             expect(session).not_to have_current_path('/with_html')
           end
         end
@@ -619,8 +631,8 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'supports compounding' do
-      visit('/with_html')
-      expect(page).to have_current_path('/not_with_html').or have_current_path('/with_html')
+      session.visit('/with_html')
+      expect(session).to have_current_path('/not_with_html').or have_current_path('/with_html')
     end
   end
 
@@ -828,10 +840,10 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
     end
 
     it 'gives proper description when :visible option passed' do
-      expect(have_table('Lovely table', visible: true).description).to eq('have visible table "Lovely table"')
+      expect(have_table('Lovely table', visible: true).description).to eq('have visible table "Lovely table"') # rubocop:disable RSpec/Capybara/VisibilityMatcher
       expect(have_table('Lovely table', visible: :hidden).description).to eq('have non-visible table "Lovely table"')
       expect(have_table('Lovely table', visible: :all).description).to eq('have table "Lovely table"')
-      expect(have_table('Lovely table', visible: false).description).to eq('have table "Lovely table"')
+      expect(have_table('Lovely table', visible: false).description).to eq('have table "Lovely table"') # rubocop:disable RSpec/Capybara/VisibilityMatcher
     end
 
     it 'passes if there is such a table' do
@@ -857,9 +869,9 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
       session.visit('/with_js')
     end
 
-    context '#and' do
+    describe '#and' do
       it "should run 'concurrently'" do
-        Capybara.using_wait_time(2) do
+        session.using_wait_time(2) do
           matcher = have_text('this is not there').and have_text('neither is this')
           expect(Benchmark.realtime do
             expect do
@@ -899,14 +911,14 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
       end
     end
 
-    context '#and_then' do
+    describe '#and_then' do
       it 'should run sequentially' do
         session.click_link('reload-link')
         expect(el).to have_text('waiting to be reloaded').and_then have_text('has been reloaded')
       end
     end
 
-    context '#or' do
+    describe '#or' do
       it "should run 'concurrently'" do
         session.using_wait_time(3) do
           expect(Benchmark.realtime do

data/spec/rspec_spec.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable RSpec/MultipleDescribes
+
 require 'spec_helper'
 
 RSpec.describe 'capybara/rspec' do
@@ -43,7 +45,7 @@ RSpec.describe 'capybara/rspec' do
       expect(Capybara.current_driver).to eq(:culerity)
     end
 
-    context '#all' do
+    describe '#all' do
       it 'allows access to the Capybara finder' do
         visit('/with_html')
         found = all(:css, 'h2') { |element| element[:class] == 'head' }
@@ -57,7 +59,7 @@ RSpec.describe 'capybara/rspec' do
       end
     end
 
-    context '#within' do
+    describe '#within' do
       it 'allows access to the Capybara scoper' do
         visit('/with_html')
         expect do
@@ -82,7 +84,7 @@ RSpec.describe 'capybara/rspec' do
         end.new
       end
 
-      context '#all' do
+      describe '#all' do
         it 'allows access to the Capybara finder' do
           test_class_instance.visit('/with_html')
           expect(test_class_instance.all(:css, 'h2.head').size).to eq(5)
@@ -95,7 +97,7 @@ RSpec.describe 'capybara/rspec' do
         end
       end
 
-      context '#within' do
+      describe '#within' do
         it 'allows access to the Capybara scoper' do
           test_class_instance.visit('/with_html')
           expect do
@@ -143,3 +145,5 @@ feature 'Feature DSL' do
     expect(page.body).to include('Another World')
   end
 end
+
+# rubocop:enable RSpec/MultipleDescribes

data/spec/selector_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Capybara do
+  include Capybara::RSpecMatchers
   describe 'Selectors' do
     let :string do
       described_class.string <<-STRING
@@ -326,9 +327,23 @@ RSpec.describe Capybara do
           expect(string.find(:custom_xpath_selector, './/div', class: /dOm WoR/i)[:id]).to eq 'random_words'
         end
 
-        it 'accepts Regexp for CSS base selectors' do
+        it 'accepts Regexp for CSS based selectors' do
           expect(string.find(:custom_css_selector, 'div', class: /random/)[:id]).to eq 'random_words'
         end
+
+        it 'accepts Regexp for individual class names for XPath based selectors' do
+          expect(string.find(:custom_xpath_selector, './/div', class: [/random/, 'some'])[:id]).to eq 'random_words'
+          expect(string.find(:custom_xpath_selector, './/div', class: [/om/, /wor/])[:id]).to eq 'random_words'
+          expect { string.find(:custom_xpath_selector, './/div', class: [/not/, /wor/]) }.to raise_error(Capybara::ElementNotFound)
+          expect { string.find(:custom_xpath_selector, './/div', class: [/dom wor/]) }.to raise_error(Capybara::ElementNotFound)
+        end
+
+        it 'accepts Regexp for individual class names for CSS based selectors' do
+          expect(string.find(:custom_css_selector, 'div', class: [/random/])[:id]).to eq 'random_words'
+          expect(string.find(:custom_css_selector, 'div', class: [/om/, /wor/, 'some'])[:id]).to eq 'random_words'
+          expect { string.find(:custom_css_selector, 'div', class: [/not/, /wor/]) }.to raise_error(Capybara::ElementNotFound)
+          expect { string.find(:custom_css_selector, 'div', class: [/dom wor/]) }.to raise_error(Capybara::ElementNotFound)
+        end
       end
 
       context 'with :style option' do
@@ -476,7 +491,7 @@ RSpec.describe Capybara do
       end
 
       describe ':link_or_button selector' do
-        around(:all) do |example|
+        around do |example|
           described_class.modify_selector(:link_or_button) do
             expression_filter(:random) { |xpath, _| xpath } # do nothing filter
           end

data/spec/selenium_spec_chrome.rb

@@ -12,45 +12,63 @@ Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-beta' if ENV['CI'] &&
 
 browser_options = ::Selenium::WebDriver::Chrome::Options.new
 browser_options.headless! if ENV['HEADLESS']
-browser_options.add_option(:w3c, ENV['W3C'] != 'false')
+
 # Chromedriver 77 requires setting this for headless mode on linux
-# browser_options.add_preference('download.default_directory', Capybara.save_path)
+# Different versions of Chrome/selenium-webdriver require setting differently - jus set them all
+browser_options.add_preference('download.default_directory', Capybara.save_path)
 browser_options.add_preference(:download, default_directory: Capybara.save_path)
 
 Capybara.register_driver :selenium_chrome do |app|
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options, timeout: 30).tap do |driver|
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  driver_options = { browser: :chrome, timeout: 30 }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+
+  Capybara::Selenium::Driver.new(app, **driver_options).tap do |driver|
     # Set download dir for Chrome < 77
     driver.browser.download_path = Capybara.save_path
   end
 end
 
 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: false, clear_session_storage: false))
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  chrome_options = { browser: :chrome, clear_local_storage: false, clear_session_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+
+  Capybara::Selenium::Driver.new(app, **chrome_options)
 end
 
 Capybara.register_driver :selenium_chrome_not_clear_session_storage do |app|
-  chrome_options = {
-    browser: :chrome,
-    options: browser_options
-  }
-  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_session_storage: false))
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  chrome_options = { browser: :chrome, clear_session_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+
+  Capybara::Selenium::Driver.new(app, **chrome_options)
 end
 
 Capybara.register_driver :selenium_chrome_not_clear_local_storage do |app|
-  chrome_options = {
-    browser: :chrome,
-    options: browser_options
-  }
-  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: false))
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
+  chrome_options = { browser: :chrome, clear_local_storage: false }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+  Capybara::Selenium::Driver.new(app, **chrome_options)
 end
 
 Capybara.register_driver :selenium_driver_subclass_with_chrome do |app|
+  version = Capybara::Selenium::Driver.load_selenium
+  options_key = Capybara::Selenium::Driver::CAPS_VERSION.satisfied_by?(version) ? :capabilities : :options
   subclass = Class.new(Capybara::Selenium::Driver)
-  subclass.new(app, browser: :chrome, options: browser_options, timeout: 30)
+  chrome_options = { browser: :chrome, timeout: 30 }.tap do |opts|
+    opts[options_key] = browser_options
+  end
+
+  subclass.new(app, **chrome_options)
 end
 
 module TestSessions
@@ -67,8 +85,6 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybar
     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']
-  when /details non-summary descendants should be non-visible/
-    pending 'Chromedriver built-in is_displayed is currently broken' if ENV['W3C'] == 'false'
   end
 end
 
@@ -165,19 +181,26 @@ RSpec.describe 'Capybara::Session with chrome' do
   end
 
   describe 'log access' do
-    before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
+    let(:logs) do
+      session.driver.browser.then do |chrome_driver|
+        chrome_driver.respond_to?(:logs) ? chrome_driver : chrome_driver.manage
+      end.logs
+    end
 
     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
+        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)
+        logs.get(:browser)
       end.not_to raise_error
     end
   end
+
+  def chromedriver_version
+    Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0])
+  end
 end

data/spec/selenium_spec_chrome_remote.rb

@@ -21,8 +21,8 @@ def ensure_selenium_running!
   rescue StandardError
     if timer.expired?
       raise 'Selenium is not running. ' \
-          "You can run a selenium server easily with: \n" \
-          '  $ docker-compose up -d selenium_chrome'
+            "You can run a selenium server easily with: \n" \
+            '  $ docker-compose up -d selenium_chrome'
     else
       puts 'Waiting for Selenium docker instance...'
       sleep 1
@@ -76,19 +76,26 @@ RSpec.describe 'Capybara::Session with remote Chrome' do
   end
 
   describe 'log access' do
-    before { skip 'Only makes sense in W3C mode' if ENV['W3C'] == 'false' }
+    let(:logs) do
+      session.driver.browser.then do |chrome_driver|
+        chrome_driver.respond_to?(:logs) ? chrome_driver : chrome_driver.manage
+      end.logs
+    end
 
     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
+        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)
+        logs.get(:browser)
       end.not_to raise_error
     end
   end
+
+  def chromedriver_version
+    Gem::Version.new(session.driver.browser.capabilities['chrome']['chromedriverVersion'].split[0])
+  end
 end