capybara 3.29.0 → 3.31.0

data/spec/rack_test_spec.rb

@@ -82,7 +82,6 @@ RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
     describe '#fill_in' do
       it 'should warn that :fill_options are not supported' do
         session.visit '/with_html'
-
         expect { session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true } }.to \
           output(/^Options passed to Node#set but the RackTest driver doesn't support any - ignoring/).to_stderr
         expect(session).to have_field('test_field', with: 'not_monkey')

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
@@ -78,6 +78,10 @@ RSpec.describe Capybara::Result do
     eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
       expect(result[2..].map(&:text)).to eq %w[Gamma Delta]
     TEST
+    eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
+      expect(result[..2].map(&:text)).to eq %w[Alpha Beta Gamma]
+      expect(result[...2].map(&:text)).to eq %w[Alpha Beta]
+    TEST
   end
 
   it 'works with filter blocks' do
@@ -137,7 +141,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

data/spec/rspec_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe 'capybara/rspec' do
       expect(Capybara.current_driver).to eq(:culerity)
     end
 
-    context '#all' do
+    describe '#all' do
       it 'allows access to the Capybara finder' do
         visit('/with_html')
         found = all(:css, 'h2') { |element| element[:class] == 'head' }
@@ -57,7 +57,7 @@ RSpec.describe 'capybara/rspec' do
       end
     end
 
-    context '#within' do
+    describe '#within' do
       it 'allows access to the Capybara scoper' do
         visit('/with_html')
         expect do
@@ -82,7 +82,7 @@ RSpec.describe 'capybara/rspec' do
         end.new
       end
 
-      context '#all' do
+      describe '#all' do
         it 'allows access to the Capybara finder' do
           test_class_instance.visit('/with_html')
           expect(test_class_instance.all(:css, 'h2.head').size).to eq(5)
@@ -95,7 +95,7 @@ RSpec.describe 'capybara/rspec' do
         end
       end
 
-      context '#within' do
+      describe '#within' do
         it 'allows access to the Capybara scoper' do
           test_class_instance.visit('/with_html')
           expect do

data/spec/selenium_spec_chrome.rb

@@ -14,7 +14,8 @@ browser_options = ::Selenium::WebDriver::Chrome::Options.new
 browser_options.headless! if ENV['HEADLESS']
 browser_options.add_option(:w3c, ENV['W3C'] != 'false')
 # Chromedriver 77 requires setting this for headless mode on linux
-# browser_options.add_preference('download.default_directory', Capybara.save_path)
+# Different versions of Chrome/selenium-webdriver require setting differently - jus set them all
+browser_options.add_preference('download.default_directory', Capybara.save_path)
 browser_options.add_preference(:download, default_directory: Capybara.save_path)
 
 Capybara.register_driver :selenium_chrome do |app|
@@ -29,7 +30,7 @@ Capybara.register_driver :selenium_chrome_not_clear_storage do |app|
     browser: :chrome,
     options: browser_options
   }
-  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: false, clear_session_storage: false))
+  Capybara::Selenium::Driver.new(app, **chrome_options.merge(clear_local_storage: false, clear_session_storage: false))
 end
 
 Capybara.register_driver :selenium_chrome_not_clear_session_storage do |app|
@@ -37,7 +38,7 @@ Capybara.register_driver :selenium_chrome_not_clear_session_storage do |app|
     browser: :chrome,
     options: browser_options
   }
-  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_session_storage: false))
+  Capybara::Selenium::Driver.new(app, **chrome_options.merge(clear_session_storage: false))
 end
 
 Capybara.register_driver :selenium_chrome_not_clear_local_storage do |app|
@@ -45,7 +46,7 @@ Capybara.register_driver :selenium_chrome_not_clear_local_storage do |app|
     browser: :chrome,
     options: browser_options
   }
-  Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: false))
+  Capybara::Selenium::Driver.new(app, **chrome_options.merge(clear_local_storage: false))
 end
 
 Capybara.register_driver :selenium_driver_subclass_with_chrome do |app|

data/spec/selenium_spec_firefox.rb

@@ -49,7 +49,7 @@ Capybara::SpecHelper.log_selenium_driver_version(Selenium::WebDriver::Firefox) i
 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'
