capybara 3.16.1 → 3.33.0

data/spec/selenium_spec_firefox.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
 browser_options = ::Selenium::WebDriver::Firefox::Options.new
@@ -43,36 +44,39 @@ end
 
 skipped_tests = %i[response_headers status_code trigger]
 
-$stdout.puts `#{Selenium::WebDriver::Firefox.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Firefox) if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
   when 'Capybara::Session selenium node #click should allow multiple modifiers'
-    pending "Firefox doesn't generate an event for shift+control+click" if firefox_gte?(62, @session) && !Gem.win_platform?
+    pending "Firefox on OSX doesn't generate an event for shift+control+click" if firefox_gte?(62, @session) && Selenium::WebDriver::Platform.mac?
   when /^Capybara::Session selenium node #double_click/
     pending "selenium-webdriver/geckodriver doesn't generate double click event" if firefox_lt?(59, @session)
   when 'Capybara::Session selenium #accept_prompt should accept the prompt with a blank response when there is a default'
     pending "Geckodriver doesn't set a blank response in FF < 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1486485" if firefox_lt?(63, @session)
-  when 'Capybara::Session selenium #attach_file with multipart form should fire change once for each set of files uploaded'
-    pending 'Gekcodriver appends files so we have to first call clear for multiple files which creates an extra change ' \
-            'if files are already set'
   when 'Capybara::Session selenium #attach_file with multipart form should fire change once when uploading multiple files from empty'
     pending "FF < 62 doesn't support setting all files at once" if firefox_lt?(62, @session)
   when 'Capybara::Session selenium #accept_confirm should work with nested modals'
-    skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session)
+    skip 'Broken in 63 <= FF < 69  - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session) && firefox_lt?(69, @session)
+    skip 'Hangs in 69 <= FF < 71  - Dont know what issue for this - previous issue was closed as fixed but it is not' if firefox_gte?(69, @session) && firefox_lt?(71, @session)
+    skip 'Broken again intermittently in FF 71 - jus skip it'
   when 'Capybara::Session selenium #click_link can download a file'
     skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
   when 'Capybara::Session selenium #reset_session! removes ALL cookies'
     pending "Geckodriver doesn't provide a way to remove cookies outside the current domain"
-  when 'Capybara::Session selenium #attach_file with a block can upload by clicking the file input'
-    pending "Geckodriver doesn't allow clicking on file inputs"
+  when /drag_to.*HTML5/
+    pending "Firefox < 62 doesn't support a DataTransfer constuctor" if firefox_lt?(62.0, @session)
+  when 'Capybara::Session selenium #accept_alert should handle the alert if the page changes',
+       'Capybara::Session selenium #accept_alert with an asynchronous alert should accept the alert'
+    skip 'No clue what Firefox is doing here - works fine on MacOS locally'
   end
 end
 
 RSpec.describe 'Capybara::Session with firefox' do # rubocop:disable RSpec/MultipleDescribes
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::SeleniumFirefox, :selenium_firefox
-  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumFirefox, :selenium_firefox
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::SeleniumFirefox, :selenium_firefox
+  end
 
   describe 'filling in Firefox-specific date and time fields with keystrokes' do
     let(:datetime) { Time.new(1983, 6, 19, 6, 30) }
@@ -105,7 +109,7 @@ RSpec.describe 'Capybara::Session with firefox' do # rubocop:disable RSpec/Multi
 end
 
 RSpec.describe Capybara::Selenium::Driver do
-  let(:driver) { Capybara::Selenium::Driver.new(TestApp, browser: :firefox, options: browser_options) }
+  let(:driver) { described_class.new(TestApp, browser: :firefox, options: browser_options) }
 
   describe '#quit' do
     it 'should reset browser when quit' do
@@ -182,7 +186,7 @@ RSpec.describe Capybara::Selenium::Driver do
 end
 
 RSpec.describe Capybara::Selenium::Node do
-  context '#click' do
+  describe '#click' do
     it 'warns when attempting on a table row' do
       session = TestSessions::SeleniumFirefox
       session.visit('/tables')
@@ -201,13 +205,4 @@ RSpec.describe Capybara::Selenium::Node do
       expect(session).to have_link('Has been alt control meta')
     end
   end
-
-  context '#send_keys' do
-    it 'should process space' do
-      session = TestSessions::SeleniumFirefox
-      session.visit('/form')
-      session.find(:css, '#address1_city').send_keys('ocean', [:shift, :space, 'side'])
-      expect(session.find(:css, '#address1_city').value).to eq 'ocean SIDE'
-    end
-  end
 end

data/spec/selenium_spec_firefox_remote.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
 def selenium_host
@@ -49,12 +50,6 @@ module TestSessions
   RemoteFirefox = Capybara::Session.new(FIREFOX_REMOTE_DRIVER, TestApp)
 end
 
-TestSessions::RemoteFirefox.driver.browser.file_detector = lambda do |args|
-  # args => ["/path/to/file"]
-  str = args.first.to_s
-  str if File.exist?(str)
-end
-
 skipped_tests = %i[response_headers status_code trigger download]
 
 Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVER.to_s, capybara_skip: skipped_tests do |example|
@@ -63,9 +58,6 @@ Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVE
     skip "Firefox doesn't generate an event for shift+control+click" if firefox_gte?(62, @session)
   when 'Capybara::Session selenium_firefox_remote #accept_prompt should accept the prompt with a blank response when there is a default'
     pending "Geckodriver doesn't set a blank response in FF < 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1486485" if firefox_lt?(63, @session)
-  when 'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once for each set of files uploaded'
-    pending 'Gekcodriver appends files so we have to first call clear for multiple files which creates an extra change ' \
-            'if files are already set'
   when 'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once when uploading multiple files from empty'
     pending "FF < 62 doesn't support setting all files at once" if firefox_lt?(62, @session)
   when 'Capybara::Session selenium_firefox_remote #reset_session! removes ALL cookies'
@@ -73,15 +65,14 @@ Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVE
   when /#accept_confirm should work with nested modals$/
     # skip because this is timing based and hence flaky when set to pending
     skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if firefox_gte?(63, @session)
-  when 'Capybara::Session selenium_firefox_remote #attach_file with a block can upload by clicking the file input'
-    pending "Geckodriver doesn't allow clicking on file inputs"
   end
 end
 
 RSpec.describe 'Capybara::Session with remote firefox' do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVER
-  include_examples  Capybara::RSpecMatchers, TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVER
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVER
+  end
 
   it 'is considered to be firefox' do
     expect(session.driver.browser.browser).to eq :firefox

data/spec/selenium_spec_ie.rb

@@ -3,9 +3,16 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
-::Selenium::WebDriver::IE.driver_path = 'C:\Tools\WebDriver\IEDriverServer.exe' if ENV['CI']
+# if ENV['CI']
+#   if ::Selenium::WebDriver::Service.respond_to? :driver_path=
+#     ::Selenium::WebDriver::IE::Service
+#   else
+#     ::Selenium::WebDriver::IE
+#   end.driver_path = 'C:\Tools\WebDriver\IEDriverServer.exe'
+# end
 
 def selenium_host
   ENV.fetch('SELENIUM_HOST', '192.168.56.102')
@@ -22,7 +29,7 @@ end
 Capybara.register_driver :selenium_ie do |app|
   # ::Selenium::WebDriver.logger.level = "debug"
   options = ::Selenium::WebDriver::IE::Options.new
-  options.require_window_focus = true
+  # options.require_window_focus = true
   # options.add_option("log", {"level": "trace"})
 
   if ENV['REMOTE']
@@ -32,21 +39,13 @@ Capybara.register_driver :selenium_ie do |app|
     Capybara::Selenium::Driver.new(app,
                                    browser: :remote,
                                    options: options,
-                                   url: url).tap do |driver|
-      puts driver.browser.capabilities.inspect
-      driver.browser.file_detector = lambda do |args|
-        str = args.first.to_s
-        str if File.exist?(str)
-      end
-    end
+                                   url: url)
   else
     Capybara::Selenium::Driver.new(
       app,
       browser: :ie,
       options: options
-    ).tap do |driver|
-      puts driver.browser.capabilities.inspect
-    end
+    )
   end
 end
 
@@ -58,7 +57,7 @@ TestSessions::SeleniumIE.current_window.resize_to(800, 500)
 
 skipped_tests = %i[response_headers status_code trigger modals hover form_attribute windows]
 
-$stdout.puts `#{Selenium::WebDriver::IE.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::IE) if ENV['CI']
 
 TestSessions::SeleniumIE.current_window.resize_to(1600, 1200)
 
