capybara 3.32.2 → 3.35.2

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/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.
 

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,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
@@ -57,7 +58,7 @@ 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
 
@@ -71,11 +72,11 @@ 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
@@ -83,15 +84,16 @@ module Capybara
           end
 
           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,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

@@ -140,7 +140,7 @@
 
   <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>
@@ -449,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>
@@ -683,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>

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

@@ -18,6 +18,14 @@
       });
     </script>
     <style>
+      html {
+        scroll-behavior: smooth;
+      }
+
+      body {
+        min-height: 2000px;
+      }
+
       .transition.away {
           width: 0%;
       }

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_jquery_animation.erb

@@ -0,0 +1,24 @@
+
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>with_jquery_animation</title>
+    <style>
+      body {
+        height: 2000px;
+      }
+    </style>
+  </head>
+
+  <body id="with_animation">
+    <a href="#" id='scroll'>scroll top 500</a>
+
+    <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script type='text/javascript'>
+      $('#scroll').click(function(e){
+        e.preventDefault();
+        $('html, body').animate({ scrollTop: 500 }, 'slow');
+      });
+    </script>
+  </body>
+</html>

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

@@ -35,6 +35,8 @@
 
     <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><span role="button">ARIA button2</span></p>
 
     <p>
       <select id="waiter">
@@ -151,6 +153,7 @@
       <p>This is an HTML5 draggable element.</p>
     </div>
 
+    <div id="shadow"></div>
     <script type="text/javascript">
       // a javascript comment
       var aVar = 123;

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

@@ -2,7 +2,7 @@
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
     <title>with_sortable_js</title>
-    <script src="https://sortablejs.github.io/Sortable/Sortable.js" type="text/javascript"></script>
+    <script src="https://cdn.jsdelivr.net/npm/sortablejs@1.12.0/dist/sortable.umd.min.js" type="text/javascript"></script>
   </head>
 
   <body id="with_sortable_js">

data/lib/capybara/version.rb

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

data/lib/capybara/window.rb

@@ -4,7 +4,7 @@ module Capybara
   ##
   # The {Window} class represents a browser window.
   #
-  # You can get an instance of the class by calling either of:
+  # You can get an instance of the class by calling any of:
   #
   # * {Capybara::Session#windows}
   # * {Capybara::Session#current_window}
@@ -82,8 +82,8 @@ module Capybara
     # Resize window.
     #
     # @macro about_current
-    # @param width [String]  the new window width in pixels
-    # @param height [String]  the new window height in pixels
+    # @param width [Integer]  the new window width in pixels
+    # @param height [Integer]  the new window height in pixels
     #
     def resize_to(width, height)
       wait_for_stable_size { @driver.resize_window_to(handle, width, height) }
@@ -138,9 +138,5 @@ module Capybara
       end
       raise Capybara::WindowError, "Window size not stable within #{seconds} seconds."
     end
-
-    def raise_unless_current(what)
-      raise Capybara::WindowError, "#{what} not current window is not possible." unless current?
-    end
   end
 end

data/spec/basic_node_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Capybara do
+  include Capybara::RSpecMatchers
   describe '.string' do
     let :string do
       described_class.string <<-STRING
@@ -129,25 +130,25 @@ RSpec.describe Capybara do
 
     describe '#has_title?' do
       it 'returns whether the page has the given title' do
-        expect(string.has_title?('simple_node')).to be_truthy
-        expect(string.has_title?('monkey')).to be_falsey
+        expect(string.has_title?('simple_node')).to be true
+        expect(string.has_title?('monkey')).to be false
       end
 
       it 'allows regexp matches' do
-        expect(string.has_title?(/s[a-z]+_node/)).to be_truthy
-        expect(string.has_title?(/monkey/)).to be_falsey
+        expect(string.has_title?(/s[a-z]+_node/)).to be true
+        expect(string.has_title?(/monkey/)).to be false
       end
     end
 
     describe '#has_no_title?' do
       it 'returns whether the page does not have the given title' do
-        expect(string.has_no_title?('simple_node')).to be_falsey
-        expect(string.has_no_title?('monkey')).to be_truthy
+        expect(string.has_no_title?('simple_node')).to be false
+        expect(string.has_no_title?('monkey')).to be true
       end
 
       it 'allows regexp matches' do
-        expect(string.has_no_title?(/s[a-z]+_node/)).to be_falsey
-        expect(string.has_no_title?(/monkey/)).to be_truthy
+        expect(string.has_no_title?(/s[a-z]+_node/)).to be false
+        expect(string.has_no_title?(/monkey/)).to be true
       end
     end
   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