capybara 3.29.0 → 3.30.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/views/form.erb

@@ -474,6 +474,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"/>

data/lib/capybara/version.rb

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

data/spec/dsl_spec.rb

@@ -92,7 +92,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 +208,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

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
 

data/spec/regexp_dissassembler_spec.rb

@@ -49,16 +49,20 @@ RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
   end
 
   it 'handles optional characters for #alternated_substrings' do
+    # rubocop:disable Style/BracesAroundHashParameters
     verify_alternated_strings(
-      /abc*def/ => [%w[ab def]],
-      /abc*/ => [%w[ab]],
-      /c*/ => [],
-      /abc?def/ => [%w[abdef], %w[abcdef]],
-      /abc?/ => [%w[ab]],
-      /abc?def?/ => [%w[abde], %w[abcde]],
-      /abc?def?g/ => [%w[abdeg], %w[abdefg], %w[abcdeg], %w[abcdefg]],
-      /d?/ => []
+      {
+        /abc*def/ => [%w[ab def]],
+        /abc*/ => [%w[ab]],
+        /c*/ => [],
+        /abc?def/ => [%w[abdef], %w[abcdef]],
+        /abc?/ => [%w[ab]],
+        /abc?def?/ => [%w[abde], %w[abcde]],
+        /abc?def?g/ => [%w[abdeg], %w[abdefg], %w[abcdeg], %w[abcdefg]],
+        /d?/ => []
+      }
     )
+    # rubocop:enable Style/BracesAroundHashParameters
   end
 
   it 'handles character classes' do
@@ -136,36 +140,40 @@ RSpec.describe Capybara::Selector::RegexpDisassembler, :aggregate_failures do
   end
 
   it 'handles alternation for #alternated_substrings' do