@@ -104,13 +103,22 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, 'selenium', capybara_sk
   #   pending "IE driver doesn't error when clicking on covered elements, it just clicks the wrong element"
   when /#click should go to the same page if href is blank$/
     pending 'IE treats blank href as a parent request (against HTML spec)'
+  when /#attach_file with a block/
+    skip 'Hangs IE testing for unknown reason'
+  when /drag_to.*HTML5/
+    pending "IE doesn't support a DataTransfer constuctor"
+  when /template elements should not be visible/
+    skip "IE doesn't support template elements"
+  when /Element#drop/
+    pending "IE doesn't support DataTransfer constructor"
   end
 end
 
 RSpec.describe 'Capybara::Session with Internet Explorer', capybara_skip: skipped_tests do # rubocop:disable RSpec/MultipleDescribes
   include Capybara::SpecHelper
-  include_examples 'Capybara::Session', TestSessions::SeleniumIE, :selenium_ie
-  include_examples Capybara::RSpecMatchers, TestSessions::SeleniumIE, :selenium_ie
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::SeleniumIE, :selenium_ie
+  end
 end
 
 RSpec.describe Capybara::Selenium::Node do

data/spec/selenium_spec_safari.rb

@@ -3,11 +3,16 @@
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'shared_selenium_node'
 require 'rspec/shared_spec_matchers'
 
 SAFARI_DRIVER = :selenium_safari
 
