capybara 3.29.0 → 3.33.0

data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb

@@ -15,7 +15,7 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
     @session.save_and_open_screenshot
 
     expect(@session.driver).to have_received(:save_screenshot)
-      .with(expected_file_regex, {})
+      .with(expected_file_regex, any_args)
     expect(Launchy).to have_received(:open).with(expected_file_regex)
   end
 
@@ -27,7 +27,7 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
     @session.save_and_open_screenshot(custom_path)
 
     expect(@session.driver).to have_received(:save_screenshot)
-      .with(/#{custom_path}$/, {})
+      .with(/#{custom_path}$/, any_args)
     expect(Launchy).to have_received(:open).with(/#{custom_path}$/)
   end
 

data/lib/capybara/spec/session/save_screenshot_spec.rb

@@ -19,7 +19,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
     @session.save_screenshot
 
     regexp = Regexp.new(File.join(Dir.pwd, 'capybara-\d+\.png'))
-    expect(@session.driver).to have_received(:save_screenshot).with(regexp, {})
+    expect(@session.driver).to have_received(:save_screenshot).with(regexp, any_args)
   end
 
   it 'allows to specify another path' do
@@ -28,7 +28,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
     custom_path = 'screenshots/1.png'
     @session.save_screenshot(custom_path)
 
-    expect(@session.driver).to have_received(:save_screenshot).with(/#{custom_path}$/, {})
+    expect(@session.driver).to have_received(:save_screenshot).with(/#{custom_path}$/, any_args)
   end
 
   context 'with Capybara.save_path' do
@@ -39,7 +39,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
       @session.save_screenshot
 
       regexp = Regexp.new(File.join(alternative_path, 'capybara-\d+\.png'))
-      expect(@session.driver).to have_received(:save_screenshot).with(regexp, {})
+      expect(@session.driver).to have_received(:save_screenshot).with(regexp, any_args)
     end
 
     it 'relative paths are relative to save_path' do
@@ -49,7 +49,7 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
       custom_path = 'screenshots/2.png'
       @session.save_screenshot(custom_path)
 
-      expect(@session.driver).to have_received(:save_screenshot).with(File.expand_path(custom_path, alternative_path), {})
+      expect(@session.driver).to have_received(:save_screenshot).with(File.expand_path(custom_path, alternative_path), any_args)
     end
   end
 end

data/lib/capybara/spec/session/selectors_spec.rb

@@ -31,6 +31,11 @@ Capybara::SpecHelper.spec Capybara::Selector do
       expect(@session.find(:label, for: input).text).to eq 'Nested Label'
     end
 
+    it 'finds a label from nested input using :for filter with element when no id on label' do
+      input = @session.find(:css, '#wrapper_label').find(:css, 'input')
+      expect(@session.find(:label, for: input).text).to eq 'Wrapper Label'
+    end
+
     it 'finds the label for an non-nested element when using :for filter' do
       select = @session.find(:id, 'form_other_title')
       expect(@session.find(:label, for: select)['for']).to eq 'form_other_title'
@@ -62,14 +67,22 @@ Capybara::SpecHelper.spec Capybara::Selector do
       end
     end
 
-    it 'can find specifically by name' do
+    it 'can find specifically by name string' do
       expect(@session.find(:field, name: 'form[other_title]')['id']).to eq 'form_other_title'
     end
 
-    it 'can find specifically by placeholder' do
+    it 'can find specifically by name regex' do
+      expect(@session.find(:field, name: /form\[other_.*\]/)['id']).to eq 'form_other_title'
+    end
+
+    it 'can find specifically by placeholder string' do
       expect(@session.find(:field, placeholder: 'FirstName')['id']).to eq 'form_first_name'
     end
 
+    it 'can find specifically by placeholder regex' do
+      expect(@session.find(:field, placeholder: /FirstN.*/)['id']).to eq 'form_first_name'
+    end
+
     it 'can find by type' do
       expect(@session.find(:field, 'Confusion', type: 'checkbox')['id']).to eq 'confusion_checkbox'
       expect(@session.find(:field, 'Confusion', type: 'text')['id']).to eq 'confusion_text'

data/lib/capybara/spec/session/window/window_spec.rb

@@ -141,12 +141,12 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#maximize' do
-    before do
-      @initial_size = @session.current_window.size
+    let! :initial_size do
+      @session.current_window.size
     end
 
     after do
-      @session.current_window.resize_to(*@initial_size)
+      @session.current_window.resize_to(*initial_size)
       sleep 0.5
     end
 
@@ -176,7 +176,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
 
       expect(@session.current_window).to eq(orig_window)
       # Maximizing the browser affects all tabs so this may not be valid in real browsers
-      # expect(@session.current_window.size).to eq(@initial_size)
+      # expect(@session.current_window.size).to eq(initial_size)
 
       ow_width, ow_height = other_window.size
       expect(ow_width).to be > 400
@@ -185,12 +185,12 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#fullscreen' do
-    before do
-      @initial_size = @session.current_window.size
+    let! :initial_size do
+      @session.current_window.size
     end
 
     after do
-      @session.current_window.resize_to(*@initial_size)
+      @session.current_window.resize_to(*initial_size)
       sleep 1
     end
 

data/lib/capybara/spec/spec_helper.rb

@@ -30,6 +30,7 @@ module Capybara
         Capybara.visible_text_only = false
         Capybara.match = :smart
         Capybara.enable_aria_label = false
+        Capybara.enable_aria_role = false
         Capybara.default_set_options = {}
         Capybara.disable_animation = false
         Capybara.test_id = nil
@@ -60,7 +61,7 @@ module Capybara
         RSpec.describe Capybara::Session, name, options do # rubocop:disable RSpec/EmptyExampleGroup
           include Capybara::SpecHelper
           include Capybara::RSpecMatchers
-          # rubocop:disable RSpec/ScatteredSetup
+
           before do |example|
             @session = session
             instance_exec(example, &filter_block) if filter_block
@@ -81,7 +82,6 @@ module Capybara
           before :each, :exact_false do
             Capybara.exact = false
           end
-          # rubocop:enable RSpec/ScatteredSetup
 
           specs.each do |spec_name, spec_options, block|
             describe spec_name, *spec_options do # rubocop:disable RSpec/EmptyExampleGroup

data/lib/capybara/spec/test_app.rb

@@ -188,28 +188,24 @@ class TestApp < Sinatra::Base
   end
 
   post '/upload' do
-    begin
-      buffer = []
-      buffer << "Content-type: #{params.dig(:form, :document, :type)}"
-      buffer << "File content: #{params.dig(:form, :document, :tempfile).read}"
-      buffer.join(' | ')
-    rescue StandardError
-      'No file uploaded'
-    end
+    buffer = []
+    buffer << "Content-type: #{params.dig(:form, :document, :type)}"
+    buffer << "File content: #{params.dig(:form, :document, :tempfile).read}"
+    buffer.join(' | ')
+  rescue StandardError
+    'No file uploaded'
   end
 
   post '/upload_multiple' do
-    begin
-      docs = params.dig(:form, :multiple_documents)
-      buffer = [docs.size.to_s]
-      docs.each do |doc|
-        buffer << "Content-type: #{doc[:type]}"
-        buffer << "File content: #{doc[:tempfile].read}"
-      end
-      buffer.join(' | ')
-    rescue StandardError
-      'No files uploaded'
+    docs = params.dig(:form, :multiple_documents)
+    buffer = [docs.size.to_s]
+    docs.each do |doc|
+      buffer << "Content-type: #{doc[:type]}"
+      buffer << "File content: #{doc[:tempfile].read}"
     end
+    buffer.join(' | ')
+  rescue StandardError
+    'No files uploaded'
   end
 
   get '/apple-touch-icon-precomposed.png' do

data/lib/capybara/spec/views/form.erb

@@ -11,7 +11,7 @@
       <option>Miss</option>
       <option disabled="disabled">Other</option>
     </select>
-    </p>
+  </p>
 
   <p>
     <label for="customer_name">Customer Name
@@ -62,6 +62,11 @@
     <input type="text" name="form[name]" value="John Smith" id="form_name"/>
   </p>
 
+  <p>
+    <label for="form_age">Age</label>
+    <input type="range" name="form[age]" value="18" min="13" max="100" step="0.5" id="form_age"/>
+  </p>
+
   <p>
     <label for="form_schmooo">Schmooo</label>
     <input type="schmooo" name="form[schmooo]" value="This is Schmooo!" id="form_schmooo"/>
@@ -135,7 +140,11 @@
 
   <p>
     <label for="form_zipcode">Zipcode</label>
-    <input type="text" maxlength="5" name="form[zipcode]" id="form_zipcode" />
+    <input type="text" maxlength="5" name="form[zipcode]" id="form_zipcode" pattern="[0-9]{5,9}" />
+  </p>
+
+  <p>
+    <input maxlength="35" id="long_length" />
   </p>
 
   <p>
@@ -448,6 +457,7 @@ New line after and before textarea tag
     <button id="no_type">No Type!</button>
     <button><img alt="A horse eating hay"/></button>
     <input type="button" disabled="disabled" value="Disabled button"/>
+    <span role="button">ARIA button</span>
   </p>
 
   <p>
@@ -474,6 +484,11 @@ New line after and before textarea tag
   <input type="text" name="nested_label" id="nested_label"/>
 </label>
 
+<label id="wrapper_label">
+  Wrapper Label
+  <input type="checkbox"/>
+</label>
+
 <form id="form1" action="/form" method="post">
   <input type="text" name="form[which_form]" value="form1" id="form_which_form"/>
   <input type="text" name="form[for_form2]" value="for_form2" form="form2"/>
@@ -507,6 +522,7 @@ New line after and before textarea tag
 
   <p>
     <input type="submit" name="form[mediocre]" id="mediocre" value="med" aria-label="Mediocre Button"/>
+    <input type="submit" formaction="/form/get?bar=foo" id="mediocre2" value="med2"/>
   <p>
 </form>
 

data/lib/capybara/spec/views/with_dragula.erb

@@ -15,7 +15,9 @@
     </div>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/dragula/3.7.2/dragula.js" type="text/javascript"></script>
     <script>
-      dragula([document.getElementById("sortable")]);
+      let container = document.getElementById("sortable");
+      dragula([container]);
+      container.className = "ready"
     </script>
   </body>
 </html>

data/lib/capybara/spec/views/with_html.erb

@@ -36,8 +36,8 @@
 </p>
 
 <p>
-  <input type="text" id="test_field" data-test-id="test_id" value="monkey"/>
-  <input type="text" readonly="readonly" value="should not change" />
+  <input type="text" id="test_field" spellcheck="TRUE" data-test-id="test_id" value="monkey"/>
+  <input type="text" readonly="readonly" spellcheck="FALSE" value="should not change" />
   <textarea id="normal" data-other-test-id="test_id">
 banana</textarea>
   <textarea id="additional_newline">

data/lib/capybara/spec/views/with_js.erb

@@ -35,6 +35,7 @@
 
     <p><a href="#" id="clickable">Click me</a></p>
     <p><a href="#" id="slow-click">Slowly</a></p>
+    <p><span id="aria-button" role="button">ARIA button</span></p>
 
     <p>
       <select id="waiter">

data/lib/capybara/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Capybara
-  VERSION = '3.29.0'
+  VERSION = '3.33.0'
 end

data/spec/capybara_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Capybara do
         # do nothing
       end
 
-      expect(described_class.servers).to have_key(:blob)
+      expect(described_class.servers[:blob]).to be_truthy
     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 spatial
+  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/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

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