capybara 3.3.0 → 3.40.0

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
+  it 'allows node filters' do
+    fs = described_class.add(:test) do
       node_filter(:node_test, :boolean) { |_node, _value| true }
       expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
@@ -17,8 +17,8 @@ RSpec.describe Capybara::Selector::FilterSet do
     expect(fs.node_filters.keys).not_to include(:expression_test)
   end
 
-  it "allows expression filters" do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+  it 'allows expression filters' do
+    fs = described_class.add(:test) do
       node_filter(:node_test, :boolean) { |_node, _value| true }
       expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
@@ -27,8 +27,8 @@ RSpec.describe Capybara::Selector::FilterSet do
     expect(fs.expression_filters.keys).not_to include(:node_test)
   end
 
-  it "allows node filter and expression filter with the same name" do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+  it 'allows node filter and expression filter with the same name' do
+    fs = described_class.add(:test) do
       node_filter(:test, :boolean) { |_node, _value| true }
       expression_filter(:test, :boolean) { |_expr, _value| true }
     end
@@ -36,8 +36,8 @@ RSpec.describe Capybara::Selector::FilterSet do
     expect(fs.expression_filters[:test]).not_to eq fs.node_filters[:test]
   end
 
-  it "allows `filter` as an alias of `node_filter`" do
-    fs = Capybara::Selector::FilterSet.add(:test) do
+  it 'allows `filter` as an alias of `node_filter`' do
+    fs = described_class.add(:test) do
       filter(:node_test, :boolean) { |_node, _value| true }
     end
 

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -4,10 +4,10 @@ require 'spec_helper'
 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
+  it 'should exit with a non-zero exit status' do
+    options = { browser: ENV.fetch('SELENIUM_BROWSER', :firefox).to_sym }
+    browser = described_class.new(TestApp, options).browser
     expect(browser).to be_truthy
-    expect(true).to eq(false) # rubocop:disable RSpec/ExpectActual
+    expect(true).to be(false) # rubocop:disable RSpec/ExpectActual
   end
 end

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -4,10 +4,10 @@ require 'spec_helper'
 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
+  it 'should exit with a zero exit status' do
+    options = { browser: ENV.fetch('SELENIUM_BROWSER', :firefox).to_sym }
+    browser = described_class.new(TestApp, **options).browser
     expect(browser).to be_truthy
-    expect(true).to eq(true) # rubocop:disable RSpec/ExpectActual
+    expect(true).to be(true) # rubocop:disable RSpec/ExpectActual,RSpec/IdenticalEqualityAssertion
   end
 end

data/spec/minitest_spec.rb

@@ -15,8 +15,12 @@ class MinitestTest < Minitest::Test
     Capybara.reset_sessions!
   end
 
+  def self.test_order
+    :sorted
+  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,15 +34,16 @@ 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
 
   def test_assert_xpath
     assert_xpath('.//select[@id="form_title"]')
-    assert_xpath('.//select', count: 1) { |el| el[:id] == "form_title" }
+    assert_xpath('.//select', count: 1) { |el| el[:id] == 'form_title' }
     assert_no_xpath('.//select[@id="not_form_title"]')
-    assert_no_xpath('.//select') { |el| el[:id] == "not_form_title" }
+    assert_no_xpath('.//select') { |el| el[:id] == 'not_form_title' }
     refute_xpath('.//select[@id="not_form_title"]')
   end
 
@@ -47,6 +52,21 @@ class MinitestTest < Minitest::Test
     assert_no_css('select#not_form_title')
   end
 
+  def test_assert_selector
+    assert_selector(:css, 'select#form_title')
+    assert_selector(:xpath, './/select[@id="form_title"]')
+    assert_no_selector(:css, 'select#not_form_title')
+    assert_no_selector(:xpath, './/select[@id="not_form_title"]')
+    refute_selector(:css, 'select#not_form_title')
+  end
+
+  def test_assert_element
+    visit('/with_html')
+    assert_element('a', text: 'A link')
+    assert_element(count: 1) { |el| el.text == 'A link' }
+    assert_no_element(text: 'Not on page')
+  end
+
   def test_assert_link
     visit('/with_html')
     assert_link('A link')
@@ -97,6 +117,10 @@ class MinitestTest < Minitest::Test
     assert_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
   end
 
+  def test_assert_any_of_selectors
+    assert_any_of_selectors(:css, 'input#not_on_page', 'select#form_other_title')
+  end
+
   def test_assert_matches_selector
     assert_matches_selector(find(:field, 'customer_email'), :field, 'customer_email')
     assert_not_matches_selector(find(:select, 'form_title'), :field, 'customer_email')
@@ -113,10 +137,20 @@ class MinitestTest < Minitest::Test
     refute_matches_xpath(find(:select, 'form_title'), './/select[@id="form_other_title"]')
   end
 
-  def test_assert_style
+  def test_assert_matches_style
     skip "Rack test doesn't support style" if Capybara.current_driver == :rack_test
     visit('/with_html')
