capybara 2.10.2 → 2.11.0

data/lib/capybara/selector.rb

@@ -87,7 +87,7 @@ Capybara.add_selector(:field) do
   end
   describe do |options|
     desc = String.new
-    (expression_filters - [:type]).each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
+    (expression_filters - [:type]).each { |ef| desc << " with #{ef} #{options[ef]}" if options.has_key?(ef) }
     desc << " of type #{options[:type].inspect}" if options[:type]
     desc << " with value #{options[:with].to_s.inspect}" if options.has_key?(:with)
     desc
@@ -196,7 +196,7 @@ Capybara.add_selector(:button) do
   describe do |options|
     desc = String.new
     desc << " that is disabled" if options[:disabled] == true
-    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
+    desc << describe_all_expression_filters(options)
     desc
   end
 end
@@ -244,7 +244,7 @@ Capybara.add_selector(:fillable_field) do
 
   describe do |options|
     desc = String.new
-    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
+    desc << describe_all_expression_filters(options)
     desc << " with value #{options[:with].to_s.inspect}" if options.has_key?(:with)
     desc
   end
@@ -277,7 +277,7 @@ Capybara.add_selector(:radio_button) do
   describe do |options|
     desc = String.new
     desc << " with value #{options[:option].inspect}" if options[:option]
-    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
+    desc << describe_all_expression_filters(options)
     desc
   end
 end
@@ -308,7 +308,7 @@ Capybara.add_selector(:checkbox) do
   describe do |options|
     desc = String.new
     desc << " with value #{options[:option].inspect}" if options[:option]
-    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
+    desc << describe_all_expression_filters(options)
     desc
   end
 end
@@ -364,7 +364,7 @@ Capybara.add_selector(:select) do
     desc << " with options #{options[:options].inspect}" if options[:options]
     desc << " with at least options #{options[:with_options].inspect}" if options[:with_options]
     desc << " with #{options[:selected].inspect} selected" if options[:selected]
-    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
+    desc << describe_all_expression_filters(options)
     desc
   end
 end
@@ -417,7 +417,7 @@ Capybara.add_selector(:file_field) do
 
   describe do |options|
     desc = String.new
-    expression_filters.each { |ef| desc << " with #{ef.to_s} #{options[ef]}" if options.has_key?(ef) }
+    desc << describe_all_expression_filters(options)
     desc
   end
 end

data/lib/capybara/selector/selector.rb

@@ -6,6 +6,7 @@ require 'xpath'
 #Patch XPath to allow a nil condition in where
 module XPath
   class Renderer
+    undef :where if method_defined?(:where)
     def where(on, condition)
       condition = condition.to_s
       if !condition.empty?
@@ -177,14 +178,14 @@ module Capybara
 
     def filter_set(name, filters_to_use = nil)
       f_set = FilterSet.all[name]
-      f_set.filters.each do | name, filter |
-        custom_filters[name] = filter if filters_to_use.nil? || filters_to_use.include?(name)
+      f_set.filters.each do |n, filter|
+        custom_filters[n] = filter if filters_to_use.nil? || filters_to_use.include?(n)
       end
-      f_set.descriptions.each { |desc| @filter_set.describe &desc }
+      f_set.descriptions.each { |desc| @filter_set.describe(&desc) }
     end
 
     def describe &block
-      @filter_set.describe &block
+      @filter_set.describe(&block)
     end
 
     ##
@@ -228,8 +229,12 @@ module Capybara
       locate_xpath
     end
 
+    def describe_all_expression_filters(opts={})
+      expression_filters.map { |ef| " with #{ef} #{opts[ef]}" if opts.has_key?(ef) }.join
+    end
+
     def find_by_attr(attribute, value)
-      finder_name = "find_by_#{attribute.to_s}_attr"
+      finder_name = "find_by_#{attribute}_attr"
       if respond_to?(finder_name, true)
         send(finder_name, value)
       else

data/lib/capybara/selenium/driver.rb

@@ -4,9 +4,11 @@ require "uri"
 class Capybara::Selenium::Driver < Capybara::Driver::Base
 
   DEFAULT_OPTIONS = {
-    :browser => :firefox
+    :browser => :firefox,
+    clear_local_storage: false,
+    clear_session_storage: false
   }
