capybara 3.23.0 → 3.35.3

data/spec/dsl_spec.rb

@@ -8,7 +8,7 @@ class TestClass
 end
 
 Capybara::SpecHelper.run_specs TestClass.new, 'DSL', capybara_skip: %i[
-  js modals screenshot frames windows send_keys server hover about_scheme psc download css driver scroll
+  js modals screenshot frames windows send_keys server hover about_scheme psc download css driver scroll spatial html_validation shadow_dom
 ] do |example|
   case example.metadata[:full_description]
   when /has_css\? should support case insensitive :class and :id options/
@@ -19,6 +19,10 @@ Capybara::SpecHelper.run_specs TestClass.new, 'DSL', capybara_skip: %i[
 end
 
 RSpec.describe Capybara::DSL do
+  before do
+    Capybara.use_default_driver
+  end
+
   after do
     Capybara.session_name = nil
     Capybara.default_driver = nil
@@ -92,7 +96,7 @@ RSpec.describe Capybara::DSL do
       driver_before_block = Capybara.current_driver
       begin
         Capybara.using_driver(:selenium) { raise 'ohnoes!' }
-      rescue Exception # rubocop:disable Lint/RescueException,Lint/HandleExceptions
+      rescue Exception # rubocop:disable Lint/RescueException,Lint/SuppressedException
       end
       expect(Capybara.current_driver).to eq(driver_before_block)
     end
@@ -208,7 +212,7 @@ RSpec.describe Capybara::DSL do
         Capybara.using_session(:raise) do
           raise
         end
-      rescue Exception # rubocop:disable Lint/RescueException,Lint/HandleExceptions
+      rescue Exception # rubocop:disable Lint/RescueException,Lint/SuppressedException
       end
       expect(Capybara.session_name).to eq(:default)
     end
@@ -238,6 +242,15 @@ RSpec.describe Capybara::DSL do
       end
       expect(Capybara.current_session).to eq(original_session)
     end
+
+    it 'should pass the new session if block accepts' do
+      original_session = Capybara.current_session
+      Capybara.using_session(:administrator) do |admin_session, prev_session|
+        expect(admin_session).to be(Capybara.current_session)
+        expect(prev_session).to be(original_session)
+        expect(prev_session).not_to be(admin_session)
+      end
+    end
   end
 
   describe '#session_name' do

data/spec/filter_set_spec.rb

@@ -4,11 +4,11 @@ require 'spec_helper'
 
 RSpec.describe Capybara::Selector::FilterSet do
   after do
-    Capybara::Selector::FilterSet.remove(:test)
+    described_class.remove(:test)
   end
 
   it 'allows node filters' do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+    fs = described_class.add(:test) do
       node_filter(:node_test, :boolean) { |_node, _value| true }
       expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
@@ -18,7 +18,7 @@ RSpec.describe Capybara::Selector::FilterSet do
   end
 
   it 'allows expression filters' do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+    fs = described_class.add(:test) do
       node_filter(:node_test, :boolean) { |_node, _value| true }
       expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
@@ -28,7 +28,7 @@ RSpec.describe Capybara::Selector::FilterSet do
   end
 
   it 'allows node filter and expression filter with the same name' do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+    fs = described_class.add(:test) do
       node_filter(:test, :boolean) { |_node, _value| true }
       expression_filter(:test, :boolean) { |_expr, _value| true }
     end
@@ -37,7 +37,7 @@ RSpec.describe Capybara::Selector::FilterSet do
   end
 
   it 'allows `filter` as an alias of `node_filter`' do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+    fs = described_class.add(:test) do
       filter(:node_test, :boolean) { |_node, _value| true }
     end
 

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -6,7 +6,7 @@ require 'selenium-webdriver'
 RSpec.describe Capybara::Selenium::Driver do
   it 'should exit with a non-zero exit status' do
     options = { browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym }
-    browser = Capybara::Selenium::Driver.new(TestApp, options).browser
+    browser = described_class.new(TestApp, options).browser
     expect(browser).to be_truthy
     expect(true).to eq(false) # rubocop:disable RSpec/ExpectActual
   end

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -6,7 +6,7 @@ require 'selenium-webdriver'
 RSpec.describe Capybara::Selenium::Driver do
   it 'should exit with a zero exit status' do
     options = { browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym }
-    browser = Capybara::Selenium::Driver.new(TestApp, options).browser
+    browser = described_class.new(TestApp, **options).browser
     expect(browser).to be_truthy
     expect(true).to eq(true) # rubocop:disable RSpec/ExpectActual
   end

data/spec/minitest_spec.rb

@@ -16,7 +16,7 @@ class MinitestTest < Minitest::Test
   end
 
   def test_assert_text
-    assert_text('Form')
+    assert_text('Form', normalize_ws: false)
     assert_no_text('Not on the page')
     refute_text('Also Not on the page')
   end
@@ -30,6 +30,7 @@ class MinitestTest < Minitest::Test
 
   def test_assert_current_path
     assert_current_path('/form')
+    assert_current_path('/form') { |url| url.query.nil? }
     assert_no_current_path('/not_form')
     refute_current_path('/not_form')
   end
@@ -158,6 +159,6 @@ RSpec.describe 'capybara/minitest' do
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include('22 runs, 52 assertions, 0 failures, 0 errors, 1 skips')
+    expect(output.string).to include('22 runs, 53 assertions, 0 failures, 0 errors, 1 skips')
   end
 end

data/spec/minitest_spec_spec.rb

@@ -17,125 +17,125 @@ class MinitestSpecTest < Minitest::Spec
   end
 
   it 'supports text expectations' do
-    page.must_have_text('Form', minimum: 1)
-    page.wont_have_text('Not a form')
+    _(page).must_have_text('Form', minimum: 1)
+    _(page).wont_have_text('Not a form')
     form = find(:css, 'form', text: 'Title')
-    form.must_have_text('Customer Email')
-    form.wont_have_text('Some other email')
+    _(form).must_have_text('Customer Email')
+    _(form).wont_have_text('Some other email')
   end
 
   it 'supports current_path expectations' do
-    page.must_have_current_path('/form')
-    page.wont_have_current_path('/form2')
+    _(page).must_have_current_path('/form')
+    _(page).wont_have_current_path('/form2')
   end
 
   it 'supports title expectations' do
     visit('/with_title')
-    page.must_have_title('Test Title')
-    page.wont_have_title('Not the title')
+    _(page).must_have_title('Test Title')
+    _(page).wont_have_title('Not the title')
   end
 
   it 'supports xpath expectations' do
-    page.must_have_xpath('.//input[@id="customer_email"]')
-    page.wont_have_xpath('.//select[@id="not_form_title"]')
-    page.wont_have_xpath('.//input[@id="customer_email"]') { |el| el[:id] == 'not_customer_email' }
+    _(page).must_have_xpath('.//input[@id="customer_email"]')
+    _(page).wont_have_xpath('.//select[@id="not_form_title"]')
+    _(page).wont_have_xpath('.//input[@id="customer_email"]') { |el| el[:id] == 'not_customer_email' }
     select = find(:select, 'form_title')
-    select.must_have_xpath('.//option[@class="title"]')
-    select.must_have_xpath('.//option', count: 1) { |option| option[:class] != 'title' && !option.disabled? }
-    select.wont_have_xpath('.//input[@id="customer_email"]')
+    _(select).must_have_xpath('.//option[@class="title"]')
+    _(select).must_have_xpath('.//option', count: 1) { |option| option[:class] != 'title' && !option.disabled? }
+    _(select).wont_have_xpath('.//input[@id="customer_email"]')
   end
 
   it 'support css expectations' do
-    page.must_have_css('input#customer_email')
-    page.wont_have_css('select#not_form_title')
+    _(page).must_have_css('input#customer_email')
+    _(page).wont_have_css('select#not_form_title')
     el = find(:select, 'form_title')
-    el.must_have_css('option.title')
-    el.wont_have_css('input#customer_email')
+    _(el).must_have_css('option.title')
+    _(el).wont_have_css('input#customer_email')
   end
 
   it 'supports link expectations' do
     visit('/with_html')
-    page.must_have_link('A link')
-    page.wont_have_link('Not on page')
+    _(page).must_have_link('A link')
+    _(page).wont_have_link('Not on page')
   end
 
   it 'supports button expectations' do
-    page.must_have_button('fresh_btn')
-    page.wont_have_button('not_btn')
+    _(page).must_have_button('fresh_btn')
+    _(page).wont_have_button('not_btn')
   end
 
   it 'supports field expectations' do
-    page.must_have_field('customer_email')
-    page.wont_have_field('not_on_the_form')
+    _(page).must_have_field('customer_email')
+    _(page).wont_have_field('not_on_the_form')
   end
 
   it 'supports select expectations' do
-    page.must_have_select('form_title')
-    page.wont_have_select('not_form_title')
+    _(page).must_have_select('form_title')
+    _(page).wont_have_select('not_form_title')
   end
 
   it 'supports checked_field expectations' do
-    page.must_have_checked_field('form_pets_dog')
-    page.wont_have_checked_field('form_pets_cat')
+    _(page).must_have_checked_field('form_pets_dog')
+    _(page).wont_have_checked_field('form_pets_cat')
   end
 
   it 'supports unchecked_field expectations' do
-    page.must_have_unchecked_field('form_pets_cat')
-    page.wont_have_unchecked_field('form_pets_dog')
+    _(page).must_have_unchecked_field('form_pets_cat')
+    _(page).wont_have_unchecked_field('form_pets_dog')
   end
 
   it 'supports table expectations' do
     visit('/tables')
-    page.must_have_table('agent_table')
-    page.wont_have_table('not_on_form')
+    _(page).must_have_table('agent_table')
+    _(page).wont_have_table('not_on_form')
   end
 
   it 'supports all_of_selectors expectations' do
-    page.must_have_all_of_selectors(:css, 'select#form_other_title', 'input#form_last_name')
+    _(page).must_have_all_of_selectors(:css, 'select#form_other_title', 'input#form_last_name')
   end
 
   it 'supports none_of_selectors expectations' do
-    page.must_have_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
+    _(page).must_have_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
   end
 
   it 'supports any_of_selectors expectations' do
-    page.must_have_any_of_selectors(:css, 'select#form_other_title', 'input#not_on_page')
+    _(page).must_have_any_of_selectors(:css, 'select#form_other_title', 'input#not_on_page')
   end
 
   it 'supports match_selector expectations' do
-    find(:field, 'customer_email').must_match_selector(:field, 'customer_email')
-    find(:select, 'form_title').wont_match_selector(:field, 'customer_email')
+    _(find(:field, 'customer_email')).must_match_selector(:field, 'customer_email')
+    _(find(:select, 'form_title')).wont_match_selector(:field, 'customer_email')
   end
 
   it 'supports match_css expectations' do
-    find(:select, 'form_title').must_match_css('select#form_title')
-    find(:select, 'form_title').wont_match_css('select#form_other_title')
+    _(find(:select, 'form_title')).must_match_css('select#form_title')
+    _(find(:select, 'form_title')).wont_match_css('select#form_other_title')
   end
 
   it 'supports match_xpath expectations' do
-    find(:select, 'form_title').must_match_xpath('.//select[@id="form_title"]')
-    find(:select, 'form_title').wont_match_xpath('.//select[@id="not_on_page"]')
+    _(find(:select, 'form_title')).must_match_xpath('.//select[@id="form_title"]')
+    _(find(:select, 'form_title')).wont_match_xpath('.//select[@id="not_on_page"]')
   end
 
   it 'handles failures' do
-    page.must_have_select('non_existing_form_title')
+    _(page).must_have_select('non_existing_form_title')
   end
 
   it 'supports style expectations' do
     skip "Rack test doesn't support style" if Capybara.current_driver == :rack_test
     visit('/with_html')
-    find(:css, '#second').must_have_style('display' => 'inline') # deprecated
-    find(:css, '#second').must_match_style('display' => 'inline')
+    _(find(:css, '#second')).must_have_style('display' => 'inline') # deprecated
+    _(find(:css, '#second')).must_match_style('display' => 'inline')
   end
 
   it 'supports ancestor expectations' do
     option = find(:option, 'Finnish')
-    option.must_have_ancestor(:css, '#form_locale')
+    _(option).must_have_ancestor(:css, '#form_locale')
   end
 
   it 'supports sibling expectations' do
     option = find(:css, '#form_title').find(:option, 'Mrs')
-    option.must_have_sibling(:option, 'Mr')
+    _(option).must_have_sibling(:option, 'Mr')
   end
 end
 

data/spec/rack_test_spec.rb

@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 nokogumbo_required = begin
-                       require 'nokogumbo'
-                       true
-                     rescue LoadError
-                       false
-                     end
+  require 'nokogumbo'
+  true
+rescue LoadError
+  false
+end
 
 module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
@@ -25,6 +25,9 @@ skipped_tests = %i[
   download
   css
   scroll
+  spatial
+  html_validation
+  shadow_dom
 ]
 Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
@@ -36,6 +39,7 @@ Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip
 end
 
 RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
+  include Capybara::RSpecMatchers
   context 'with rack test driver' do
     let(:session) { TestSessions::RackTest }
 
@@ -81,7 +85,6 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
     describe '#fill_in' do
       it 'should warn that :fill_options are not supported' do
         session.visit '/with_html'
-
         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')
@@ -127,6 +130,26 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
           session.find(:label, 'Female').click
           expect(session).to have_unchecked_field('gender_male')
         end
+
+        it 'should rewrite the forms action query for get submission' do
+          session.visit('/form')
+          session.click_button('mediocre')
+          expect(session).not_to have_current_path(/foo|bar/)
+        end
+
+        it 'should rewrite the submit buttons formaction query for get submission' do
+          session.visit('/form')
+          session.click_button('mediocre2')
+          expect(session).not_to have_current_path(/foo|bar/)
+        end
+      end
+    end
+
+    describe '#send_keys' do
+      it 'raises an UnsupportedMethodError' do
+        session.visit('/form')
+
+        expect { session.send_keys(:tab) }.to raise_error(Capybara::NotSupportedByDriverError)
       end
     end
 
@@ -155,27 +178,27 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':headers option' do
     it 'should always set headers' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/get_header')
       expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on link clicks' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/header_links')
       driver.find_xpath('.//a').first.click
       expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on form submit' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/header_links')
       driver.find_xpath('.//input').first.click
       expect(driver.html).to include('foobar')
     end
 
     it 'should keep headers on redirects' do