-    assert_style(find(:css, '#second'), display: 'inline')
+    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
 
@@ -126,12 +160,16 @@ RSpec.describe 'capybara/minitest' do
     Capybara.app = TestApp
   end
 
-  it "should support minitest" do
+  after do
+    Capybara.use_default_driver
+  end
+
+  it 'should support minitest' do
     output = StringIO.new
     reporter = Minitest::SummaryReporter.new(output)
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include("18 runs, 44 assertions, 0 failures, 0 errors, 1 skips")
+    expect(output.string).to include('23 runs, 56 assertions, 0 failures, 0 errors, 1 skips')
   end
 end

data/spec/minitest_spec_spec.rb

@@ -16,111 +16,130 @@ class MinitestSpecTest < Minitest::Spec
     Capybara.reset_sessions!
   end
 
-  it "supports text expectations" do
-    page.must_have_text('Form', minimum: 1)
-    page.wont_have_text('Not a form')
+  def self.test_order
+    :sorted
+  end
+
+  it 'supports text expectations' do
+    _(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')
+  it 'supports current_path expectations' do
+    _(page).must_have_current_path('/form')
+    _(page).wont_have_current_path('/form2')
   end
 
-  it "supports title expectations" do
+  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" }
+  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' }
     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')
+  it 'support css expectations' do
+    _(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
+  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')
+  it 'supports button expectations' do
+    _(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')
+  it 'supports field expectations' do
+    _(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')
+  it 'supports select expectations' do
+    _(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')
+  it 'supports checked_field expectations' do
+    _(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')
+  it 'supports unchecked_field expectations' do
+    _(page).must_have_unchecked_field('form_pets_cat')
+    _(page).wont_have_unchecked_field('form_pets_dog')
   end
 
-  it "supports table expectations" do
+  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')
   end
 
-  it "supports all_of_selectors expectations" do
-    page.must_have_all_of_selectors(:css, 'select#form_other_title', 'input#form_last_name')
+  it 'supports none_of_selectors expectations' do
+    _(page).must_have_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
   end
 
-  it "supports none_of_selectors expectations" do
-    page.must_have_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
+  it 'supports any_of_selectors expectations' do
+    _(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')
+  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')
   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')
+  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')
   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"]')
+  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"]')
   end
 
-  it "handles failures" do
-    page.must_have_select('non_existing_form_title')
+  it 'handles failures' do
+    _(page).must_have_select('non_existing_form_title')
   end
 
-  it "supports style expectations" do
+  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')
+    _(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
 
@@ -130,14 +149,18 @@ RSpec.describe 'capybara/minitest/spec' do
     Capybara.app = TestApp
   end
 
-  it "should support minitest spec" do
+  after do
+    Capybara.use_default_driver
+  end
+
+  it 'should support minitest spec' do
     output = StringIO.new
     reporter = Minitest::SummaryReporter.new(output)
     reporter.start
     MinitestSpecTest.run reporter, {}
     reporter.report
-    expect(output.string).to include("19 runs, 41 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 visible select box "non_existing_form_title" that is not disabled 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

data/spec/per_session_config_spec.rb

@@ -4,22 +4,22 @@ require 'spec_helper'
 require 'capybara/dsl'
 
 RSpec.describe Capybara::SessionConfig do
-  describe "threadsafe" do
-    it "defaults to global session options" do
+  describe 'threadsafe' do
+    it 'defaults to global session options' do
       Capybara.threadsafe = true
       session = Capybara::Session.new(:rack_test, TestApp)
       %i[default_host app_host always_include_port run_server
          default_selector default_max_wait_time ignore_hidden_elements
          automatic_reload match exact raise_server_errors visible_text_only
          automatic_label_click enable_aria_label save_path
-         asset_host].each do |m|
+         asset_host default_retry_interval].each do |m|
            expect(session.config.public_send(m)).to eq Capybara.public_send(m)
          end
     end
 
     it "doesn't change global session when changed" do
       Capybara.threadsafe = true
-      host = "http://my.example.com"
+      host = 'http://my.example.com'
       session = Capybara::Session.new(:rack_test, TestApp) do |config|
         config.default_host = host
         config.automatic_label_click = !config.automatic_label_click
@@ -35,7 +35,7 @@ RSpec.describe Capybara::SessionConfig do
       Capybara.threadsafe = false
       expect do
         Capybara::Session.new(:rack_test, TestApp) { |config| }
-      end.to raise_error "A configuration block is only accepted when Capybara.threadsafe == true"
+      end.to raise_error 'A configuration block is only accepted when Capybara.threadsafe == true'
     end
 
     it "doesn't allow session config when false" do
@@ -49,7 +49,7 @@ RSpec.describe Capybara::SessionConfig do
       end.to raise_error(/Session configuration is only supported when Capybara.threadsafe == true/)
     end
 
-    it "uses the config from the session" do
+    it 'uses the config from the session' do
       Capybara.threadsafe = true
       session = Capybara::Session.new(:rack_test, TestApp) do |config|
         config.default_selector = :link