-  SPECIAL_OPTIONS = [:browser]
+  SPECIAL_OPTIONS = [:browser, :clear_local_storage, :clear_session_storage]
 
   attr_reader :app, :options
 
@@ -17,7 +19,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
         options[:desired_capabilities].merge!({ unexpectedAlertBehaviour: "ignore" })
       end
 
-      @browser = Selenium::WebDriver.for(options[:browser], options.reject { |key,val| SPECIAL_OPTIONS.include?(key) })
+      @browser = Selenium::WebDriver.for(options[:browser], options.reject { |key,_val| SPECIAL_OPTIONS.include?(key) })
 
       main = Process.pid
       at_exit do
@@ -92,7 +94,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.execute_script "return #{script}"
   end
 
-  def save_screenshot(path, options={})
+  def save_screenshot(path, _options={})
     browser.save_screenshot(path)
   end
 
@@ -107,6 +109,20 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
           # can trigger an endless series of unload modals
           begin
             @browser.manage.delete_all_cookies
+            if options[:clear_session_storage]
+              if @browser.respond_to? :session_storage
+                @browser.session_storage.clear
+              else
+                warn "sessionStorage clear requested but is not available for this driver"
+              end
+            end
+            if options[:clear_local_storage]
+              if @browser.respond_to? :local_storage
+                @browser.local_storage.clear
+              else
+                warn "localStorage clear requested but is not available for this driver"
+              end
+            end
           rescue Selenium::WebDriver::Error::UnhandledError
             # delete_all_cookies fails when we've previously gone
             # to about:blank, so we rescue this error and do nothing
@@ -220,8 +236,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     browser.switch_to.window(handle) { yield }
   end
 
-  def accept_modal(type, options={}, &blk)
-    options = options.dup
+  def accept_modal(_type, options={})
     yield if block_given?
     modal = find_modal(options)
     modal.send_keys options[:with] if options[:with]
@@ -230,7 +245,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     message
   end
 
-  def dismiss_modal(type, options={}, &blk)
+  def dismiss_modal(_type, options={})
     yield if block_given?
     modal = find_modal(options)
     message = modal.text
@@ -242,6 +257,11 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     @browser.quit if @browser
   rescue Errno::ECONNREFUSED
     # Browser must have already gone
+  rescue Selenium::WebDriver::Error::UnknownError => e
+    unless silenced_unknown_error_message?(e.message) # Most likely already gone
+      # probably already gone but not sure - so warn
+      warn "Ignoring Selenium UnknownError during driver quit: #{e.message}"
+    end
   ensure
     @browser = nil
   end
@@ -293,4 +313,11 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
     end
   end
 
+  def silenced_unknown_error_message?(msg)
+    silenced_unknown_error_messages.any? { |r| msg =~ r }
+  end
+
+  def silenced_unknown_error_messages
+    [ /Error communicating with the remote browser/ ]
+  end
 end

data/lib/capybara/selenium/node.rb

@@ -47,7 +47,11 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
       click if value ^ native.attribute('checked').to_s.eql?("true")
     elsif tag_name == 'input' and type == 'file'
       path_names = value.to_s.empty? ? [] : value
-      native.send_keys(*path_names)
+      if driver.options[:browser].to_s == "chrome"
+        native.send_keys(Array(path_names).join("\n"))
+      else
+        native.send_keys(*path_names)
+      end
     elsif tag_name == 'textarea' or tag_name == 'input'
       if readonly?
         warn "Attempt to set readonly element with value: #{value} \n *This will raise an exception in a future version of Capybara"

data/lib/capybara/session.rb

@@ -269,7 +269,7 @@ module Capybara
     # block, any command to Capybara will be handled as though it were scoped
     # to the given element.
     #
-    #     within(:xpath, '//div[@id="delivery-address"]') do
+    #     within(:xpath, './/div[@id="delivery-address"]') do
     #       fill_in('Street', with: '12 Main Street')
     #     end
     #
@@ -593,11 +593,7 @@ module Capybara
     #   @raise [Capybara::ModalNotFound]  if modal dialog hasn't been found
     #
     def accept_alert(text_or_options=nil, options={}, &blk)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
