capybara 3.9.0 → 3.10.0

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

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# because of the methods being tested. In tests using Capybara this type of behavior should be implemented
+# using Capybara provided assertions with builtin waiting behavior.
+
 Capybara::SpecHelper.spec 'node' do
   before do
     @session.visit('/with_html')
@@ -478,7 +482,7 @@ Capybara::SpecHelper.spec 'node' do
       expect(@session.find(:css, '#address1_city').value).to eq 'Oceanside'
     end
 
-    it 'should hold modifers at top level' do
+    it 'should hold modifiers at top level' do
       @session.visit('/form')
       @session.find(:css, '#address1_city').send_keys('ocean', :shift, 'side')
       expect(@session.find(:css, '#address1_city').value).to eq 'oceanSIDE'

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

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# because of the methods being tested. In tests using Capybara this type of behavior should be implemented
+# using Capybara provided assertions with builtin waiting behavior.
+
 Capybara::SpecHelper.spec '#refresh' do
   it 'reload the page' do
     @session.visit('/form')

data/lib/capybara/spec/session/window/switch_to_window_spec.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# because of the methods being tested. In tests using Capybara this type of behavior should be implemented
+# using Capybara provided assertions with builtin waiting behavior.
+
 Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
   before do
     @window = @session.current_window

data/lib/capybara/spec/session/window/window_opened_by_spec.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# because of the methods being tested. In tests using Capybara this type of behavior should be implemented
+# using Capybara provided assertions with builtin waiting behavior.
+
 Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
   before do
     @window = @session.current_window

data/lib/capybara/spec/session/window/window_spec.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# because of the methods being tested. In tests using Capybara this type of behavior should be implemented
+# using Capybara provided assertions with builtin waiting behavior.
+
 Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   before do
     @window = @session.current_window

data/lib/capybara/spec/session/window/windows_spec.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Note: This file uses `sleep` to sync up parts of the tests. This is only implemented like this
+# because of the methods being tested. In tests using Capybara this type of behavior should be implemented
+# using Capybara provided assertions with builtin waiting behavior.
+
 Capybara::SpecHelper.spec '#windows', requires: [:windows] do
   before do
     @window = @session.current_window

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

@@ -470,6 +470,8 @@ New line after and before textarea tag
   <input type="submit" name="form[submit_form1]" value="submit_form1" id="submit_form1"/>
 </form>
 
+<button type="submit" name="form[outside_button]" value="outside_button" form="form2">Outside!</button>
+
 <form id="form2" action="/form" method="post">
   <input type="text" name="form[which_form]" value="form2" id="form_which_form2"/>
   <input type="submit" name="form[unused]" value="unused"/>
@@ -486,8 +488,6 @@ New line after and before textarea tag
 </select>
 
 <input type="submit" name="form[outside_submit]" value="outside_submit" form="form1"/>
-<button type="submit" name="form[outside_button]" value="outside_button" form="form2">Outside!</button>
-
 
 <form id="get-form" action="/form/get?foo=bar" method="get">
   <p>

data/lib/capybara/version.rb

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

data/spec/minitest_spec.rb

@@ -105,6 +105,10 @@ class MinitestTest < Minitest::Test
     assert_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
   end
 
+  def test_assert_any_of_selectors
+    assert_any_of_selectors(:css, 'input#not_on_page', 'select#form_other_title')
+  end
+
   def test_assert_matches_selector
     assert_matches_selector(find(:field, 'customer_email'), :field, 'customer_email')
     assert_not_matches_selector(find(:select, 'form_title'), :field, 'customer_email')
@@ -144,6 +148,6 @@ RSpec.describe 'capybara/minitest' do
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include('19 runs, 49 assertions, 0 failures, 0 errors, 1 skips')
+    expect(output.string).to include('20 runs, 50 assertions, 0 failures, 0 errors, 1 skips')
   end
 end

data/spec/minitest_spec_spec.rb

@@ -98,6 +98,10 @@ class MinitestSpecTest < Minitest::Spec
     page.must_have_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
   end
 
+  it 'supports any_of_selectors expectations' do
+    page.must_have_any_of_selectors(:css, 'select#form_other_title', 'input#not_on_page')
+  end
+
   it 'supports match_selector expectations' do
     find(:field, 'customer_email').must_match_selector(:field, 'customer_email')
     find(:select, 'form_title').wont_match_selector(:field, 'customer_email')
@@ -140,7 +144,7 @@ RSpec.describe 'capybara/minitest/spec' do
     reporter.start
     MinitestSpecTest.run reporter, {}
     reporter.report
