capybara 3.18.0 → 3.19.0

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

@@ -13,6 +13,17 @@ 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)
 

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

@@ -141,11 +141,6 @@ Capybara::SpecHelper.spec '#select' do
       @session.select('Other', from: 'form_title')
       expect(@session.find_field('form_title').value).not_to eq 'Other'
     end
-
-    it 'should warn' do
-      expect { @session.select('Other', from: 'form_title') }.to \
-        output(/^Attempt to select disabled option: Other/).to_stderr
-    end
   end
 
   context 'with multiple select' do

data/lib/capybara/spec/test_app.rb

@@ -18,7 +18,6 @@ class TestApp < Sinatra::Base
   set :raise_errors, true
   set :show_exceptions, false
 
-  @@form_post_count = 0
   # Also check lib/capybara/spec/views/*.erb for pages not listed here
 
   get '/' do
@@ -176,8 +175,8 @@ class TestApp < Sinatra::Base
   end
 
   post '/form' do
-    @@form_post_count += 1
-    '<pre id="results">' + params[:form].merge('post_count' => @@form_post_count).to_yaml + '</pre>'
+    self.class.form_post_count += 1
+    '<pre id="results">' + params[:form].merge('post_count' => self.class.form_post_count).to_yaml + '</pre>'
   end
 
   post '/upload_empty' do
@@ -212,6 +211,12 @@ class TestApp < Sinatra::Base
       'No files uploaded'
     end
   end
+
+  class << self
+    attr_accessor :form_post_count
+  end
+
+  @form_post_count = 0
 end
 
 Rack::Handler::Puma.run TestApp, Port: 8070 if $PROGRAM_NAME == __FILE__

data/lib/capybara/version.rb

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

data/lib/capybara/window.rb

@@ -49,7 +49,7 @@ module Capybara
     # @return [Boolean] whether this window is the window in which commands are being executed
     def current?
       @driver.current_window_handle == @handle
-    rescue @driver.no_such_window_error # rubocop:disable Naming/RescuedExceptionsVariableName
+    rescue @driver.no_such_window_error # _rubocop:disable Naming/RescuedExceptionsVariableName
       false
     end
 

data/spec/minitest_spec_spec.rb

@@ -124,6 +124,7 @@ class MinitestSpecTest < Minitest::Spec
   it 'supports style expectations' do
     skip "Rack test doesn't support style" if Capybara.current_driver == :rack_test
     visit('/with_html')
+    find(:css, '#second').must_have_style('display' => 'inline') # deprecated
     find(:css, '#second').must_match_style('display' => 'inline')
   end
 end

data/spec/selector_spec.rb

@@ -164,25 +164,28 @@ RSpec.describe Capybara do
 
     describe 'xpath' do
       it 'uses filter names passed in' do
-        selector = Capybara::Selector.new :test do
+        Capybara.add_selector :test do
           xpath(:something, :other) { |_locator| XPath.descendant }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
 
         expect(selector.expression_filters.keys).to include(:something, :other)
       end
 
       it 'gets filter names from block if none passed to xpath method' do