+    # rubocop:disable Style/BracesAroundHashParameters
     verify_alternated_strings(
-      /abc|def/ => [%w[abc], %w[def]],
-      /ab(?:c|d)/ => [%w[abc], %w[abd]],
-      /ab(c|d|e)fg/ => [%w[abcfg], %w[abdfg], %w[abefg]],
-      /ab?(c|d)fg/ => [%w[acfg], %w[adfg], %w[abcfg], %w[abdfg]],
-      /ab(c|d)ef/ => [%w[abcef], %w[abdef]],
-      /ab(cd?|ef)g/ => [%w[abcg], %w[abcdg], %w[abefg]],
-      /ab(cd|ef*)g/ => [%w[abcdg], %w[abe g]],
-      /ab|cd*/ => [%w[ab], %w[c]],
-      /cd(?:ef|gh)|xyz/ => [%w[cdef], %w[cdgh], %w[xyz]],
-      /(cd(?:ef|gh)|xyz)/ => [%w[cdef], %w[cdgh], %w[xyz]],
-      /cd(ef|gh)+/ => [%w[cdef], %w[cdgh]],
-      /cd(ef|gh)?/ => [%w[cd]],
-      /cd(ef|gh)?ij/ => [%w[cdij], %w[cdefij], %w[cdghij]],
-      /cd(ef|gh)+ij/ => [%w[cdef ij], %w[cdgh ij]],
-      /cd(ef|gh){2}ij/ => [%w[cdefefij], %w[cdefghij], %w[cdghefij], %w[cdghghij]],
-      /(cd(ef|g*))/ => [%w[cd]],
-      /a|b*/ => [],
-      /ab(?:c|d?)/ => [%w[ab]],
-      /ab(c|d)|a*/ => [],
-      /(abc)?(d|e)/ => [%w[d], %w[e]],
-      /(abc*de)?(d|e)/ => [%w[d], %w[e]],
-      /(abc*de)?(d|e?)/ => [],
-      /(abc)?(d|e?)/ => [],
-      /ab(cd){0,2}ef/ => [%w[ab ef]],
-      /ab(cd){0,1}ef/ => [%w[abef], %w[abcdef]],
-      /ab(cd|cd)ef/ => [%w[abcdef]],
-      /ab(cd|cd)?ef/ => [%w[abef], %w[abcdef]],
-      /ab\\?cd/ => [%w[abcd], %w[ab\cd]]
-    )
+      {
+        /abc|def/ => [%w[abc], %w[def]],
+        /ab(?:c|d)/ => [%w[abc], %w[abd]],
+        /ab(c|d|e)fg/ => [%w[abcfg], %w[abdfg], %w[abefg]],
+        /ab?(c|d)fg/ => [%w[acfg], %w[adfg], %w[abcfg], %w[abdfg]],
+        /ab(c|d)ef/ => [%w[abcef], %w[abdef]],
+        /ab(cd?|ef)g/ => [%w[abcg], %w[abcdg], %w[abefg]],
+        /ab(cd|ef*)g/ => [%w[abcdg], %w[abe g]],
+        /ab|cd*/ => [%w[ab], %w[c]],
+        /cd(?:ef|gh)|xyz/ => [%w[cdef], %w[cdgh], %w[xyz]],
+        /(cd(?:ef|gh)|xyz)/ => [%w[cdef], %w[cdgh], %w[xyz]],
+        /cd(ef|gh)+/ => [%w[cdef], %w[cdgh]],
+        /cd(ef|gh)?/ => [%w[cd]],
+        /cd(ef|gh)?ij/ => [%w[cdij], %w[cdefij], %w[cdghij]],
+        /cd(ef|gh)+ij/ => [%w[cdef ij], %w[cdgh ij]],
+        /cd(ef|gh){2}ij/ => [%w[cdefefij], %w[cdefghij], %w[cdghefij], %w[cdghghij]],
+        /(cd(ef|g*))/ => [%w[cd]],
+        /a|b*/ => [],
+        /ab(?:c|d?)/ => [%w[ab]],
+        /ab(c|d)|a*/ => [],
+        /(abc)?(d|e)/ => [%w[d], %w[e]],
+        /(abc*de)?(d|e)/ => [%w[d], %w[e]],
+        /(abc*de)?(d|e?)/ => [],
+        /(abc)?(d|e?)/ => [],
+        /ab(cd){0,2}ef/ => [%w[ab ef]],
+        /ab(cd){0,1}ef/ => [%w[abef], %w[abcdef]],
+        /ab(cd|cd)ef/ => [%w[abcdef]],
+        /ab(cd|cd)?ef/ => [%w[abef], %w[abcdef]],
+        /ab\\?cd/ => [%w[abcd], %w[ab\cd]]
+      }
+    )
+    # rubocop:enable Style/BracesAroundHashParameters
   end
 
   it 'handles grouping' do

data/spec/result_spec.rb

@@ -44,9 +44,9 @@ RSpec.describe Capybara::Result do
   end
 
   it 'can be selected' do
-    expect(result.select do |element|
+    expect(result.count do |element|
       element.text.include? 't'
-    end.length).to eq(2)
+    end).to eq(2)
   end
 
   it 'can be reduced' do
@@ -137,7 +137,7 @@ RSpec.describe Capybara::Result do
     expect(result.instance_variable_get('@result_cache').size).to eq 4
   end
 
-  context '#each' do
+  describe '#each' do
     it 'lazily evaluates' do
       skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
       results = []

data/spec/rspec/features_spec.rb

@@ -81,6 +81,7 @@ xfeature 'if xfeature aliases to pending then' do
   scenario "this should be 'temporarily disabled with xfeature'" do
     # dummy
   end
+
   scenario "this also should be 'temporarily disabled with xfeature'" do
     # dummy
   end

data/spec/rspec/shared_spec_matchers.rb

@@ -857,7 +857,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
       session.visit('/with_js')
     end
 
-    context '#and' do
+    describe '#and' do
       it "should run 'concurrently'" do
         Capybara.using_wait_time(2) do
           matcher = have_text('this is not there').and have_text('neither is this')
@@ -899,14 +899,14 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
       end
     end
 
-    context '#and_then' do
+    describe '#and_then' do
       it 'should run sequentially' do
         session.click_link('reload-link')
         expect(el).to have_text('waiting to be reloaded').and_then have_text('has been reloaded')
       end
     end
 
-    context '#or' do
+    describe '#or' do
       it "should run 'concurrently'" do
         session.using_wait_time(3) do
           expect(Benchmark.realtime do