capybara 2.14.0 → 2.14.1

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

@@ -22,12 +22,12 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
       Capybara.using_wait_time 2 do
         button=@session.find(:css, '#openWindowWithLongerTimeout')
         expect do
-          @session.window_opened_by(wait: 0.8) do
+          @session.window_opened_by(wait: 0.3) do
             button.click
           end
         end.to raise_error(Capybara::WindowError, zero_windows_message)
       end
-      @session.document.synchronize(2, errors: [Capybara::CapybaraError]) do
+      @session.document.synchronize(5, errors: [Capybara::CapybaraError]) do
         raise Capybara::CapybaraError if @session.windows.size != 2
       end
     end
@@ -46,7 +46,7 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
   context 'without :wait option' do
     it 'should raise error if default_max_wait_time is less than timeout' do
       button = @session.find(:css, '#openWindowWithTimeout')
-      Capybara.using_wait_time 0.4 do
+      Capybara.using_wait_time 0.1 do
         expect do
           @session.window_opened_by do
             button.click
@@ -60,7 +60,7 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
 
     it 'should find window if default_max_wait_time is more than timeout' do
       button = @session.find(:css, '#openWindowWithTimeout')
-      Capybara.using_wait_time 1.5 do
+      Capybara.using_wait_time 5 do
         window = @session.window_opened_by do
           button.click
         end

data/lib/capybara/spec/spec_helper.rb

@@ -117,7 +117,7 @@ module Capybara
     end
 
     def marionette?(session)
-      session.driver.respond_to?(:marionette?) && session.driver.marionette?
+      session.driver.respond_to?(:marionette?, true) && session.driver.send(:marionette?)
     end
 
     def rspec2?

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

@@ -235,6 +235,17 @@ New line after and before textarea tag
     </select>
   </p>
 
+  <!-- invisible multiselect and options -->
+  <p style="display: none">
+    <label for="form_dessert">Dessert</label>
+    <select name="form[dessert]" id="form_dessert" multiple="multiple">
+      <option selected="selected">Pudding</option>
+      <option>Lava cake</option>
+      <option selected="selected">Tiramisu</option>
+      <option>Panna cotta</option>
+    </select>
+  </p>
+
   <!-- visible select with invisible selected option (which some browsers may treat as visible) -->
   <p>
     <label for="form_sorbet">Sorbet</label>
@@ -245,6 +256,17 @@ New line after and before textarea tag
     </select>
   </p>
 
+  <!-- visible multiselect with invisible selected options (which some browsers may treat as visible) -->
+  <p>
+    <label for="form_cake">Cake</label>
+    <select name="form[cake]" id="form_cake" multiple="multiple">
+      <option>Butter Cake</option>
+      <option selected="selected" style="display: none">Chocolate Cake</option>
+      <option>Strawberry Cake</option>
+      <option selected="selected" style="display: none">Sponge Cake</option>
+    </select>
+  </p>
+
   <p>
     <span>First address<span>
     <label for='address1_street'>Street</label>
@@ -593,4 +615,3 @@ New line after and before textarea tag
   <label for="asterisk_input">With Asterisk<abbr title="required">*</abbr></label>
   <input id="asterisk_input" type="number"value="2016"/>
 </p>
-

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

@@ -13,7 +13,7 @@
 <span class="number">42</span>
 <span>Other span</span>
 
-<p class="para" id="first">
+<p class="para" id="first" data-random="abc\def">
   Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
   tempor incididunt ut <a href="/with_simple_html" title="awesome title" class="simple">labore</a>
   et dolore magna aliqua. Ut enim ad minim veniam,

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.14.0'
+  VERSION = '2.14.1'
 end

data/spec/capybara_spec.rb

@@ -79,6 +79,22 @@ RSpec.describe Capybara do
       Capybara.server(&server)
       expect(Capybara.server).to eq(server)
     end
