capybara 3.13.2 → 3.40.0

data/spec/counter_spec.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Capybara::Server::Middleware::Counter do
+  let(:counter) { described_class.new }
+  let(:uri) { '/example' }
+
+  describe '#increment' do
+    it 'successfully' do
+      counter.increment(uri)
+      expect(counter).to be_positive
+    end
+  end
+
+  describe '#decrement' do
+    before do
+      counter.increment(uri)
+    end
+
+    context 'successfully' do
+      it 'with same uri' do
+        expect(counter).to be_positive
+        counter.decrement(uri)
+        expect(counter).not_to be_positive
+      end
+
+      it 'with changed uri' do
+        expect(counter).to be_positive
+        counter.decrement('/')
+        expect(counter).not_to be_positive
+      end
+    end
+  end
+end

data/spec/css_builder_spec.rb

@@ -2,9 +2,10 @@
 
 require 'spec_helper'
 
+# rubocop:disable RSpec/InstanceVariable
 RSpec.describe Capybara::Selector::CSSBuilder do
   let :builder do
-    ::Capybara::Selector::CSSBuilder.new(@css)
+    described_class.new(@css)
   end
 
   context 'add_attribute_conditions' do
@@ -97,3 +98,4 @@ RSpec.describe Capybara::Selector::CSSBuilder do
     end
   end
 end
+# rubocop:enable RSpec/InstanceVariable

data/spec/css_splitter_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe Capybara::Selector::CSS::Splitter do
   let :splitter do
-    ::Capybara::Selector::CSS::Splitter.new
+    described_class.new
   end
 
   context 'split not needed' do

data/spec/dsl_spec.rb

@@ -8,17 +8,23 @@ 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 active_element
 ] do |example|
   case example.metadata[:full_description]
   when /has_css\? should support case insensitive :class and :id options/
     pending "Nokogiri doesn't support case insensitive CSS attribute matchers"
   when /#click_button should follow permanent redirects that maintain method/
     pending "Rack < 2 doesn't support 308" if Gem.loaded_specs['rack'].version < Gem::Version.new('2.0.0')
+  when /#attach_file with multipart form should send prior hidden field if no file submitted/
+    skip 'Rack-test < 2 needs an empty file to detect multipart form' if Gem.loaded_specs['rack-test'].version < Gem::Version.new('2.0.0')
   end
 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 +98,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
@@ -111,18 +117,15 @@ RSpec.describe Capybara::DSL do
     it 'should yield the passed block' do
       called = false
       Capybara.using_driver(:selenium) { called = true }
-      expect(called).to eq(true)
+      expect(called).to be(true)
     end
   end
 
+  # rubocop:disable RSpec/InstanceVariable
   describe '#using_wait_time' do
-    before do
-      @previous_wait_time = Capybara.default_max_wait_time
-    end
+    before { @previous_wait_time = Capybara.default_max_wait_time }
 
-    after do
-      Capybara.default_max_wait_time = @previous_wait_time
-    end
+    after { Capybara.default_max_wait_time = @previous_wait_time }
 
     it 'should switch the wait time and switch it back' do
       in_block = nil
@@ -142,6 +145,7 @@ RSpec.describe Capybara::DSL do
       expect(Capybara.default_max_wait_time).to eq(@previous_wait_time)
     end
   end
+  # rubocop:enable RSpec/InstanceVariable
 
   describe '#app' do
     it 'should be changeable' do
@@ -210,7 +214,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
@@ -218,7 +222,7 @@ RSpec.describe Capybara::DSL do
     it 'should yield the passed block' do
       called = false
       Capybara.using_session(:administrator) { called = true }
-      expect(called).to eq(true)
+      expect(called).to be(true)
     end
 
     it 'should be nestable' do
@@ -240,6 +244,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
@@ -249,31 +262,29 @@ RSpec.describe Capybara::DSL do
   end
 
   describe 'the DSL' do
-    before do
-      @session = Class.new { include Capybara::DSL }.new
-    end
+    let(:session) { Class.new { include Capybara::DSL }.new }
 
     it 'should be possible to include it in another class' do
-      @session.visit('/with_html')
-      @session.click_link('ullamco')
-      expect(@session.body).to include('Another World')
+      session.visit('/with_html')
+      session.click_link('ullamco')
+      expect(session.body).to include('Another World')
     end
 
     it "should provide a 'page' shortcut for more expressive tests" do
-      @session.page.visit('/with_html')
-      @session.page.click_link('ullamco')
-      expect(@session.page.body).to include('Another World')
+      session.page.visit('/with_html')
+      session.page.click_link('ullamco')
+      expect(session.page.body).to include('Another World')
     end
 
     it "should provide an 'using_session' shortcut" do
       allow(Capybara).to receive(:using_session)
-      @session.using_session(:name)
+      session.using_session(:name)
       expect(Capybara).to have_received(:using_session).with(:name)
     end
 
     it "should provide a 'using_wait_time' shortcut" do
       allow(Capybara).to receive(:using_wait_time)
-      @session.using_wait_time(6)
+      session.using_wait_time(6)
       expect(Capybara).to have_received(:using_wait_time).with(6)
     end
   end

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

@@ -5,9 +5,9 @@ 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
+    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

@@ -5,9 +5,9 @@ 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
+    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,6 +34,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
@@ -55,6 +60,13 @@ class MinitestTest < Minitest::Test
     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')
@@ -130,6 +142,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 +170,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('23 runs, 56 assertions, 0 failures, 0 errors, 1 skips')
   end
 end

data/spec/minitest_spec_spec.rb

@@ -16,115 +16,130 @@ class MinitestSpecTest < Minitest::Spec
     Capybara.reset_sessions!
   end
 
+  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')
+    _(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 +159,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

data/spec/per_session_config_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Capybara::SessionConfig do
          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