-    expect(output.string).to include('19 runs, 41 assertions, 1 failures, 0 errors, 1 skips')
+    expect(output.string).to include('20 runs, 42 assertions, 1 failures, 0 errors, 1 skips')
     # Make sure error messages are displayed
     expect(output.string).to include('expected to find select box "non_existing_form_title" but there were no matches')
   end

data/spec/regexp_dissassembler_spec.rb

@@ -12,9 +12,11 @@ RSpec.describe Capybara::Selector::RegexpDisassembler do
 
   it 'handles escaped characters' do
     verify_strings(
-      /abc\\def/ => %w[abc def],
-      /\nabc/ => %w[abc],
-      %r{abc/} => %w[abc/]
+      /abc\\def/ => %w[abc\def],
+      /abc\.def/ => %w[abc.def],
+      /\nabc/ => ["\nabc"],
+      %r{abc/} => %w[abc/],
+      /ab\++cd/ => %w[ab+ cd]
     )
   end
 

data/spec/rspec_spec.rb

@@ -111,6 +111,26 @@ RSpec.describe 'capybara/rspec' do
           expect(@test_class_instance.find(:css, 'span.number').text.to_i).to @test_class_instance.within(1).of(41)
         end
       end
+
+      context 'when `match_when_negated` is not defined in a matcher' do
+        before do
+          RSpec::Matchers.define :only_match_matcher do |expected|
+            match do |actual|
+              !(actual ^ expected)
+            end
+          end
+        end
+
+        it 'can be called with `not_to`' do
+          # This test is for a bug in jruby where `super` isn't defined correctly - https://github.com/jruby/jruby/issues/4678
+          # Reported in https://github.com/teamcapybara/capybara/issues/2115
+          @test_class_instance.instance_eval do
+            expect do
+              expect(true).not_to only_match_matcher(false) # rubocop:disable RSpec/ExpectActual
+            end.not_to raise_error
+          end
+        end
+      end
     end
 
     it 'should not include Capybara' do

data/spec/selector_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Capybara do
                 <p>Yes it is</p>
               </div>
               <p class="bb cc">Some Content</p>
-              <p class="bb dd"></p>
+              <p class="bb dd !mine"></p>
             </div>
             <div id="#special">
             </div>
@@ -54,11 +54,27 @@ RSpec.describe Capybara do
       end
 
       Capybara.add_selector :custom_css_selector do
-        css { |selector| selector }
+        css(:name, :other_name) do |selector, name: nil, **|
+          selector ||= ''
+          selector += "[name='#{name}']" if name
+          selector
+        end
+
+        expression_filter(:placeholder) do |expr, val|
+          expr + "[placeholder='#{val}']"
+        end
+
+        expression_filter(:value) do |expr, val|
+          expr + "[value='#{val}']"
+        end
+
+        expression_filter(:title) do |expr, val|
+          expr + "[title='#{val}']"
+        end
       end
 
       Capybara.add_selector :custom_xpath_selector do
-        xpath { |selector| selector }
+        xpath(:valid1, :valid2) { |selector| selector }
       end
     end
 
@@ -104,6 +120,71 @@ RSpec.describe Capybara do
       end
     end
 
+    describe 'xpath' do
+      it 'uses filter names passed in' do
+        selector = Capybara::Selector.new :test do
+          xpath(:something, :other) { |_locator| XPath.descendant }
+        end
+
+        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
+          xpath { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
+        end
+
+        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
+          xpath(:valid1) { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
+        end
+
+        expect(selector.expression_filters.keys).to include(:valid1)
+        expect(selector.expression_filters.keys).not_to include(:valid3, :valid4)
+      end
+    end
+
+    describe 'css' do
+      it "supports filters specified in 'css' definition" do
+        expect(string).to have_selector(:custom_css_selector, 'input', name: 'form[my_text_input]')
+        expect(string).to have_no_selector(:custom_css_selector, 'input', name: 'form[not_my_text_input]')
+      end
+
+      it 'supports explicitly defined expression filters' do
+        expect(string).to have_selector(:custom_css_selector, placeholder: 'my text')
+        expect(string).to have_no_selector(:custom_css_selector, placeholder: 'not my text')
+        expect(string).to have_selector(:custom_css_selector, value: 'click me', title: 'submit button')
+      end
+
+      it 'uses filter names passed in' do
+        selector = Capybara::Selector.new :text do
+          css(:name, :other_name) { |_locator| '' }
+        end
+
+        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
+          css { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
+        end
+
+        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
+          css(:valid1) { |_locator, valid3:, valid4: nil| "#{valid3} #{valid4}" }
+        end
+
+        expect(selector.expression_filters.keys).to include(:valid1)
+        expect(selector.expression_filters.keys).not_to include(:valid3, :valid4)
+      end
+    end
+
     describe 'builtin selectors' do
       context 'when locator is nil' do
         it 'devolves to just finding element types' do
@@ -172,6 +253,11 @@ RSpec.describe Capybara do
           expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['!cc', '!dd', 'bb']).size).to eq 1
         end
 
+        it 'handles classes starting with ! by requiring negated negated first' do
+          expect(string.all(:custom_css_selector, 'div, p', class: ['!!!mine']).size).to eq 1
+          expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['!!!mine']).size).to eq 1
+        end
+
         it "works with 'special' characters" do
           expect(string.find(:custom_css_selector, 'input', class: '.special')[:id]).to eq 'file'
           expect(string.find(:custom_css_selector, 'input', class: '2checkbox')[:id]).to eq '2checkbox'