+
+    it "should have :webrick registered" do
+      require 'rack/handler/webrick'
+      mock_app = double('app')
+      Capybara.server = :webrick
+      expect(Rack::Handler::WEBrick).to receive(:run)
+      Capybara.server.call(mock_app, 8000)
+    end
+
+    it "should have :puma registered" do
+      require 'rack/handler/puma'
+      mock_app = double('app')
+      Capybara.server = :puma
+      expect(Rack::Handler::Puma).to receive(:run)
+      Capybara.server.call(mock_app, 8000)
+    end
   end
 
   describe 'app_host' do

data/spec/filter_set_spec.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe Capybara::Selector::FilterSet do
+  after do
+    Capybara::Selector::FilterSet.remove(:test)
+  end
+
+  it "allows node filters" do
+    fs = Capybara::Selector::FilterSet.add(:test) do
+      filter(:node_test, :boolean) { |node, value| true }
+      expression_filter(:expression_test, :boolean) { |expr, value| true }
+    end
+
+    expect(fs.node_filters.keys).to include(:node_test)
+    expect(fs.node_filters.keys).not_to include(:expression_test)
+  end
+
+  it "allows expression filters" do
+    fs = Capybara::Selector::FilterSet.add(:test) do
+      filter(:node_test, :boolean) { |node, value| true }
+      expression_filter(:expression_test, :boolean) { |expr, value| true }
+    end
+
+    expect(fs.expression_filters.keys).to include(:expression_test)
+    expect(fs.expression_filters.keys).not_to include(:node_test)
+  end
+end

data/spec/minitest_spec_spec.rb

@@ -37,10 +37,10 @@ class MinitestSpecTest < Minitest::Spec
     page.must_have_xpath('.//input[@id="customer_email"]')
     page.wont_have_xpath('.//select[@id="not_form_title"]')
     page.wont_have_xpath('.//input[@id="customer_email"]') { |el| el[:id] == "not_customer_email" }
-    el = find(:select, 'form_title')
-    el.must_have_xpath('.//option[@class="title"]')
-    el.must_have_xpath('.//option', count: 1) { |el| el[:class] != 'title' && !el.disabled?}
-    el.wont_have_xpath('.//input[@id="customer_email"]')
+    select = find(:select, 'form_title')
+    select.must_have_xpath('.//option[@class="title"]')
+    select.must_have_xpath('.//option', count: 1) { |option| option[:class] != 'title' && !option.disabled?}
+    select.wont_have_xpath('.//input[@id="customer_email"]')
   end
 
   it "support css expectations" do

data/spec/per_session_config_spec.rb

@@ -40,12 +40,12 @@ RSpec.describe Capybara::SessionConfig do
     it "doesn't allow session config when false" do
       Capybara.threadsafe = false
       session = Capybara::Session.new(:rack_test, TestApp)
-      expect { session.config.default_selector = :title }.to raise_error /Per session settings are only supported when Capybara.threadsafe == true/
+      expect { session.config.default_selector = :title }.to raise_error(/Per session settings are only supported when Capybara.threadsafe == true/)
       expect do
         session.configure do |config|
           config.exact = true
         end
-      end.to raise_error /Session configuration is only supported when Capybara.threadsafe == true/
+      end.to raise_error(/Session configuration is only supported when Capybara.threadsafe == true/)
     end
 
     it "uses the config from the session" do
@@ -60,8 +60,8 @@ RSpec.describe Capybara::SessionConfig do
     it "won't change threadsafe once a session is created" do
       Capybara.threadsafe = true
       Capybara.threadsafe = false
-      session = Capybara::Session.new(:rack_test, TestApp)
-      expect { Capybara.threadsafe = true }.to raise_error /Threadsafe setting cannot be changed once a session is created/
+      Capybara::Session.new(:rack_test, TestApp)
+      expect { Capybara.threadsafe = true }.to raise_error(/Threadsafe setting cannot be changed once a session is created/)
     end
   end
 end

data/spec/result_spec.rb

@@ -71,6 +71,26 @@ RSpec.describe Capybara::Result do
     expect(result[-1].text).to eq 'Delta'
   end
 
