capybara 3.4.0 → 3.5.0

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

@@ -94,6 +94,21 @@ Capybara::SpecHelper.spec '#attach_file' do
       expect(@session.body).to include(File.read(@another_test_file_path))
       expect(@session.body).not_to include(File.read(@test_file_path))
     end
+
+    it 'should fire change once when uploading multiple files from empty', requires: [:js] do
+      @session.visit('with_js')
+      @session.attach_file('multiple-file',
+                           [@test_file_path, @another_test_file_path].map { |f| with_os_path_separators(f) })
+      expect(@session).to have_css('.file_change', count: 1)
+    end
+
+    it 'should fire change once for each set of files uploaded', requires: [:js] do
+      @session.visit('with_js')
+      @session.attach_file('multiple-file', [@test_jpg_file_path].map { |f| with_os_path_separators(f) })
+      @session.attach_file('multiple-file',
+                           [@test_file_path, @another_test_file_path].map { |f| with_os_path_separators(f) })
+      expect(@session).to have_css('.file_change', count: 2)
+    end
   end
 
   context "with a locator that doesn't exist" do

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

@@ -195,6 +195,13 @@ Capybara::SpecHelper.spec '#check' do
           @session.click_button('awesome')
           expect(extract_results(@session)['cars']).to include('pagani')
         end
+
+        it 'should check via the label if input is visible but blocked by another element' do
+          expect(@session.find(:checkbox, 'form_cars_bugatti', unchecked: true, visible: :all)).to be_truthy
+          @session.check('form_cars_bugatti', allow_label_click: true)
+          @session.click_button('awesome')
+          expect(extract_results(@session)['cars']).to include('bugatti')
+        end
       end
     end
   end

data/lib/capybara/spec/session/element/matches_selector_spec.rb

@@ -24,6 +24,17 @@ Capybara::SpecHelper.spec '#match_selector?' do
     expect(@element).to match_selector('span.number')
   end
 
+  it 'should work with elements located via a sibling selector' do
+    sibling = @element.sibling(:css, 'span', text: 'Other span')
+    expect(sibling).to match_selector(:xpath, '//span')
+    expect(sibling).to match_selector(:css, 'span')
+  end
+
+  it 'should work with the html element' do
+    html = @session.find('/html')
+    expect(html).to match_selector(:css, 'html')
+  end
+
   context 'with text' do
     it 'should discard all matches where the given string is not contained' do
       expect(@element).to match_selector('//span', text: '42')

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

@@ -34,6 +34,11 @@ Capybara::SpecHelper.spec '#has_text?' do
     expect(@session).to have_text('text with   whitespace')
   end
 
+  it 'should search whitespace collapsed text' do
+    @session.visit('/with_html')
+    expect(@session).to have_text('text with whitespace', normalize_ws: true)
+  end
+
   it 'should be false if the given text is not on the page' do
     @session.visit('/with_html')
     expect(@session).not_to have_text('xxxxyzzz')

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

@@ -185,6 +185,12 @@ New line after and before textarea tag
     <label for="form_cars_ferrari">Ferrari</label>
     <input type="checkbox" value="pagani" name="form[cars][]" id="form_cars_pagani" style="position: absolute; left: -9999px"/>
     <label for="form_cars_pagani">Pagani</label>
+    <div style="position: relative;">
+      <input type="checkbox" value="bugatti" name="form[cars][]" id="form_cars_bugatti"/>
+      <div style="position: absolute; top: 0; right: 0; bottom: 0; left: 0; background-color: #fff;">
+        <label for="form_cars_bugatti">Bugatti</label>
+      </div>
+    </div>
     <input type="checkbox" value="ariel" name="form[cars][]" id="form_cars_ariel" style="display: none"/>
     <input type="checkbox" value="porsche" name="form[cars][]" id="form_cars_porsche" checked="checked" style="display: none"/>
     <label>

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