data/spec/selenium_spec_chrome.rb

@@ -7,10 +7,6 @@ require 'rspec/shared_spec_matchers'
 
 CHROME_DRIVER = ENV['HEADLESS'] ? :selenium_chrome_headless : :selenium_chrome
 
-# if ENV['HEADLESS'] && ENV['TRAVIS']
-#   Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta'
-# end
-
 Capybara.register_driver :selenium_chrome do |app|
   driver = Capybara::Selenium::Driver.new(app, browser: :chrome)
   driver.browser.download_path = Capybara.save_path
@@ -19,8 +15,8 @@ end
 
 Capybara.register_driver :selenium_chrome_headless do |app|
   browser_options = ::Selenium::WebDriver::Chrome::Options.new
-  browser_options.args << '--headless'
-  browser_options.args << '--disable-gpu' if Gem.win_platform?
+  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
@@ -31,7 +27,7 @@ Capybara.register_driver :selenium_chrome_clear_storage do |app|
     browser: :chrome,
     options: ::Selenium::WebDriver::Chrome::Options.new
   }
-  chrome_options[:options].args << 'headless' if ENV['HEADLESS']
+  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_marionette.rb

@@ -6,8 +6,7 @@ require 'shared_selenium_session'
 require 'rspec/shared_spec_matchers'
 
 browser_options = ::Selenium::WebDriver::Firefox::Options.new
-browser_options.args << '--headless' if ENV['HEADLESS']
-browser_options.add_preference 'dom.file.createInChild', true
+browser_options.headless! if ENV['HEADLESS']
 # browser_options.add_option("log", {"level": "trace"})
 
 browser_options.profile = Selenium::WebDriver::Firefox::Profile.new.tap do |profile|
@@ -21,7 +20,6 @@ Capybara.register_driver :selenium_marionette do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    desired_capabilities: { marionette: true, 'moz:webdriverClick': true },
     options: browser_options,
     # Get a trace level log from geckodriver
     # :driver_opts => { args: ['-vv'] }
@@ -32,7 +30,6 @@ Capybara.register_driver :selenium_marionette_clear_storage do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    desired_capabilities: { marionette: true },
     clear_local_storage: true,
     clear_session_storage: true,
     options: browser_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.10.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -82,20 +82,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: regexp_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: xpath
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -376,6 +390,7 @@ files:
 - lib/capybara/spec/session/go_back_spec.rb
 - lib/capybara/spec/session/go_forward_spec.rb
 - lib/capybara/spec/session/has_all_selectors_spec.rb
+- lib/capybara/spec/session/has_any_selectors_spec.rb
 - lib/capybara/spec/session/has_button_spec.rb
 - lib/capybara/spec/session/has_css_spec.rb
 - lib/capybara/spec/session/has_current_path_spec.rb
@@ -455,7 +470,6 @@ files:
 - lib/capybara/spec/views/within_frames.erb
 - lib/capybara/version.rb
 - lib/capybara/window.rb
-- lib/capybara/xpath_patches.rb
 - spec/basic_node_spec.rb
 - spec/capybara_spec.rb
 - spec/css_splitter_spec.rb
@@ -511,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,

data/lib/capybara/xpath_patches.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module XPath
-  module DSL
-    def lowercase
-      method(:translate, 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ', 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ')
-    end
-
-    def uppercase
-      method(:translate, 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ', 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ')
-    end
-  end
-end
-
-module Capybara
-  module XPathPatches
-    module Renderer
-      def attribute(current, name)
-        return super if name =~ /^[a-zA-Z_:][a-zA-Z0-9_:\.\-]*$/
-
-        "#{current}/attribute::*[local-name(.) = #{string_literal(name)}]"
-      end
-    end
-  end
-end
-
-XPath::Renderer.prepend(Capybara::XPathPatches::Renderer)