+  it 'works with filter blocks' do
+    result = string.all('//li') { |node| node.text == 'Alpha' }
+    expect(result.size).to eq 1
+  end
+
+  it 'should catch invalid element errors during filtering' do
+    allow_any_instance_of(Capybara::Node::Simple).to receive(:text).and_raise(StandardError)
+    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(double("session", driver: double("driver", invalid_element_errors: [StandardError] )))
+    result = string.all('//li', text: 'Alpha')
+    expect(result.size).to eq 0
+  end
+
+  it 'should return non-invalid element errors during filtering' do
+    allow_any_instance_of(Capybara::Node::Simple).to receive(:text).and_raise(StandardError)
+    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(double("session", driver: double("driver", invalid_element_errors: [ArgumentError] )))
+    expect do
+      string.all('//li', text: 'Alpha').to_a
+    end.to raise_error(StandardError)
+  end
+
   #Not a great test but it indirectly tests what is needed
   it "should evaluate filters lazily" do
     skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'

data/spec/selector_spec.rb

@@ -28,7 +28,7 @@ RSpec.describe Capybara do
             <input type="hidden" id="hidden_field" value="this is hidden"/>
             <a href="#">link</a>
             <fieldset></fieldset>
-            <select>
+            <select id="select">
               <option value="a">A</option>
               <option value="b" disabled>B</option>
               <option value="c" selected>C</option>
@@ -177,6 +177,7 @@ RSpec.describe Capybara do
 
         it "finds by type" do
           expect(string.find(:field, type: 'file')[:id]).to eq 'file'
+          expect(string.find(:field, type: 'select')[:id]).to eq 'select'
         end
       end
 

data/spec/selenium_spec_chrome.rb

@@ -5,11 +5,19 @@ require 'shared_selenium_session'
 
 Capybara.register_driver :selenium_chrome do |app|
   args = ENV['TRAVIS'] ? ['no-sandbox' ] : []
+  if ENV['CAPYBARA_CHROME_HEADLESS']
+    args << 'headless'
+    Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta' if ENV['TRAVIS']
+  end
   Capybara::Selenium::Driver.new(app, :browser => :chrome, :args => args)
 end
 
 Capybara.register_driver :selenium_chrome_clear_storage do |app|
   args = ENV['TRAVIS'] ? ['no-sandbox' ] : []
+  if ENV['CAPYBARA_CHROME_HEADLESS']
+    args << 'headless'
+    Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta' if ENV['TRAVIS']
+  end
   Capybara::Selenium::Driver.new(app, :browser => :chrome,
                                       :args => args,
                                       clear_local_storage: true,
@@ -21,11 +29,14 @@ module TestSessions
 end
 
 skipped_tests = [:response_headers, :status_code, :trigger]
-skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
+skipped_tests << :windows if ENV['TRAVIS'] && ENV['SKIP_WINDOW']
+# skip window tests when headless for now - closing a window not supported by chromedriver/chrome
+skipped_tests << :windows if ENV['TRAVIS'] && ENV['CAPYBARA_CHROME_HEADLESS']
 
 Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with chrome" do
+  include Capybara::SpecHelper
   include_examples  "Capybara::Session", TestSessions::Chrome, :selenium_chrome
 
   context "storage" do

data/spec/selenium_spec_firefox.rb

@@ -31,11 +31,12 @@ skipped_tests = [
   :status_code,
   :trigger
 ]
-skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
+skipped_tests << :windows if ENV['TRAVIS'] && ENV['SKIP_WINDOW']
 
 Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with legacy firefox" do
+  include Capybara::SpecHelper
   include_examples  "Capybara::Session", TestSessions::Selenium, :selenium_firefox
   include_examples  Capybara::RSpecMatchers, TestSessions::Selenium, :selenium_firefox
 

data/spec/selenium_spec_marionette.rb

@@ -8,7 +8,7 @@ Capybara.register_driver :selenium_marionette do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: true)
+    desired_capabilities: {marionette: true}
   )
 end
 
@@ -16,7 +16,7 @@ Capybara.register_driver :selenium_marionette_clear_storage do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    desired_capabilities: Selenium::WebDriver::Remote::Capabilities.firefox(marionette: true),
+    desired_capabilities: {marionette: true},
     clear_local_storage: true,
     clear_session_storage: true
   )