-::Selenium::WebDriver::Safari.driver_path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
+if ::Selenium::WebDriver::Service.respond_to? :driver_path=
+  ::Selenium::WebDriver::Safari::Service
+else
+  ::Selenium::WebDriver::Safari
+end.driver_path = '/Applications/Safari Technology Preview.app/Contents/MacOS/safaridriver'
 
 browser_options = ::Selenium::WebDriver::Safari::Options.new
 # browser_options.headless! if ENV['HEADLESS']
@@ -33,7 +38,7 @@ end
 
 skipped_tests = %i[response_headers status_code trigger windows drag]
 
-$stdout.puts `#{Selenium::WebDriver::Safari.driver_path} --version` if ENV['CI']
+Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Safari) if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
@@ -50,17 +55,9 @@ Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybar
     pending 'safaridriver thinks these links are non-interactable for some unknown reason'
   when /Capybara::Session selenium_safari #attach_file with a block can upload by clicking the file input/
     skip "safaridriver doesn't allow clicking on file inputs"
-  when /Capybara::Session selenium_safari #attach_file with a block can upload by clicking the label/
-    skip 'hangs tests'
-  when /Capybara::Session selenium_safari #check when checkbox hidden with Capybara.automatic_label_click == false with allow_label_click == true should check via the label if input is visible but blocked by another element/,
-      'Capybara::Session selenium_safari node #click should not retry clicking when wait is disabled',
-      'Capybara::Session selenium_safari node #click should allow to retry longer',
-      'Capybara::Session selenium_safari node #click should retry clicking'
-    pending "safaridriver doesn't return a specific enough error to deal with this"
-  when /Capybara::Session selenium_safari #within_frame should find multiple nested frames/,
-       /Capybara::Session selenium_safari #within_frame works if the frame is closed/,
+  when /Capybara::Session selenium_safari #within_frame works if the frame is closed/,
        /Capybara::Session selenium_safari #switch_to_frame works if the frame is closed/