-      driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
+      driver = described_class.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       driver.visit('/get_header_via_redirect')
       expect(driver.html).to include('foobar')
     end
@@ -183,7 +206,7 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':follow_redirects option' do
     it 'defaults to following redirects' do
-      driver = Capybara::RackTest::Driver.new(TestApp)
+      driver = described_class.new(TestApp)
 
       driver.visit('/redirect')
       expect(driver.response.header['Location']).to be_nil
@@ -191,7 +214,7 @@ RSpec.describe Capybara::RackTest::Driver do
     end
 
     it 'is possible to not follow redirects' do
-      driver = Capybara::RackTest::Driver.new(TestApp, follow_redirects: false)
+      driver = described_class.new(TestApp, follow_redirects: false)
 
       driver.visit('/redirect')
       expect(driver.response.header['Location']).to match %r{/redirect_again$}
@@ -201,7 +224,7 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':redirect_limit option' do
     context 'with default redirect limit' do
-      let(:driver) { Capybara::RackTest::Driver.new(TestApp) }
+      let(:driver) { described_class.new(TestApp) }
 
       it 'should follow 5 redirects' do
         driver.visit('/redirect/5/times')
@@ -216,7 +239,7 @@ RSpec.describe Capybara::RackTest::Driver do
     end
 
     context 'with 21 redirect limit' do
-      let(:driver) { Capybara::RackTest::Driver.new(TestApp, redirect_limit: 21) }
+      let(:driver) { described_class.new(TestApp, redirect_limit: 21) }
 
       it 'should follow 21 redirects' do
         driver.visit('/redirect/21/times')
@@ -251,6 +274,6 @@ RSpec.describe Capybara::RackTest::CSSHandlers do
   include CSSHandlerIncludeTester
 
   it 'should not be extended by global includes' do
-    expect(Capybara::RackTest::CSSHandlers.new).not_to respond_to(:dont_extend_css_handler)
+    expect(described_class.new).not_to respond_to(:dont_extend_css_handler)
   end
 end