-
-      driver.accept_modal(:alert, options, &blk)
+      accept_modal(:alert, text_or_options, options, &blk)
     end
 
     ##
@@ -607,11 +603,7 @@ module Capybara
     # @macro modal_params
     #
     def accept_confirm(text_or_options=nil, options={}, &blk)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
-
-      driver.accept_modal(:confirm, options, &blk)
+      accept_modal(:confirm, text_or_options, options, &blk)
     end
 
     ##
@@ -621,11 +613,7 @@ module Capybara
     # @macro modal_params
     #
     def dismiss_confirm(text_or_options=nil, options={}, &blk)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
-
-      driver.dismiss_modal(:confirm, options, &blk)
+      dismiss_modal(:confirm, text_or_options, options, &blk)
     end
 
     ##
@@ -636,11 +624,7 @@ module Capybara
     # @option options [String] :with   Response to provide to the prompt
     #
     def accept_prompt(text_or_options=nil, options={}, &blk)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
-
-      driver.accept_modal(:prompt, options, &blk)
+      accept_modal(:prompt, text_or_options, options, &blk)
     end
 
     ##
@@ -650,11 +634,7 @@ module Capybara
     # @macro modal_params
     #
     def dismiss_prompt(text_or_options=nil, options={}, &blk)
-      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
-      options[:text] ||= text_or_options unless text_or_options.nil?
-      options[:wait] ||= Capybara.default_max_wait_time
-
-      driver.dismiss_modal(:prompt, options, &blk)
+      dismiss_modal(:prompt, text_or_options, options, &blk)
     end
 
     ##
@@ -757,6 +737,21 @@ module Capybara
     end
 
   private
+    def accept_modal(type, text_or_options, options, &blk)
+      driver.accept_modal(type, modal_options(text_or_options, options), &blk)
+    end
+
+    def dismiss_modal(type, text_or_options, options, &blk)
+      driver.dismiss_modal(type, modal_options(text_or_options, options), &blk)
+    end
+
+    def modal_options(text_or_options, options)
+      text_or_options, options = nil, text_or_options if text_or_options.is_a?(Hash)
+      options[:text] ||= text_or_options unless text_or_options.nil?
+      options[:wait] ||= Capybara.default_max_wait_time
+      options
+    end
+
 
     def open_file(path)
       begin
@@ -780,7 +775,7 @@ module Capybara
 
     def default_fn(extension)
       timestamp = Time.new.strftime("%Y%m%d%H%M%S")
-      path = "capybara-#{timestamp}#{rand(10**10)}.#{extension}"
+      "capybara-#{timestamp}#{rand(10**10)}.#{extension}"
     end
 
     def scopes

data/lib/capybara/session/matchers.rb

@@ -17,13 +17,7 @@ module Capybara
     # @return [true]
     #
     def assert_current_path(path, options={})
-      query = Capybara::Queries::CurrentPathQuery.new(path, options)
-      document.synchronize(query.wait) do
-        unless query.resolves_for?(self)
-          raise Capybara::ExpectationNotMet, query.failure_message
-        end
-      end
-      return true
+      _verify_current_path(path,options) { |query| raise Capybara::ExpectationNotMet, query.failure_message unless query.resolves_for?(self) }
     end
 
     ##
@@ -34,13 +28,7 @@ module Capybara
     # @return [true]
     #
     def assert_no_current_path(path, options={})
-      query = Capybara::Queries::CurrentPathQuery.new(path, options)
-      document.synchronize(query.wait) do
-        if query.resolves_for?(self)
-          raise Capybara::ExpectationNotMet, query.negative_failure_message
-        end
-      end
-      return true
+      _verify_current_path(path,options) { |query| raise Capybara::ExpectationNotMet, query.negative_failure_message if query.resolves_for?(self) }
     end
 
     ##
@@ -66,5 +54,15 @@ module Capybara
     rescue Capybara::ExpectationNotMet
       return false
     end
+
+    private
+
+    def _verify_current_path(path, options)
+      query = Capybara::Queries::CurrentPathQuery.new(path, options)
+      document.synchronize(query.wait) do
+        yield(query)
+      end
+      return true
+    end
   end
 end