-    skip 'switch_to_frame(:parent) appears to go to the root in Safari rather than parent'
+    skip 'Safari has a race condition when clicking an element that causes the frame to close. It will sometimes raise a NoSuchFrameError'
   when /Capybara::Session selenium_safari #reset_session! removes ALL cookies/
     skip 'Safari webdriver can only remove cookies for the current domain'
   when /Capybara::Session selenium_safari #refresh it reposts/
@@ -76,15 +73,16 @@ Capybara::SpecHelper.run_specs TestSessions::Safari, SAFARI_DRIVER.to_s, capybar
   when 'Capybara::Session selenium_safari #go_back should fetch a response from the driver from the previous page',
        'Capybara::Session selenium_safari #go_forward should fetch a response from the driver from the previous page'
     skip 'safaridriver loses the ability to find elements in the document after `go_back`'
-  when 'Capybara::Session selenium_safari node #send_keys should hold modifiers at top level'
-    skip 'Need to look into this'
+  when /drag_to.*HTML5/
+    pending "Safari doesn't support"
   end
 end
 
 RSpec.describe 'Capybara::Session with safari' do
   include Capybara::SpecHelper
-  include_examples  'Capybara::Session', TestSessions::Safari, SAFARI_DRIVER
-  include_examples  Capybara::RSpecMatchers, TestSessions::Safari, SAFARI_DRIVER
+  ['Capybara::Session', 'Capybara::Node', Capybara::RSpecMatchers].each do |examples|
+    include_examples examples, TestSessions::Safari, SAFARI_DRIVER
+  end
 
   context 'storage' do
     describe '#reset!' do
@@ -122,17 +120,18 @@ RSpec.describe 'Capybara::Session with safari' do
     let(:session) { TestSessions::Safari }
 
     before do
-      skip 'Too many other things broken currently'
       session.visit('/form')
     end
 
     it 'should fill in a date input with a String' do
+      pending "Safari doesn't support date inputs"
       session.fill_in('form_date', with: '06/19/1983')
       session.click_button('awesome')
       expect(Date.parse(extract_results(session)['date'])).to eq datetime.to_date
     end
 
     it 'should fill in a time input with a String' do
+      # Safari doesn't support time inputs - so this is just a text input
       session.fill_in('form_time', with: '06:30A')
       session.click_button('awesome')
       results = extract_results(session)['time']
@@ -140,6 +139,7 @@ RSpec.describe 'Capybara::Session with safari' do
     end
 
     it 'should fill in a datetime input with a String' do
+      pending "Safari doesn't support datetime inputs"
       session.fill_in('form_datetime', with: "06/19/1983\t06:30A")
       session.click_button('awesome')
       expect(Time.parse(extract_results(session)['datetime'])).to eq datetime

data/spec/server_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Capybara::Server do
   it 'should spool up a rack server' do
     app = proc { |_env| [200, {}, ['Hello Server!']] }
-    server = Capybara::Server.new(app).boot
+    server = described_class.new(app).boot
 
     res = Net::HTTP.start(server.host, server.port) { |http| http.get('/') }
 
@@ -14,7 +14,7 @@ RSpec.describe Capybara::Server do
 
   it 'should do nothing when no server given' do
     expect do
-      Capybara::Server.new(nil).boot
+      described_class.new(nil).boot
     end.not_to raise_error
   end
 
@@ -26,12 +26,12 @@ RSpec.describe Capybara::Server do
       app = proc { |_env| [200, {}, ['Hello Server!']] }
 
       Capybara.server_host = '127.0.0.1'
-      server = Capybara::Server.new(app).boot
+      server = described_class.new(app).boot
       res = Net::HTTP.get(URI("http://127.0.0.1:#{server.port}"))
       expect(res).to eq('Hello Server!')
 
       Capybara.server_host = '0.0.0.0'
-      server = Capybara::Server.new(app).boot
+      server = described_class.new(app).boot
       res = Net::HTTP.get(URI("http://127.0.0.1:#{server.port}"))
       expect(res).to eq('Hello Server!')
     ensure
@@ -43,7 +43,7 @@ RSpec.describe Capybara::Server do
     Capybara.server_port = 22789
 
     app = proc { |_env| [200, {}, ['Hello Server!']] }
