capybara 3.32.2 → 3.39.2

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 spatial
+  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
@@ -111,7 +117,7 @@ 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
 
@@ -216,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
@@ -238,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

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 }
+    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 = described_class.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
@@ -158,6 +163,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

@@ -16,6 +16,10 @@ 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')

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

data/spec/rack_test_spec.rb

@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-nokogumbo_required = begin
-                       require 'nokogumbo'
-                       true
-                     rescue LoadError
-                       false
-                     end
 
 module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
@@ -26,6 +20,9 @@ skipped_tests = %i[
   css
   scroll
   spatial
+  html_validation
+  shadow_dom
+  active_element
 ]
 Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
@@ -33,10 +30,13 @@ Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip
     skip "Nokogiri doesn't support case insensitive CSS attribute matchers"
   when /#click_button should follow permanent redirects that maintain method/
     skip "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::Session do # rubocop:disable RSpec/MultipleDescribes
+  include Capybara::RSpecMatchers
   context 'with rack test driver' do
     let(:session) { TestSessions::RackTest }
 
@@ -95,6 +95,12 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
           session.click_button('Upload Empty')
           expect(session.html).to include('Successfully ignored empty file field.')
         end
+
+        it 'should submit multipart even if no file is submitted' do
+          session.visit('/form')
+          session.click_button('Upload Empty')
+          expect(session.html).to include('Content type was multipart/form-data;')
+        end
       end
 
       it 'should not submit an obsolete mime type' do
@@ -142,6 +148,22 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
       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
+
+    describe '#active_element' do
+      it 'raises an UnsupportedMethodError' do
+        session.visit('/form')
+
+        expect { session.active_element }.to raise_error(Capybara::NotSupportedByDriverError)
+      end
+    end
+
     describe '#text' do
       it 'should return original text content for textareas' do
         session.visit('/with_html')
@@ -198,15 +220,21 @@ RSpec.describe Capybara::RackTest::Driver do
       driver = described_class.new(TestApp)
 
       driver.visit('/redirect')
-      expect(driver.response.header['Location']).to be_nil
+      expect(driver.response.headers['Location']).to be_nil
       expect(driver.current_url).to match %r{/landed$}
     end
 
+    it 'should not include fragments in the referer header' do
+      driver.visit('/header_links#an-anchor')
+      driver.find_xpath('.//input').first.click
+      expect(driver.request.get_header('HTTP_REFERER')).to eq('http://www.example.com/header_links')
+    end
+
     it 'is possible to not follow redirects' do
       driver = described_class.new(TestApp, follow_redirects: false)
 
       driver.visit('/redirect')
-      expect(driver.response.header['Location']).to match %r{/redirect_again$}
+      expect(driver.response.headers['Location']).to match %r{/redirect_again$}
       expect(driver.current_url).to match %r{/redirect$}
     end
   end
@@ -245,11 +273,12 @@ RSpec.describe Capybara::RackTest::Driver do
 end
 
 RSpec.describe 'Capybara::String' do
-  it 'should use gumbo' do
-    skip 'Only  valid if gumbo is included' unless nokogumbo_required
-    allow(Nokogiri).to receive(:HTML5).and_call_original
+  it 'should use HTML5 parsing' do
+    skip 'Only valid if Nokogiri >= 1.12.0 or gumbo is included' unless defined? Nokogiri::HTML5
+    Capybara.use_html5_parsing = true
+    allow(Nokogiri::HTML5).to receive(:parse).and_call_original
     Capybara.string('<div id=test_div></div>')
-    expect(Nokogiri).to have_received(:HTML5)
+    expect(Nokogiri::HTML5).to have_received(:parse)
   end
 end
 

data/spec/result_spec.rb

@@ -78,34 +78,31 @@ RSpec.describe Capybara::Result do
     expect(recalc_result[1...3].map(&:text)).to eq %w[Beta Gamma]
     expect(recalc_result[1..7].map(&:text)).to eq %w[Beta Gamma Delta]
     expect(recalc_result[2...-1].map(&:text)).to eq %w[Gamma]
-    expect(recalc_result[2..-1].map(&:text)).to eq %w[Gamma Delta]
+    expect(recalc_result[2..-1].map(&:text)).to eq %w[Gamma Delta] # rubocop:disable Style/SlicingWithRange
+    expect(recalc_result[2..].map(&:text)).to eq %w[Gamma Delta]
   end
 
-  eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
-    it 'supports endless ranges' do
-      expect(result[2..].map(&:text)).to eq %w[Gamma Delta]
-    end
-  TEST
+  it 'supports endless ranges' do
+    expect(result[2..].map(&:text)).to eq %w[Gamma Delta]
+  end
 
-  eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
-    it 'supports inclusive positive beginless ranges' do
-      expect(result[..2].map(&:text)).to eq %w[Alpha Beta Gamma]
-    end
+  it 'supports inclusive positive beginless ranges' do
+    expect(result[..2].map(&:text)).to eq %w[Alpha Beta Gamma]
+  end
 
-    it 'supports inclusive negative beginless ranges' do
-      expect(result[..-2].map(&:text)).to eq %w[Alpha Beta Gamma]
-      expect(result[..-1].map(&:text)).to eq %w[Alpha Beta Gamma Delta]
-    end
+  it 'supports inclusive negative beginless ranges' do
+    expect(result[..-2].map(&:text)).to eq %w[Alpha Beta Gamma]
+    expect(result[..-1].map(&:text)).to eq %w[Alpha Beta Gamma Delta]
+  end
 