@@ -31,11 +31,12 @@ skipped_tests = [
   :status_code,
   :trigger
 ]
-skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
+skipped_tests << :windows if ENV['TRAVIS'] && ENV['SKIP_WINDOW']
 
 Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, "selenium", capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with firefox" do
+  include Capybara::SpecHelper
   include_examples  "Capybara::Session", TestSessions::SeleniumMarionette, :selenium_marionette
   include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumMarionette, :selenium_marionette
 end

data/spec/shared_selenium_session.rb

@@ -34,6 +34,8 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       before do
         @current_dir = Dir.getwd
         Dir.chdir(File.join(File.dirname(__FILE__), '..'))
+        @env = { 'SELENIUM_BROWSER' => @session.driver.options[:browser].to_s }
+        @env['LEGACY_FIREFOX'] = 'TRUE' if mode == :selenium_firefox
       end
 
       after do
@@ -41,22 +43,19 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       end
 
       it "should have return code 1 when running selenium_driver_rspec_failure.rb" do
-        env = { 'SELENIUM_BROWSER' => @session.driver.options[:browser].to_s,
-                'LEGACY_FIREFOX' => (mode == :selenium_firefox ? 'TRUE' : nil) }
-        system(env, 'rspec spec/fixtures/selenium_driver_rspec_failure.rb', out: File::NULL, err: File::NULL)
+        system(@env, 'rspec spec/fixtures/selenium_driver_rspec_failure.rb', out: File::NULL, err: File::NULL)
         expect($?.exitstatus).to eq(1)
       end
 
       it "should have return code 0 when running selenium_driver_rspec_success.rb" do
-        env = { 'SELENIUM_BROWSER' => @session.driver.options[:browser].to_s,
-                'LEGACY_FIREFOX' => (mode == :selenium_firefox ? 'TRUE' : nil) }
-        system(env, 'rspec spec/fixtures/selenium_driver_rspec_success.rb', out: File::NULL, err: File::NULL)
+        system(@env, 'rspec spec/fixtures/selenium_driver_rspec_success.rb', out: File::NULL, err: File::NULL)
         expect($?.exitstatus).to eq(0)
       end
     end
 
     describe "#accept_alert" do
       it "supports a blockless mode" do
+        skip "Headless Chrome doesn't support blockless modal methods" if @session.driver.send(:headless_chrome?)
         @session.visit('/with_js')
         @session.click_link('Open alert')
         @session.accept_alert
@@ -102,7 +101,7 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
 
     context "#fill_in with { clear: Array } fill_options" do
       it 'should pass the array through to the element' do
-        pending "selenium-webdriver/geckodriver doesn't support complex sets of characters" if @session.driver.marionette?
+        pending "selenium-webdriver/geckodriver doesn't support complex sets of characters" if marionette?(@session)
         #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')
         @session.fill_in('form_first_name', with: 'Harry',
@@ -120,6 +119,14 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       end
     end
 
+    describe "all with disappearing elements" do
+      it "ignores stale elements in results" do
+        @session.visit('/path')
+        elements = @session.all(:link) { |node| raise Selenium::WebDriver::Error::StaleElementReferenceError }
+        expect(elements.size).to eq 0
+      end
+    end
+
     describe "#evaluate_script" do
       it "can return an element" do
         @session.visit('/form')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.14.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -228,6 +228,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  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: pry
   requirement: !ruby/object:Gem::Requirement
@@ -309,6 +323,7 @@ files:
 - lib/capybara/rspec/matchers.rb
 - lib/capybara/selector.rb
 - lib/capybara/selector/css.rb
+- lib/capybara/selector/expression_filter.rb
 - lib/capybara/selector/filter.rb
 - lib/capybara/selector/filter_set.rb
 - lib/capybara/selector/selector.rb
@@ -433,6 +448,7 @@ files:
 - spec/basic_node_spec.rb
 - spec/capybara_spec.rb
 - spec/dsl_spec.rb
+- spec/filter_set_spec.rb
 - spec/fixtures/capybara.csv
 - spec/fixtures/selenium_driver_rspec_failure.rb
 - spec/fixtures/selenium_driver_rspec_success.rb