-        selector = Capybara::Selector.new :test do
+        Capybara.add_selector :test do
           xpath { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
 
         expect(selector.expression_filters.keys).to include(:valid3, :valid4)
       end
 
       it 'ignores block parameters if names passed in' do
-        selector = Capybara::Selector.new :test do
+        Capybara.add_selector :test do
           xpath(:valid1) { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
 
         expect(selector.expression_filters.keys).to include(:valid1)
         expect(selector.expression_filters.keys).not_to include(:valid3, :valid4)
@@ -202,25 +205,28 @@ RSpec.describe Capybara do
       end
 
       it 'uses filter names passed in' do
-        selector = Capybara::Selector.new :text do
+        Capybara.add_selector :test do
           css(:name, :other_name) { |_locator| '' }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
 
         expect(selector.expression_filters.keys).to include(:name, :other_name)
       end
 
       it 'gets filter names from block if none passed to css method' do
-        selector = Capybara::Selector.new :test do
+        Capybara.add_selector :test do
           css { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
 
         expect(selector.expression_filters.keys).to include(:valid3, :valid4)
       end
 
       it 'ignores block parameters if names passed in' do
-        selector = Capybara::Selector.new :test do
+        Capybara.add_selector :test do
           css(:valid1) { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
         end
+        selector = Capybara::Selector.new :test, config: nil, format: nil
 
         expect(selector.expression_filters.keys).to include(:valid1)
         expect(selector.expression_filters.keys).not_to include(:valid3, :valid4)

data/spec/selenium_spec_firefox.rb

@@ -53,9 +53,6 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumFirefox, 'selenium', capyba
     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'

data/spec/selenium_spec_firefox_remote.rb

@@ -63,9 +63,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'

data/spec/selenium_spec_ie.rb

@@ -28,7 +28,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']
@@ -110,6 +110,8 @@ 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'
   end
 end
 

data/spec/server_spec.rb

@@ -83,7 +83,7 @@ RSpec.describe Capybara::Server do
       server = Capybara::Server.new(app).boot
 
       expect do
-        Net::HTTP.start(server.host, server.port) { |http| http.get('/__idntify__') }
+        Net::HTTP.start(server.host, server.port, max_retries: 0) { |http| http.get('/__idntify__') }
       end.to raise_error(EOFError)
 
       res = Net::HTTP.start(server.host, server.port, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE) do |https|

data/spec/shared_selenium_session.rb

@@ -360,7 +360,7 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         pending "Selenium remote doesn't support transferring a directory" if remote?(session)
         pending "Headless Chrome doesn't support directory upload - https://bugs.chromium.org/p/chromedriver/issues/detail?id=2521&q=directory%20upload&colspec=ID%20Status%20Pri%20Owner%20Summary" if chrome?(session) && ENV['HEADLESS']
         pending "IE doesn't support uploading a directory" if ie?(session)
-        pending 'Chrome/chromedriver 73 breaks this' unless chrome_lt?(73, session)
+        pending 'Chrome/chromedriver 73 breaks this' if chrome?(session) && !chrome_lt?(73, session)
         pending "Safari doesn't support uploading a directory" if safari?(session)
 
         session.visit('/form')

data/spec/spec_helper.rb

@@ -1,9 +1,16 @@
 # frozen_string_literal: true
 
 require 'rspec/expectations'
-require 'capybara/spec/spec_helper'
 require 'webdrivers' if ENV['CI']
 require 'selenium_statistics'
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear! do
+    add_filter '/lib/capybara/driver/'
+    add_filter '/lib/capybara/registrations/'
+  end
+end
+require 'capybara/spec/spec_helper'
 
 module Capybara
   module SpecHelper
@@ -57,7 +64,7 @@ module Capybara
       mod = mod::Service if ::Selenium::WebDriver::Service.respond_to? :driver_path
       path = mod.driver_path
       path = path.call if path.respond_to? :call
-      $stdout.puts `#{path} --version`
+      $stdout.puts `#{path.gsub(' ', '\ ')} --version`
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.18.0
+  version: 3.19.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -124,6 +124,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +250,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec-instafail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -417,6 +445,7 @@ files:
 - lib/capybara/rspec/matchers/base.rb
 - lib/capybara/rspec/matchers/become_closed.rb
 - lib/capybara/rspec/matchers/compound.rb
+- lib/capybara/rspec/matchers/count_sugar.rb
 - lib/capybara/rspec/matchers/have_current_path.rb
 - lib/capybara/rspec/matchers/have_selector.rb
 - lib/capybara/rspec/matchers/have_text.rb
@@ -427,6 +456,28 @@ files:
 - lib/capybara/selector/builders/css_builder.rb
 - lib/capybara/selector/builders/xpath_builder.rb
 - lib/capybara/selector/css.rb
+- lib/capybara/selector/definition.rb
+- lib/capybara/selector/definition/button.rb
+- lib/capybara/selector/definition/checkbox.rb
+- lib/capybara/selector/definition/css.rb
+- lib/capybara/selector/definition/datalist_input.rb
+- lib/capybara/selector/definition/datalist_option.rb
+- lib/capybara/selector/definition/element.rb
+- lib/capybara/selector/definition/field.rb
+- lib/capybara/selector/definition/fieldset.rb
+- lib/capybara/selector/definition/file_field.rb
+- lib/capybara/selector/definition/fillable_field.rb
+- lib/capybara/selector/definition/frame.rb
+- lib/capybara/selector/definition/id.rb
+- lib/capybara/selector/definition/label.rb
+- lib/capybara/selector/definition/link.rb
+- lib/capybara/selector/definition/link_or_button.rb
+- lib/capybara/selector/definition/option.rb
+- lib/capybara/selector/definition/radio_button.rb
+- lib/capybara/selector/definition/select.rb
+- lib/capybara/selector/definition/table.rb
+- lib/capybara/selector/definition/table_row.rb
+- lib/capybara/selector/definition/xpath.rb
 - lib/capybara/selector/filter.rb
 - lib/capybara/selector/filter_set.rb
 - lib/capybara/selector/filters/base.rb
@@ -448,6 +499,7 @@ files:
 - lib/capybara/selenium/node.rb
 - lib/capybara/selenium/nodes/chrome_node.rb
 - lib/capybara/selenium/nodes/firefox_node.rb
+- lib/capybara/selenium/nodes/ie_node.rb
 - lib/capybara/selenium/nodes/safari_node.rb
 - lib/capybara/selenium/patches/pause_duration_fix.rb
 - lib/capybara/selenium/patches/persistent_client.rb