@@ -125,6 +125,10 @@
       <input type="file" id="hidden_file" style="opacity:0; display: none;">
     </p>
 
+    <p>
+      <input type="file" id="multiple-file" multiple="multiple"/>
+    </p>
+
     <div id="drag_scroll">
       <p>This is a draggable element.</p>
     </div>

data/lib/capybara/version.rb

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

data/spec/dsl_spec.rb

@@ -11,7 +11,8 @@ Capybara::SpecHelper.run_specs TestClass.new, 'DSL', capybara_skip: %i[
   js modals screenshot frames windows send_keys server hover about_scheme psc download css
 ] do |example|
   case example.metadata[:full_description]
-  when /doesn't raise exception on a nil current_url$/
+  when /doesn't raise exception on a nil current_url$/,
+       /#refute_selector should warn not to use$/
     skip 'Only makes sense when there is a real driver'
   end
 end

data/spec/minitest_spec.rb

@@ -47,6 +47,14 @@ class MinitestTest < Minitest::Test
     assert_no_css('select#not_form_title')
   end
 
+  def test_assert_selector
+    assert_selector(:css, 'select#form_title')
+    assert_selector(:xpath, './/select[@id="form_title"]')
+    assert_no_selector(:css, 'select#not_form_title')
+    assert_no_selector(:xpath, './/select[@id="not_form_title"]')
+    refute_selector(:css, 'select#not_form_title')
+  end
+
   def test_assert_link
     visit('/with_html')
     assert_link('A link')
@@ -132,6 +140,6 @@ RSpec.describe 'capybara/minitest' do
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include('18 runs, 44 assertions, 0 failures, 0 errors, 1 skips')
+    expect(output.string).to include('19 runs, 49 assertions, 0 failures, 0 errors, 1 skips')
   end
 end

data/spec/rspec/shared_spec_matchers.rb

@@ -496,11 +496,11 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
       expect(have_link('Just a link').description).to eq('have visible link "Just a link"')
     end
 
-    it 'passes if there is such a button' do
+    it 'passes if there is such a link' do
       expect(html).to have_link('Just a link')
     end
 
-    it 'fails if there is no such button' do
+    it 'fails if there is no such link' do
       expect do
         expect(html).to have_link('No such Link')
       end.to raise_error(/expected to find link "No such Link"/)

data/spec/selenium_spec_chrome_remote.rb

@@ -30,6 +30,10 @@ def ensure_selenium_running!
   end
 end
 
+def selenium_gte?(version)
+  defined?(Selenium::WebDriver::VERSION) && (Selenium::WebDriver::VERSION.to_f >= version)
+end
+
 Capybara.register_driver :selenium_chrome_remote do |app|
   ensure_selenium_running!
 
@@ -60,8 +64,10 @@ skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLE
 
 Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_REMOTE_DRIVER.to_s, capybara_skip: skipped_tests do |example|
   case example.metadata[:full_description]
-  when 'Capybara::Session selenium_chrome_remote #attach_file with multipart form should not break when using HTML5 multiple file input uploading multiple files'
-    pending "Selenium with Remote Chrome doesn't support multiple file upload"
+  when 'Capybara::Session selenium_chrome_remote #attach_file with multipart form should not break when using HTML5 multiple file input uploading multiple files',
+       'Capybara::Session selenium_chrome_remote #attach_file with multipart form should fire change once for each set of files uploaded',
+       'Capybara::Session selenium_chrome_remote #attach_file with multipart form should fire change once when uploading multiple files from empty'
+    pending "Selenium with Remote Chrome doesn't support multiple file upload" unless selenium_gte?(3.14)
   end
 end
 

data/spec/selenium_spec_firefox_remote.rb

@@ -72,6 +72,9 @@ Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVE
     skip 'Firefox insists on prompting without providing a way to suppress'
   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 currently"
+  when 'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once for each set of files uploaded',
+       'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once when uploading multiple files from empty'
+    pending 'Due to having to work around selenium remote lack of multiple file upload support the change event count is off'
   end
 end
 