data/lib/capybara/spec/public/test.js

@@ -123,4 +123,8 @@ $(function() {
       input.disabled = true;
     }, 500)
   })
+  $('#set-storage').click(function(e){
+    sessionStorage.setItem('session', 'session_value');
+    localStorage.setItem('local', 'local value');
+  })
 });

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

@@ -26,7 +26,7 @@ Capybara::SpecHelper.spec '#accept_alert', requires: [:modals] do
   end
 
   it "should accept the alert if the text matches a regexp" do
-    @session.accept_alert /op.{2}ed/ do
+    @session.accept_alert(/op.{2}ed/) do
       @session.click_link('Open alert')
     end
     expect(@session).to have_xpath("//a[@id='open-alert' and @opened='true']")

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

@@ -65,7 +65,7 @@ Capybara::SpecHelper.spec "#attach_file" do
     end
 
     it  "should not break when using HTML5 multiple file input uploading multiple files" do
-      pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium/
+      pending "Selenium is buggy on this, see http://code.google.com/p/selenium/issues/detail?id=2239" if @session.respond_to?(:mode) && @session.mode.to_s =~ /^selenium_(firefox|marionette)/
       @session.attach_file "Multiple Documents", [@test_file_path, @another_test_file_path]
       @session.click_button('Upload Multiple')
       expect(@session.body).to include("2 | ")#number of files

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

@@ -169,6 +169,14 @@ Capybara::SpecHelper.spec "#check" do
           expect(extract_results(@session)['cars']).to include('tesla')
         end
 
+        it "should not wait the full time if label can be clicked" do
+          expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+          start_time = Time.now
+          @session.check('form_cars_tesla', allow_label_click: true, wait: 10)
+          end_time = Time.now
+          expect(end_time - start_time).to be < 10
+        end
+
         it "should check via the label if input is moved off the left edge of the page" do
           expect(@session.find(:checkbox, 'form_cars_pagani', unchecked: true, visible: :all)).to be
           @session.check('form_cars_pagani', allow_label_click: true)

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

@@ -86,4 +86,9 @@ Capybara::SpecHelper.spec "#choose" do
       end
     end
   end
+
+  it "should return the chosen radio button" do
+    el = @session.find(:radio_button, 'gender_male')
+    expect(@session.choose("gender_male")).to eq el
+  end
 end

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

@@ -108,6 +108,11 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
         @session.click_link_or_button('Disabled button', disabled: false)
       end.to raise_error(Capybara::ElementNotFound)
     end
+  end
 
+  it "should return the element clicked" do
+    @session.visit('/with_html')
+    link = @session.find(:link, 'Blank Anchor')
+    expect(@session.click_link_or_button('Blank Anchor')).to eq link
   end
 end

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

@@ -186,4 +186,9 @@ Capybara::SpecHelper.spec '#click_link' do
       expect(@session).to have_content('Another World')
     end
   end
+
+  it "should return element clicked" do
+    el = @session.find(:link, 'Normal Anchor')
+    expect(@session.click_link('Normal Anchor')).to eq el
+  end
 end

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

@@ -28,4 +28,9 @@ Capybara::SpecHelper.spec '#assert_matches_selector' do
   it "should not accept count options" do
     expect { @element.assert_matches_selector(:css, '.number', count: 1) }.to raise_error(ArgumentError)
   end
+
+  it "should accept a filter block" do
+    @element.assert_matches_selector(:css, 'span') { |el| el[:class] == "number" }
+    @element.assert_not_matches_selector(:css,'span') { |el| el[:class] == "not_number" }
+  end
 end

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

@@ -14,4 +14,10 @@ Capybara::SpecHelper.spec '#match_css?' do
     expect(@element).not_to match_css("p a#doesnotexist")
     expect(@element).not_to match_css("p.nosuchclass")
   end
+
+  it "should accept an optional filter block" do
+    # This would be better done with
+    expect(@element).to match_css('span') { |el| el[:class] == "number" }
+    expect(@element).not_to match_css('span') { |el| el[:class] == "not_number" }
+  end
 end