-    server = Capybara::Server.new(app).boot
+    server = described_class.new(app).boot
 
     res = Net::HTTP.start(server.host, 22789) { |http| http.get('/') }
     expect(res.body).to include('Hello Server')
@@ -53,7 +53,7 @@ RSpec.describe Capybara::Server do
 
   it 'should use given port' do
     app = proc { |_env| [200, {}, ['Hello Server!']] }
-    server = Capybara::Server.new(app, port: 22790).boot
+    server = described_class.new(app, port: 22790).boot
 
     res = Net::HTTP.start(server.host, 22790) { |http| http.get('/') }
     expect(res.body).to include('Hello Server')
@@ -66,7 +66,7 @@ RSpec.describe Capybara::Server do
     apps = responses.map do |response|
       proc { |_env| [200, {}, [response]] }
     end
-    servers = apps.map { |app| Capybara::Server.new(app).boot }
+    servers = apps.map { |app| described_class.new(app).boot }
 
     servers.each_with_index do |server, idx|
       result = Net::HTTP.start(server.host, server.port) { |http| http.get('/') }
@@ -74,26 +74,53 @@ RSpec.describe Capybara::Server do
     end
   end
 
-  it 'should support SSL' do
-    begin
-      key = File.join(Dir.pwd, 'spec', 'fixtures', 'key.pem')
-      cert = File.join(Dir.pwd, 'spec', 'fixtures', 'certificate.pem')
-      Capybara.server = :puma, { Host: "ssl://#{Capybara.server_host}?key=#{key}&cert=#{cert}" }
-      app = proc { |_env| [200, {}, ['Hello SSL Server!']] }
-      server = Capybara::Server.new(app).boot
+  it 'should handle that getting available ports fails randomly' do
+    # Use a port to force a EADDRINUSE error to be generated
+    server = TCPServer.new('0.0.0.0', 0)
+    server_port = server.addr[1]
+    d_server = instance_double('TCPServer', addr: [nil, server_port, nil, nil], close: nil)
+    call_count = 0
+    allow(TCPServer).to receive(:new).and_wrap_original do |m, *args|
+      call_count.zero? ? d_server : m.call(*args)
+    ensure
+      call_count += 1
+    end
 
-      expect do
-        Net::HTTP.start(server.host, server.port) { |http| http.get('/__idntify__') }
-      end.to raise_error(EOFError)
+    port = described_class.new(Object.new, host: '0.0.0.0').port
+    expect(port).not_to eq(server_port)
+  ensure
+    server&.close
+  end
 
-      res = Net::HTTP.start(server.host, server.port, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE) do |https|
-        https.get('/')
-      end
+  it 'should return its #base_url' do
+    app = proc { |_env| [200, {}, ['Hello Server!']] }
+    server = described_class.new(app).boot
+    uri = ::Addressable::URI.parse(server.base_url)
+    expect(uri.to_hash).to include(scheme: 'http', host: server.host, port: server.port)
+  end
 
-      expect(res.body).to include('Hello SSL Server!')
-    ensure
-      Capybara.server = :default
+  it 'should support SSL' do
+    key = File.join(Dir.pwd, 'spec', 'fixtures', 'key.pem')
+    cert = File.join(Dir.pwd, 'spec', 'fixtures', 'certificate.pem')
+    Capybara.server = :puma, { Host: "ssl://#{Capybara.server_host}?key=#{key}&cert=#{cert}" }
+    app = proc { |_env| [200, {}, ['Hello SSL Server!']] }
+    server = described_class.new(app).boot
+
+    expect do
+      Net::HTTP.start(server.host, server.port, max_retries: 0) { |http| http.get('/__identify__') }
+    end.to(raise_error do |e|
+      expect(e.is_a?(EOFError) || e.is_a?(Net::ReadTimeout)).to be true
+    end)
+
+    res = Net::HTTP.start(server.host, server.port, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE) do |https|
+      https.get('/')
     end
+
+    expect(res.body).to include('Hello SSL Server!')
+    uri = ::Addressable::URI.parse(server.base_url)
+    expect(uri.to_hash).to include(scheme: 'https', host: server.host, port: server.port)
+  ensure
+    Capybara.server = :default
   end
 
   context 'When Capybara.reuse_server is true' do
@@ -110,7 +137,7 @@ RSpec.describe Capybara::Server do
     it 'should use the existing server if it already running' do
       app = proc { |_env| [200, {}, ['Hello Server!']] }
 
-      servers = Array.new(2) { Capybara::Server.new(app).boot }
+      servers = Array.new(2) { described_class.new(app).boot }
 
       servers.each do |server|
         res = Net::HTTP.start(server.host, server.port) { |http| http.get('/') }
@@ -130,8 +157,8 @@ RSpec.describe Capybara::Server do
         [200, {}, ['Hello Server!']]
       end
 
-      server1 = Capybara::Server.new(app).boot
-      server2 = Capybara::Server.new(app).boot
+      server1 = described_class.new(app).boot
+      server2 = described_class.new(app).boot
 
       expect do
         start_request(server1, 1.0)
@@ -155,7 +182,7 @@ RSpec.describe Capybara::Server do
     it 'should not reuse an already running server' do
       app = proc { |_env| [200, {}, ['Hello Server!']] }
 
-      servers = Array.new(2) { Capybara::Server.new(app).boot }
+      servers = Array.new(2) { described_class.new(app).boot }
 
       servers.each do |server|
         res = Net::HTTP.start(server.host, server.port) { |http| http.get('/') }
@@ -175,8 +202,8 @@ RSpec.describe Capybara::Server do
         [200, {}, ['Hello Server!']]
       end
 
-      server1 = Capybara::Server.new(app).boot
-      server2 = Capybara::Server.new(app).boot
+      server1 = described_class.new(app).boot
+      server2 = described_class.new(app).boot
 
       expect do
         start_request(server1, 1.0)
@@ -191,24 +218,42 @@ RSpec.describe Capybara::Server do
   end
 
   it 'should raise server errors when the server errors before the timeout' do
-    begin
-      Capybara.register_server :kaboom do
-        sleep 0.1
-        raise 'kaboom'
-      end
-      Capybara.server = :kaboom
+    Capybara.register_server :kaboom do
+      sleep 0.1
+      raise 'kaboom'
+    end
+    Capybara.server = :kaboom
 
-      expect do
-        Capybara::Server.new(proc { |e| }).boot
-      end.to raise_error(RuntimeError, 'kaboom')
-    ensure
-      Capybara.server = :default
+    expect do
+      described_class.new(proc { |e| }).boot
+    end.to raise_error(RuntimeError, 'kaboom')
+  ensure
+    Capybara.server = :default
+  end
+
+  it 'should raise an error when there are pending requests' do
+    app = proc do |env|
+      request = Rack::Request.new(env)
+      sleep request.params['wait_time'].to_f
+      [200, {}, ['Hello Server!']]
     end
+
+    server = described_class.new(app).boot
+
+    expect do
+      start_request(server, 59.0)
+      server.wait_for_pending_requests
+    end.not_to raise_error
+
+    expect do
+      start_request(server, 61.0)
+      server.wait_for_pending_requests
+    end.to raise_error('Requests did not finish in 60 seconds: ["/?wait_time=61.0"]')
   end
 
   it 'is not #responsive? when Net::HTTP raises a SystemCallError' do
     app = -> { [200, {}, ['Hello, world']] }
-    server = Capybara::Server.new(app)
+    server = described_class.new(app)
     allow(Net::HTTP).to receive(:start).and_raise(SystemCallError.allocate)
     expect(server.responsive?).to eq false
   end
@@ -223,7 +268,7 @@ RSpec.describe Capybara::Server do
       response = Net::HTTPSuccess.allocate
       allow(response).to receive(:body).and_return app.object_id.to_s
       allow(Net::HTTP).to receive(:start).with(anything, anything, hash_including(use_ssl: true)).and_return(response).once
-      Capybara::Server.new(app).boot
+      described_class.new(app).boot
       expect(Net::HTTP).to have_received(:start).exactly(3).times
     end
   end