@@ -58,12 +58,17 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
     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 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 /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
 
@@ -181,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')

data/spec/server_spec.rb

@@ -74,6 +74,28 @@ RSpec.describe Capybara::Server do
     end
   end
 
+  it 'should handle that getting available ports fails randomly' do
+    begin
+      # 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|
+        begin
+          call_count.zero? ? d_server : m.call(*args)
+        ensure
+          call_count += 1
+        end
+      end
+
+      port = described_class.new(Object.new, host: '0.0.0.0').port
+      expect(port).not_to eq(server_port)
+    ensure
+      server&.close
+    end
+  end
+
   it 'should return its #base_url' do
     app = proc { |_env| [200, {}, ['Hello Server!']] }
     server = described_class.new(app).boot
@@ -217,6 +239,26 @@ RSpec.describe Capybara::Server do
     end
   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 = described_class.new(app)

data/spec/session_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe Capybara::Session do
-  context '#new' do
+  describe '#new' do
     it 'should raise an error if passed non-existent driver' do
       expect do
         described_class.new(:quox, TestApp).driver

data/spec/shared_selenium_node.rb

@@ -6,7 +6,7 @@ require 'selenium-webdriver'
 RSpec.shared_examples 'Capybara::Node' do |session, _mode|
   let(:session) { session }
 
-  context '#content_editable?' do
+  describe '#content_editable?' do
     it 'returns true when the element is content editable' do
       session.visit('/with_js')
       expect(session.find(:css, '#existing_content_editable').base.content_editable?).to be true
@@ -19,7 +19,7 @@ RSpec.shared_examples 'Capybara::Node' do |session, _mode|
     end
   end
 
-  context '#send_keys' do
+  describe '#send_keys' do
     it 'should process space' do
       session.visit('/form')
       session.find(:css, '#address1_city').send_keys('ocean', [:shift, :space, 'side'])
@@ -27,7 +27,7 @@ RSpec.shared_examples 'Capybara::Node' do |session, _mode|
     end
   end
 
-  context '#visible?' do
+  describe '#visible?' do
     let(:bridge) do
       session.driver.browser.send(:bridge)
     end

data/spec/shared_selenium_session.rb

@@ -72,7 +72,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
     end
 
-    context '#fill_in_with empty string and no options' do
+    describe '#fill_in_with empty string and no options' do
       it 'should trigger change when clearing a field' do
         pending "safaridriver doesn't trigger change for clear" if safari?(session)
         session.visit('/with_js')
@@ -83,7 +83,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
     end
 
-    context '#fill_in with { :clear => :backspace } fill_option', requires: [:js] do
+    describe '#fill_in with { :clear => :backspace } fill_option', requires: [:js] do
       before do
         # Firefox has an issue with change events if the main window doesn't think it's focused
         session.execute_script('window.focus()')
@@ -150,7 +150,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
     end
 
-    context '#fill_in with { clear: :none } fill_options' do
+    describe '#fill_in with { clear: :none } fill_options' do
       it 'should append to content in a field' do
         pending 'Safari overwrites by default - need to figure out a workaround' if safari?(session)
 
@@ -162,7 +162,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
     end
 
-    context  '#fill_in with Date' do
+    describe '#fill_in with Date' do
       before do
         session.visit('/form')
         session.find(:css, '#form_date').execute_script <<-JS
@@ -194,7 +194,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
     end
 
-    context '#fill_in with { clear: Array } fill_options' do
+    describe '#fill_in with { clear: Array } fill_options' do
       it 'should pass the array through to the element' do
         # this is mainly for use with [[:control, 'a'], :backspace] - however since that is platform dependant I'm testing with something less useful
         session.visit('/form')
@@ -299,8 +299,9 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
     describe 'Element#click' do
       it 'should handle fixed headers/footers' do
         session.visit('/with_fixed_header_footer')
-        # session.click_link('Go to root')
-        session.find(:link, 'Go to root').click
+        session.using_wait_time(2) do
+          session.find(:link, 'Go to root').click
+        end
         expect(session).to have_current_path('/')
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.29.0
+  version: 3.31.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -744,7 +744,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,