capybara 3.16.1 → 3.33.0

data/spec/capybara_spec.rb

@@ -4,20 +4,20 @@ require 'spec_helper'
 
 RSpec.describe Capybara do
   describe 'default_max_wait_time' do
-    before { @previous_default_time = Capybara.default_max_wait_time }
+    before { @previous_default_time = described_class.default_max_wait_time }
 
-    after { Capybara.default_max_wait_time = @previous_default_time } # rubocop:disable RSpec/InstanceVariable
+    after { described_class.default_max_wait_time = @previous_default_time } # rubocop:disable RSpec/InstanceVariable
 
     it 'should be changeable' do
-      expect(Capybara.default_max_wait_time).not_to eq(5)
-      Capybara.default_max_wait_time = 5
-      expect(Capybara.default_max_wait_time).to eq(5)
+      expect(described_class.default_max_wait_time).not_to eq(5)
+      described_class.default_max_wait_time = 5
+      expect(described_class.default_max_wait_time).to eq(5)
     end
   end
 
   describe '.register_driver' do
     it 'should add a new driver' do
-      Capybara.register_driver :schmoo do |app|
+      described_class.register_driver :schmoo do |app|
         Capybara::RackTest::Driver.new(app)
       end
       session = Capybara::Session.new(:schmoo, TestApp)
@@ -28,85 +28,85 @@ RSpec.describe Capybara do
 
   describe '.register_server' do
     it 'should add a new server' do
-      Capybara.register_server :blob do |_app, _port, _host|
+      described_class.register_server :blob do |_app, _port, _host|
         # do nothing
       end
 
-      expect(Capybara.servers).to have_key(:blob)
+      expect(described_class.servers[:blob]).to be_truthy
     end
   end
 
   describe '.server' do
     after do
-      Capybara.server = :default
+      described_class.server = :default
     end
 
     it 'should default to a proc that calls run_default_server' do
       mock_app = Object.new
-      allow(Capybara).to receive(:run_default_server).and_return(true)
-      Capybara.server.call(mock_app, 8000)
-      expect(Capybara).to have_received(:run_default_server).with(mock_app, 8000)
+      allow(described_class).to receive(:run_default_server).and_return(true)
+      described_class.server.call(mock_app, 8000)
+      expect(described_class).to have_received(:run_default_server).with(mock_app, 8000)
     end
 
     it 'should return a custom server proc' do
       server = ->(_app, _port) {}
-      Capybara.register_server :custom, &server
-      Capybara.server = :custom
-      expect(Capybara.server).to eq(server)
+      described_class.register_server :custom, &server
+      described_class.server = :custom
+      expect(described_class.server).to eq(server)
     end
 
     it 'should have :webrick registered' do
-      expect(Capybara.servers[:webrick]).not_to be_nil
+      expect(described_class.servers[:webrick]).not_to be_nil
     end
 
     it 'should have :puma registered' do
-      expect(Capybara.servers[:puma]).not_to be_nil
+      expect(described_class.servers[:puma]).not_to be_nil
     end
   end
 
   describe 'server=' do
     after do
-      Capybara.server = :default
+      described_class.server = :default
     end
 
     it 'accepts a proc' do
       server = ->(_app, _port) {}
-      Capybara.server = server
-      expect(Capybara.server).to eq server
+      described_class.server = server
+      expect(described_class.server).to eq server
     end
   end
 
   describe 'app_host' do
     after do
-      Capybara.app_host = nil
+      described_class.app_host = nil
     end
 
     it 'should warn if not a valid URL' do
-      expect { Capybara.app_host = 'www.example.com' }.to raise_error(ArgumentError, /Capybara\.app_host should be set to a url/)
+      expect { described_class.app_host = 'www.example.com' }.to raise_error(ArgumentError, /Capybara\.app_host should be set to a url/)
     end
 
     it 'should not warn if a valid URL' do
-      expect { Capybara.app_host = 'http://www.example.com' }.not_to raise_error
+      expect { described_class.app_host = 'http://www.example.com' }.not_to raise_error
     end
 
     it 'should not warn if nil' do
-      expect { Capybara.app_host = nil }.not_to raise_error
+      expect { described_class.app_host = nil }.not_to raise_error
     end
   end
 
   describe 'default_host' do
     around do |test|
-      old_default = Capybara.default_host
+      old_default = described_class.default_host
       test.run
-      Capybara.default_host = old_default
+      described_class.default_host = old_default
     end
 
     it 'should raise if not a valid URL' do
-      expect { Capybara.default_host = 'www.example.com' }.to raise_error(ArgumentError, /Capybara\.default_host should be set to a url/)
+      expect { described_class.default_host = 'www.example.com' }.to raise_error(ArgumentError, /Capybara\.default_host should be set to a url/)
     end
 
     it 'should not warn if a valid URL' do
-      expect { Capybara.default_host = 'http://www.example.com' }.not_to raise_error
+      expect { described_class.default_host = 'http://www.example.com' }.not_to raise_error
     end
   end
 end

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
 ] 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
@@ -130,6 +130,16 @@ class MinitestTest < Minitest::Test
     visit('/with_html')
     assert_matches_style(find(:css, '#second'), display: 'inline')
   end
+
+  def test_assert_ancestor
+    option = find(:option, 'Finnish')
+    assert_ancestor(option, :css, '#form_locale')
+  end
+
+  def test_assert_sibling
+    option = find(:css, '#form_title').find(:option, 'Mrs')
+    assert_sibling(option, :option, 'Mr')
+  end
 end
 
 RSpec.describe 'capybara/minitest' do
@@ -148,6 +158,6 @@ RSpec.describe 'capybara/minitest' do
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include('20 runs, 50 assertions, 0 failures, 0 errors, 1 skips')
+    expect(output.string).to include('22 runs, 52 assertions, 0 failures, 0 errors, 1 skips')
   end
 end

data/spec/minitest_spec_spec.rb

@@ -17,114 +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_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')
+  end
+
+  it 'supports sibling expectations' do
+    option = find(:css, '#form_title').find(:option, 'Mrs')
+    _(option).must_have_sibling(:option, 'Mr')
   end
 end
 
@@ -144,8 +155,8 @@ RSpec.describe 'capybara/minitest/spec' do
     reporter.start
     MinitestSpecTest.run reporter, {}
     reporter.report
-    expect(output.string).to include('20 runs, 42 assertions, 1 failures, 0 errors, 1 skips')
+    expect(output.string).to include('22 runs, 44 assertions, 1 failures, 0 errors, 1 skips')
     # Make sure error messages are displayed
-    expect(output.string).to include('expected to find select box "non_existing_form_title" but there were no matches')
+    expect(output.string).to match(/expected to find select box "non_existing_form_title" .*but there were no matches/)
   end
 end