capybara 3.23.0 → 3.35.3

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# NOTE: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
 # because of the methods being tested. In tests using Capybara this type of behavior should be implemented
 # using Capybara provided assertions with builtin waiting behavior.
 
@@ -25,6 +25,7 @@ Capybara::SpecHelper.spec '#refresh' do
     @session.visit('/form')
     @session.select('Sweden', from: 'form_region')
     @session.click_button('awesome')
+    sleep 2
     expect do
       @session.refresh
       sleep 2

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_page_spec.rb

@@ -31,7 +31,7 @@ Capybara::SpecHelper.spec '#save_page' do
   it 'can store files in a specified directory' do
     Capybara.save_path = alternative_path
     @session.save_page
-    path = Dir.glob(alternative_path + '/capybara-*.html').first
+    path = Dir.glob("#{alternative_path}/capybara-*.html").first
     expect(File.read(path)).to include('Another World')
   end
 
@@ -43,14 +43,14 @@ Capybara::SpecHelper.spec '#save_page' do
   it 'can store files in a specified directory with a given filename' do
     Capybara.save_path = alternative_path
     @session.save_page('capybara-001133.html')
-    path = alternative_path + '/capybara-001133.html'
+    path = "#{alternative_path}/capybara-001133.html"
     expect(File.read(path)).to include('Another World')
   end
 
   it 'can store files in a specified directory with a given relative filename' do
     Capybara.save_path = alternative_path
     @session.save_page('tmp/capybara-001144.html')
-    path = alternative_path + '/tmp/capybara-001144.html'
+    path = "#{alternative_path}/tmp/capybara-001144.html"
     expect(File.read(path)).to include('Another World')
   end
 
@@ -63,7 +63,7 @@ Capybara::SpecHelper.spec '#save_page' do
   it 'returns an absolute path in given directory' do
     Capybara.save_path = alternative_path
     result = @session.save_page
-    path = File.expand_path(Dir.glob(alternative_path + '/capybara-*.html').first, alternative_path)
+    path = File.expand_path(Dir.glob("#{alternative_path}/capybara-*.html").first, alternative_path)
     expect(result).to eq(path)
   end
 

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

@@ -13,24 +13,13 @@ Capybara::SpecHelper.spec '#save_screenshot', requires: [:screenshot] do
     FileUtils.rm_rf alternative_path
   end
 
-  around do |example|
-    # Workaround RSpec Issue - https://github.com/rspec/rspec-support/issues/374
-    if respond_to?(:without_partial_double_verification)
-      without_partial_double_verification do
-        example.run
-      end
-    else
-      example.run
-    end
-  end
-
   it 'generates sensible filename' do
     allow(@session.driver).to receive(:save_screenshot)
 
     @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
@@ -39,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
@@ -50,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
@@ -60,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'
@@ -79,7 +92,7 @@ Capybara::SpecHelper.spec Capybara::Selector do
     it 'can find by class' do
       expect(@session.find(:field, class: 'confusion-checkbox')['id']).to eq 'confusion_checkbox'
       expect(@session).to have_selector(:field, class: 'confusion', count: 3)
-      expect(@session.find(:field, class: ['confusion', 'confusion-textarea'])['id']).to eq 'confusion_textarea'
+      expect(@session.find(:field, class: %w[confusion confusion-textarea])['id']).to eq 'confusion_textarea'
     end
   end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# NOTE: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
 # because of the methods being tested. In tests using Capybara this type of behavior should be implemented
 # using Capybara provided assertions with builtin waiting behavior.
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# NOTE: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
 # because of the methods being tested. In tests using Capybara this type of behavior should be implemented
 # using Capybara provided assertions with builtin waiting behavior.
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# NOTE: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
 # because of the methods being tested. In tests using Capybara this type of behavior should be implemented
 # using Capybara provided assertions with builtin waiting behavior.
 
@@ -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/session/window/windows_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# NOTE: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
 # because of the methods being tested. In tests using Capybara this type of behavior should be implemented
 # using Capybara provided assertions with builtin waiting behavior.
 

data/lib/capybara/spec/spec_helper.rb

@@ -30,12 +30,14 @@ 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
         Capybara.predicates_wait = true
         Capybara.default_normalize_ws = false
         Capybara.allow_gumbo = true
+        Capybara.w3c_click_offset = false
         reset_threadsafe
       end
 
@@ -56,10 +58,10 @@ module Capybara
 
       def run_specs(session, name, **options, &filter_block)
         specs = @specs
-        RSpec.describe Capybara::Session, name, options do # rubocop:disable RSpec/EmptyExampleGroup
+        RSpec.describe Capybara::Session, name, options do
           include Capybara::SpecHelper
           include Capybara::RSpecMatchers
-          # rubocop:disable RSpec/ScatteredSetup
+
           before do |example|
             @session = session
             instance_exec(example, &filter_block) if filter_block
@@ -70,28 +72,28 @@ module Capybara
           end
 
           before :each, psc: true do
-            SpecHelper.reset_threadsafe(true, session)
+            SpecHelper.reset_threadsafe(bool: true, session: session)
           end
 
           after psc: true do
-            SpecHelper.reset_threadsafe(false, session)
+            SpecHelper.reset_threadsafe(session: session)
           end
 
           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
+            describe spec_name, *spec_options do
               class_eval(&block)
             end
           end
         end
       end
 