data/spec/selenium_spec_ie.rb

@@ -22,10 +22,18 @@ skipped_tests = %i[response_headers status_code trigger modals hover form_attrib
 
 $stdout.puts `#{Selenium::WebDriver::IE.driver_path} --version` if ENV['CI']
 
+TestSessions::SeleniumIE.current_window.resize_to(1600, 1200)
+
 Capybara::SpecHelper.run_specs TestSessions::SeleniumIE, 'selenium', capybara_skip: skipped_tests do |example|
-  case example.metadata[:description]
+  case example.metadata[:full_description]
   when /#refresh it reposts$/
     skip 'Firefox and Edge insist on prompting without providing a way to suppress'
+  when /#click_link can download a file$/
+    skip 'Not sure how to configure IE for automatic downloading'
+  when /#fill_in with Date /
+    pending "IE 11 doesn't support date input types"
+  when /#click_link_or_button with :disabled option happily clicks on links which incorrectly have the disabled attribute$/
+    pending 'IE 11 obeys non-standard disabled attribute on anchor tag'
   end
 end
 

data/spec/selenium_spec_marionette.rb

@@ -62,6 +62,11 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, 'selenium', cap
     skip 'Firefox insists on prompting without providing a way to suppress'
   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 currently"
+  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 marionette_lt?(62, @session)
   end
 end
 

data/spec/shared_selenium_session.rb

@@ -39,14 +39,14 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
 
       it 'should have return code 1 when running selenium_driver_rspec_failure.rb' do
-        skip if headless_or_remote?
+        skip 'only setup for local non-headless' if headless_or_remote?
 
         system(@env, 'rspec spec/fixtures/selenium_driver_rspec_failure.rb', out: File::NULL, err: File::NULL)
         expect($CHILD_STATUS.exitstatus).to eq(1)
       end
 
       it 'should have return code 0 when running selenium_driver_rspec_success.rb' do
-        skip if headless_or_remote?
+        skip 'only setup for local non-headless' if headless_or_remote?
 
         system(@env, 'rspec spec/fixtures/selenium_driver_rspec_success.rb', out: File::NULL, err: File::NULL)
         expect($CHILD_STATUS.exitstatus).to eq(0)
@@ -169,11 +169,13 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
 
       it 'should generate standard events on changing value' do
+        pending "IE 11 doesn't support date input type" if ie?(session)
         session.fill_in('form_date', with: Date.today)
         expect(session.evaluate_script('window.capybara_formDateFiredEvents')).to eq %w[focus input change]
       end
 
       it 'should not generate input and change events if the value is not changed' do
+        pending "IE 11 doesn't support date input type" if ie?(session)
         session.fill_in('form_date', with: Date.today)
         session.fill_in('form_date', with: Date.today)
         # Chrome adds an extra focus for some reason - ok for now
@@ -202,13 +204,15 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
 
       it 'handles namespaces' do
+        pending "IE 11 doesn't handle all XPath querys (namespace-uri, etc)" if ie?(session)
         session.visit '/with_namespace'
-        rect = session.find(:css, 'div svg rect')
+        rect = session.find(:css, 'div svg rect:first-of-type')
         expect(rect.path).to eq("/HTML/BODY/DIV/./*[((local-name(.) = 'svg') and (namespace-uri(.) = 'http://www.w3.org/2000/svg'))]/./*[((local-name(.) = 'rect') and (namespace-uri(.) = 'http://www.w3.org/2000/svg'))][1]")
         expect(session.find(:xpath, rect.path)).to eq rect
       end
 
       it 'handles case sensitive element names' do
+        pending "IE 11 doesn't handle all XPath querys (namespace-uri, etc)" if ie?(session)
         session.visit '/with_namespace'
         els = session.all(:css, 'div *', visible: :all)
         expect { els.map(&:path) }.not_to raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable