capybara 3.10.1 → 3.11.0

data/lib/capybara/version.rb

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

data/spec/rack_test_spec.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
+nokogumbo_required = begin
+                       require 'nokogumbo'
+                       true
+                     rescue LoadError
+                       false
+                     end
 
 module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
@@ -231,6 +237,15 @@ RSpec.describe Capybara::RackTest::Driver do
   end
 end
 
+RSpec.describe 'Capybara::String' do
+  it 'should use gumbo' do
+    skip 'Only  valid if gumbo is included' unless nokogumbo_required
+    allow(Nokogiri).to receive(:HTML5).and_call_original
+    Capybara.string('<div id=test_div></div>')
+    expect(Nokogiri).to have_received(:HTML5)
+  end
+end
+
 module CSSHandlerIncludeTester
   def dont_extend_css_handler
     raise 'should never be called'

data/spec/regexp_dissassembler_spec.rb

@@ -27,18 +27,37 @@ RSpec.describe Capybara::Selector::RegexpDisassembler do
       /abc./ => %w[abc],
       /abc.*/ => %w[abc],
       /abc.def/ => %w[abc def],
-      /abc.def.ghi/ => %w[abc def ghi]
+      /abc.def.ghi/ => %w[abc def ghi],
+      /abc.abcd.abcde/ => %w[abcde],
+      /.*/ => []
     )
   end
 
-  it 'handles optional characters' do
-    verify_strings(
+  it 'ignores optional characters for substrings' do
+    {
       /abc*def/ => %w[ab def],
       /abc*/ => %w[ab],
+      /c*/ => [],
       /abc?def/ => %w[ab def],
       /abc?/ => %w[ab],
       /abc?def?/ => %w[ab de],
-      /abc?def?g/ => %w[ab de g]
+      /abc?def?g/ => %w[ab de g],
+      /d?/ => []
+    }.each do |regexp, expected|
+      expect(Capybara::Selector::RegexpDisassembler.new(regexp).substrings).to eq expected
+    end
+  end
+
+  it 'handles optional characters for #alternated_substrings' do
+    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?/ => []
     )
   end
 
@@ -47,7 +66,7 @@ RSpec.describe Capybara::Selector::RegexpDisassembler do
       /abc[a-z]/ => %w[abc],
       /abc[a-z]def[0-9]g/ => %w[abc def g],
       /[0-9]abc/ => %w[abc],
-      /[0-9]+/ => %w[],
+      /[0-9]+/ => [],
       /abc[0-9&&[^7]]/ => %w[abc]
     )
   end
@@ -88,11 +107,64 @@ RSpec.describe Capybara::Selector::RegexpDisassembler do
     )
   end
 
-  it 'handles alternation' do
-    verify_strings(
+  it 'ignores alternation for #substrings' do
+    {
       /abc|def/ => [],
       /ab(?:c|d)/ => %w[ab],
-      /ab(c|d)ef/ => %w[ab ef]
+      /ab(c|d|e)fg/ => %w[ab fg],
+      /ab?(c|d)fg/ => %w[a fg],
+      /ab(c|d)ef/ => %w[ab ef],
+      /ab(cd?|ef)g/ => %w[ab g],
+      /ab(cd|ef*)g/ => %w[ab g],
+      /ab|cd*/ => [],
+      /cd(?:ef|gh)|xyz/ => [],
+      /(cd(?:ef|gh)|xyz)/ => [],
+      /cd(ef|gh)+/ => %w[cd],
+      /cd(ef|gh)?/ => %w[cd],
+      /cd(ef|gh)?ij/ => %w[cd ij],
+      /cd(ef|gh)+ij/ => %w[cd ij],
+      /cd(ef|gh){2}ij/ => %w[cd ij],
+      /(cd(ef|g*))/ => %w[cd],
+      /ab(cd){0,2}ef/ => %w[ab ef],
+      /ab(cd){0,1}ef/ => %w[ab ef],
+      /ab(cd|cd)ef/ => %w[ab ef],
+      /ab(cd|cd)?ef/ => %w[ab ef],
+      /ab\\?cd/ => %w[ab cd]
+    }.each do |regexp, expected|
+      expect(Capybara::Selector::RegexpDisassembler.new(regexp).substrings).to eq expected
+    end
+  end
+
+  it 'handles alternation for #alternated_substrings' do
+    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]]
     )
   end
 
@@ -152,5 +224,13 @@ RSpec.describe Capybara::Selector::RegexpDisassembler do
     hsh.each do |regexp, expected|
       expect(Capybara::Selector::RegexpDisassembler.new(regexp).substrings).to eq expected
     end
+    verify_alternated_strings(hsh, wrap: true)
+  end
+
+  def verify_alternated_strings(hsh, wrap: false)
+    hsh.each do |regexp, expected|
+      expected = [expected] if wrap && (expected != [])
+      expect(Capybara::Selector::RegexpDisassembler.new(regexp).alternated_substrings).to eq expected
+    end
   end
 end

data/spec/selector_spec.rb

@@ -301,6 +301,9 @@ RSpec.describe Capybara do
       describe ':id selector' do
         it 'finds by locator' do
           expect(string.find(:id, 'my_text_input')[:name]).to eq 'form[my_text_input]'
+          expect(string.find(:id, /my_text_input/)[:name]).to eq 'form[my_text_input]'
+          expect(string.find(:id, /_text_/)[:name]).to eq 'form[my_text_input]'
+          expect(string.find(:id, /i[nmo]/)[:name]).to eq 'form[my_text_input]'
         end
       end
 

data/spec/selenium_spec_chrome.rb

@@ -5,29 +5,23 @@ require 'selenium-webdriver'
 require 'shared_selenium_session'
 require 'rspec/shared_spec_matchers'
 
-CHROME_DRIVER = ENV['HEADLESS'] ? :selenium_chrome_headless : :selenium_chrome
+CHROME_DRIVER = :selenium_chrome
 
-Capybara.register_driver :selenium_chrome do |app|
-  driver = Capybara::Selenium::Driver.new(app, browser: :chrome)
-  driver.browser.download_path = Capybara.save_path
-  driver
-end
+browser_options = ::Selenium::WebDriver::Chrome::Options.new
+browser_options.headless! if ENV['HEADLESS']
+browser_options.add_option(:w3c, !!ENV['W3C'])
 
-Capybara.register_driver :selenium_chrome_headless do |app|
-  browser_options = ::Selenium::WebDriver::Chrome::Options.new
-  browser_options.headless!
-  browser_options.add_option(:w3c, !!ENV['W3C'])
-  driver = Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
-  driver.browser.download_path = Capybara.save_path
-  driver
+Capybara.register_driver :selenium_chrome do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options).tap do |driver|
+    driver.browser.download_path = Capybara.save_path
+  end
 end
 
 Capybara.register_driver :selenium_chrome_clear_storage do |app|
   chrome_options = {
     browser: :chrome,
-    options: ::Selenium::WebDriver::Chrome::Options.new
+    options: browser_options
   }
-  chrome_options[:options].headless! if ENV['HEADLESS']
   Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: true, clear_session_storage: true))
 end
 

data/spec/selenium_spec_chrome_remote.rb

@@ -38,11 +38,12 @@ Capybara.register_driver :selenium_chrome_remote do |app|
   ensure_selenium_running!
 
   url = "http://#{selenium_host}:#{selenium_port}/wd/hub"
-  caps = Selenium::WebDriver::Remote::Capabilities.chrome
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new
 
   Capybara::Selenium::Driver.new app,
                                  browser: :remote,
-                                 desired_capabilities: caps,
+                                 desired_capabilities: :chrome,
+                                 options: browser_options,
                                  url: url
 end
 

data/spec/selenium_spec_firefox_remote.rb

@@ -34,11 +34,12 @@ Capybara.register_driver :selenium_firefox_remote do |app|
   ensure_selenium_running!
 
   url = "http://#{selenium_host}:#{selenium_port}/wd/hub"
-  caps = Selenium::WebDriver::Remote::Capabilities.firefox
+  browser_options = ::Selenium::WebDriver::Firefox::Options.new
 
   Capybara::Selenium::Driver.new app,
                                  browser: :remote,
-                                 desired_capabilities: caps,
+                                 desired_capabilities: :firefox,
+                                 options: browser_options,
                                  url: url
 end
 
@@ -71,6 +72,9 @@ Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVE
     pending "FF < 62 doesn't support setting all files at once" if marionette_lt?(62, @session)
   when 'Capybara::Session selenium_firefox_remote #reset_session! removes ALL cookies'
     pending "Geckodriver doesn't provide a way to remove cookies outside the current domain"
+  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 marionette_gte?(63, @session)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.11.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -110,6 +110,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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
@@ -222,6 +236,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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-rspec
+  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: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -310,10 +352,18 @@ files:
 - lib/capybara/rails.rb
 - lib/capybara/result.rb
 - lib/capybara/rspec.rb
-- lib/capybara/rspec/compound.rb
 - lib/capybara/rspec/features.rb
 - lib/capybara/rspec/matcher_proxies.rb
 - lib/capybara/rspec/matchers.rb
+- lib/capybara/rspec/matchers/base.rb
+- lib/capybara/rspec/matchers/become_closed.rb
+- lib/capybara/rspec/matchers/compound.rb
+- lib/capybara/rspec/matchers/have_current_path.rb
+- lib/capybara/rspec/matchers/have_selector.rb
+- lib/capybara/rspec/matchers/have_style.rb
+- lib/capybara/rspec/matchers/have_text.rb
+- lib/capybara/rspec/matchers/have_title.rb
+- lib/capybara/rspec/matchers/match_selector.rb
 - lib/capybara/selector.rb
 - lib/capybara/selector/builders/css_builder.rb
 - lib/capybara/selector/builders/xpath_builder.rb
@@ -446,6 +496,7 @@ files:
 - lib/capybara/spec/views/header_links.erb
 - lib/capybara/spec/views/host_links.erb
 - lib/capybara/spec/views/initial_alert.erb
+- lib/capybara/spec/views/obscured.erb
 - lib/capybara/spec/views/path.erb
 - lib/capybara/spec/views/popup_one.erb
 - lib/capybara/spec/views/popup_two.erb

data/lib/capybara/rspec/compound.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-if defined?(::RSpec::Expectations::Version)
-  module Capybara
-    module RSpecMatchers
-      module Compound
-        include ::RSpec::Matchers::Composable
-
-        def and(matcher)
-          And.new(self, matcher)
-        end
-
-        def and_then(matcher)
-          ::RSpec::Matchers::BuiltIn::Compound::And.new(self, matcher)
-        end
-
-        def or(matcher)
-          Or.new(self, matcher)
-        end
-
-        class CapybaraEvaluator
-          def initialize(actual)
-            @actual = actual
-            @match_results = Hash.new { |hsh, matcher| hsh[matcher] = matcher.matches?(@actual) }
-          end
-
-          def matcher_matches?(matcher)
-            @match_results[matcher]
-          end
-
-          def reset
-            @match_results.clear
-          end
-        end
-
-        # @api private
-        module Synchronizer
-          def match(_expected, actual)
-            @evaluator = CapybaraEvaluator.new(actual)
-            syncer = sync_element(actual)
-            begin
-              syncer.synchronize do
-                @evaluator.reset
-                raise ::Capybara::ElementNotFound unless synchronized_match?
-
-                true
-              end
-            rescue StandardError
-              false
-            end
-          end
-
-          def sync_element(el)
-            if el.respond_to? :synchronize
-              el
-            elsif el.respond_to? :current_scope
-              el.current_scope
-            else
-              Capybara.string(el)
-            end
-          end
-        end
-
-        class And < ::RSpec::Matchers::BuiltIn::Compound::And
-          include Synchronizer
-
-        private
-
-          def synchronized_match?
-            [matcher_1_matches?, matcher_2_matches?].all?
-          end
-        end
-
-        class Or < ::RSpec::Matchers::BuiltIn::Compound::Or
-          include Synchronizer
-
-        private
-
-          def synchronized_match?
-            [matcher_1_matches?, matcher_2_matches?].any?
-          end
-        end
-      end
-    end
-  end
-end