-      def reset_threadsafe(bool = false, session = nil)
-        Capybara::Session.class_variable_set(:@@instance_created, false) # Work around limit on when threadsafe can be changed
+      def reset_threadsafe(bool: false, session: nil)
+        # Work around limit on when threadsafe can be changed
+        Capybara::Session.class_variable_set(:@@instance_created, false) # rubocop:disable Style/ClassVars
         Capybara.threadsafe = bool
         session = session.current_session if session.respond_to?(:current_session)
         session&.instance_variable_set(:@config, nil)
@@ -107,11 +109,9 @@ module Capybara
       stream.reopen(old_stream)
     end
 
-    def quietly
-      silence_stream(STDOUT) do
-        silence_stream(STDERR) do
-          yield
-        end
+    def quietly(&block)
+      silence_stream($stdout) do
+        silence_stream($stderr, &block)
       end
     end
 
@@ -131,4 +131,4 @@ module Capybara
   end
 end
 
-Dir[File.dirname(__FILE__) + '/session/**/*.rb'].each { |file| require_relative file }
+Dir["#{File.dirname(__FILE__)}/session/**/*.rb"].each { |file| require_relative file }

data/lib/capybara/spec/test_app.rb

@@ -7,8 +7,10 @@ require 'yaml'
 
 class TestApp < Sinatra::Base
   class TestAppError < Exception; end # rubocop:disable Lint/InheritException
+
   class TestAppOtherError < Exception # rubocop:disable Lint/InheritException
     def initialize(string1, msg)
+      super()
       @something = string1
       @message = msg
     end
@@ -33,6 +35,10 @@ class TestApp < Sinatra::Base
     redirect '/redirect_again'
   end
 
+  get '/redirect_with_fragment' do
+    redirect '/landed#with_fragment'
+  end
+
   get '/redirect_again' do
     redirect '/landed'
   end
@@ -85,11 +91,11 @@ class TestApp < Sinatra::Base
   end
 
   get '/form/get' do
-    '<pre id="results">' + params[:form].to_yaml + '</pre>'
+    %(<pre id="results">#{params[:form].to_yaml}</pre>)
   end
 
   post '/relative' do
-    '<pre id="results">' + params[:form].to_yaml + '</pre>'
+    %(<pre id="results">#{params[:form].to_yaml}</pre>)
   end
 
   get '/favicon.ico' do
@@ -176,7 +182,7 @@ class TestApp < Sinatra::Base
 
   post '/form' do
     self.class.form_post_count += 1
-    '<pre id="results">' + params[:form].merge('post_count' => self.class.form_post_count).to_yaml + '</pre>'
+    %(<pre id="results">#{params[:form].merge('post_count' => self.class.form_post_count).to_yaml}</pre>)
   end
 
   post '/upload_empty' do
@@ -188,28 +194,28 @@ 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
+    halt(404)
   end
 
   class << self

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

@@ -1,7 +1,7 @@
 
 <h1>Form</h1>
 
-<form action="/form" method="post">
+<form action="/form" method="post" novalidate>
 
   <p>
     <label for="form_title">Title</label>
@@ -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>
@@ -440,14 +449,25 @@ New line after and before textarea tag
 
   <p>
     <input type="button" aria-label="Aria button" name="form[fresh]" id="fresh_btn" value="i am fresh"/>
-    <input type="submit" name="form[awesome]" id="awe123" title="What an Awesome Button" value="awesome"/>
+    <input type="submit" name="form[awesome]" id="awe123" data-test-id="test_id_button" title="What an Awesome Button" value="awesome"/>
     <input type="submit" name="form[crappy]" id="crap321" value="crappy"/>
     <input type="image" name="form[okay]" id="okay556" title="Okay 556 Image" value="okay" alt="oh hai thar"/>
     <button type="submit" id="click_me_123" title="Click Title button" value="click_me">Click me!</button>
     <button type="submit" name="form[no_value]">No Value!</button>
     <button id="no_type">No Type!</button>
     <button><img alt="A horse eating hay"/></button>
+    <button id="button_with_label"></button>
+    <label for="button_with_label">button with label element</label>
+    <label>
+      button within label element
+      <button></button>
+    </label>
+    <label>
+      role=button within label element
+      <span role="button">with other text</span>
+    </label>
     <input type="button" disabled="disabled" value="Disabled button"/>
+    <span role="button">ARIA button</span>
   </p>
 
   <p>
@@ -460,6 +480,11 @@ New line after and before textarea tag
     <input id="readonly" name="form[readonly_test]" readonly/>
     <input id="not_readonly" name="form[readonly_test]" />
   </p>
+
+  <p>
+    <input id="required" name="form[required]" required />
+    <input id="length" name="form[length]" minlength="4" maxlength="4" />
+  </p>
 </form>
 
 <input type="text" name="form[outside_input]" value="outside_input" form="form1"/>
@@ -469,6 +494,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"/>
@@ -502,6 +532,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>
 
@@ -663,3 +694,15 @@ New line after and before textarea tag
 <p>
   <input id="special" {custom}="abcdef" value="custom attribute"/>
 </p>
+
+
+<label for="multi_label_checkbox">
+  Label to click
+</label>
+<div>Something random that justifies the usage of a separate label</div>
+<label>
+  <div>
+    <input type="checkbox" id="multi_label_checkbox" style="display: none"/>
+    <div>Visual representation of the checkbox</div>
+  </div>
+</label>