-    it 'supports exclusive positive beginless ranges' do
-      expect(result[...2].map(&:text)).to eq %w[Alpha Beta]
-    end
+  it 'supports exclusive positive beginless ranges' do
+    expect(result[...2].map(&:text)).to eq %w[Alpha Beta]
+  end
 
-    it 'supports exclusive negative beginless ranges' do
-      expect(result[...-2].map(&:text)).to eq %w[Alpha Beta]
-      expect(result[...-1].map(&:text)).to eq %w[Alpha Beta Gamma]
-    end
-  TEST
+  it 'supports exclusive negative beginless ranges' do
+    expect(result[...-2].map(&:text)).to eq %w[Alpha Beta]
+    expect(result[...-1].map(&:text)).to eq %w[Alpha Beta Gamma]
+  end
 
   it 'works with filter blocks' do
     result = string.all('//li') { |node| node.text == 'Alpha' }
@@ -116,52 +113,52 @@ RSpec.describe Capybara::Result do
   it 'should evaluate filters lazily for idx' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     # Not processed until accessed
-    expect(result.instance_variable_get('@result_cache').size).to be 0
+    expect(result.instance_variable_get(:@result_cache).size).to be 0
 
     # Only one retrieved when needed
     result.first
-    expect(result.instance_variable_get('@result_cache').size).to be 1
+    expect(result.instance_variable_get(:@result_cache).size).to be 1
 
     # works for indexed access
     result[0]
-    expect(result.instance_variable_get('@result_cache').size).to be 1
+    expect(result.instance_variable_get(:@result_cache).size).to be 1
 
     result[2]
-    expect(result.instance_variable_get('@result_cache').size).to be 3
+    expect(result.instance_variable_get(:@result_cache).size).to be 3
 
     # All cached when converted to array
     result.to_a
-    expect(result.instance_variable_get('@result_cache').size).to eq 4
+    expect(result.instance_variable_get(:@result_cache).size).to eq 4
   end
 
   it 'should evaluate filters lazily for range' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result[0..1]
-    expect(result.instance_variable_get('@result_cache').size).to be 2
+    expect(result.instance_variable_get(:@result_cache).size).to be 2
 
     expect(result[0..7].size).to eq 4
-    expect(result.instance_variable_get('@result_cache').size).to be 4
+    expect(result.instance_variable_get(:@result_cache).size).to be 4
   end
 
   it 'should evaluate filters lazily for idx and length' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result[1, 2]
-    expect(result.instance_variable_get('@result_cache').size).to be 3
+    expect(result.instance_variable_get(:@result_cache).size).to be 3
 
     expect(result[2, 5].size).to eq 2
-    expect(result.instance_variable_get('@result_cache').size).to be 4
+    expect(result.instance_variable_get(:@result_cache).size).to be 4
   end
 
   it 'should only need to evaluate one result for any?' do
     skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result.any?
-    expect(result.instance_variable_get('@result_cache').size).to be 1
+    expect(result.instance_variable_get(:@result_cache).size).to be 1
   end
 
   it 'should evaluate all elements when #to_a called' do
     # All cached when converted to array
     result.to_a
-    expect(result.instance_variable_get('@result_cache').size).to eq 4
+    expect(result.instance_variable_get(:@result_cache).size).to eq 4
   end
 
   describe '#each' do
@@ -170,7 +167,7 @@ RSpec.describe Capybara::Result do
       results = []
       result.each do |el|
         results << el
-        expect(result.instance_variable_get('@result_cache').size).to eq results.size
+        expect(result.instance_variable_get(:@result_cache).size).to eq results.size
       end
 
       expect(results.size).to eq 4
@@ -184,7 +181,7 @@ RSpec.describe Capybara::Result do
       it 'lazily evaluates' do
         skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
         result.each.with_index do |_el, idx|
-          expect(result.instance_variable_get('@result_cache').size).to eq(idx + 1) # 0 indexing
+          expect(result.instance_variable_get(:@result_cache).size).to eq(idx + 1) # 0 indexing
         end
       end
     end

data/spec/rspec/features_spec.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable RSpec/MultipleDescribes
+
 require 'spec_helper'
 require 'capybara/rspec'
 
@@ -89,11 +91,11 @@ end
 
 ffeature 'if ffeature aliases focused tag then' do # rubocop:disable RSpec/Focus
   scenario 'scenario inside this feature has metatag focus tag' do |example|
-    expect(example.metadata[:focus]).to eq true
+    expect(example.metadata[:focus]).to be true
   end
 
-  scenario 'other scenarios also has metatag focus tag ' do |example|
-    expect(example.metadata[:focus]).to eq true
+  scenario 'other scenarios also has metatag focus tag' do |example|
+    expect(example.metadata[:focus]).to be true
   end
 end
-# rubocop:enable RSpec/RepeatedExample
+# rubocop:enable RSpec/RepeatedExample, RSpec/MultipleDescribes

data/spec/rspec/scenarios_spec.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable RSpec/MultipleDescribes
+
 require 'spec_helper'
 require 'capybara/rspec'
 
@@ -9,11 +11,13 @@ end
 
 feature 'if fscenario aliases focused tag then' do
   fscenario 'scenario should have focused meta tag' do |example| # rubocop:disable RSpec/Focus
-    expect(example.metadata[:focus]).to eq true
+    expect(example.metadata[:focus]).to be true
   end
 end
 
 feature 'if xscenario aliases to pending then' do
-  xscenario "this test should be 'temporarily disabled with xscenario'" do
+  xscenario "this test should be 'temporarily disabled with xscenario'" do # rubocop:disable RSpec/PendingWithoutReason
   end
 end
+
+# rubocop:enable RSpec/MultipleDescribes