capybara 2.10.1 → 2.11.0

data/lib/capybara/node/matchers.rb

@@ -90,14 +90,11 @@ module Capybara
       # @raise [Capybara::ExpectationNotMet]      If the selector does not exist
       #
       def assert_selector(*args, &optional_filter_block)
-        query = Capybara::Queries::SelectorQuery.new(*args, &optional_filter_block)
-        synchronize(query.wait) do
-          result = query.resolve_for(self)
+        _verify_selector_result(args, optional_filter_block) do |result, query|
           unless result.matches_count? && ((!result.empty?) || query.expects_none?)
             raise Capybara::ExpectationNotMet, result.failure_message
           end
         end
-        return true
       end
 
       ##
@@ -117,14 +114,11 @@ module Capybara
       # @raise [Capybara::ExpectationNotMet]      If the selector exists
       #
       def assert_no_selector(*args, &optional_filter_block)
-        query = Capybara::Queries::SelectorQuery.new(*args, &optional_filter_block)
-        synchronize(query.wait) do
-          result = query.resolve_for(self)
+        _verify_selector_result(args, optional_filter_block) do |result, query|
           if result.matches_count? && ((!result.empty?) || query.expects_none?)
             raise Capybara::ExpectationNotMet, result.negative_failure_message
           end
         end
-        return true
       end
       alias_method :refute_selector, :assert_no_selector
 
@@ -333,7 +327,7 @@ module Capybara
       #
       def has_no_checked_field?(locator=nil, options={}, &optional_filter_block)
         locator, options = nil, locator if locator.is_a? Hash
-        has_no_selector?(:field, locator, options.merge(checked: true))
+        has_no_selector?(:field, locator, options.merge(checked: true), &optional_filter_block)
       end
 
       ##
@@ -455,25 +449,15 @@ module Capybara
       # @raise [Capybara::ExpectationNotMet]      If the selector does not match
       #
       def assert_matches_selector(*args, &optional_filter_block)
-        query = Capybara::Queries::MatchQuery.new(*args, &optional_filter_block)
-        synchronize(query.wait) do
-          result = query.resolve_for(self.query_scope)
-          unless result.include? self
-            raise Capybara::ExpectationNotMet, "Item does not match the provided selector"
-          end
+        _verify_match_result(args, optional_filter_block) do |result|
+          raise Capybara::ExpectationNotMet, "Item does not match the provided selector" unless result.include? self
         end
-        return true
       end
 
       def assert_not_matches_selector(*args, &optional_filter_block)
-        query = Capybara::Queries::MatchQuery.new(*args, &optional_filter_block)
-        synchronize(query.wait) do
-          result = query.resolve_for(self.query_scope)
-          if result.include? self
-            raise Capybara::ExpectationNotMet, 'Item matched the provided selector'
-          end
+        _verify_match_result(args, optional_filter_block) do |result|
+          raise Capybara::ExpectationNotMet, 'Item matched the provided selector' if result.include? self
         end
-        return true
       end
       alias_method :refute_matches_selector, :assert_not_matches_selector
 
@@ -573,14 +557,11 @@ module Capybara
       # @return [true]
       #
       def assert_text(*args)
-        query = Capybara::Queries::TextQuery.new(*args)
-        synchronize(query.wait) do
-          count = query.resolve_for(self)
+        _verify_text(args) do |count, query|
           unless query.matches_count?(count) && ((count > 0) || query.expects_none?)
             raise Capybara::ExpectationNotMet, query.failure_message
           end
         end
-        return true
       end
 
       ##
@@ -592,14 +573,11 @@ module Capybara
       # @return [true]
       #
       def assert_no_text(*args)
-        query = Capybara::Queries::TextQuery.new(*args)
-        synchronize(query.wait) do
-          count = query.resolve_for(self)
+        _verify_text(args) do |count, query|
           if query.matches_count?(count) && ((count > 0) || query.expects_none?)
             raise Capybara::ExpectationNotMet, query.negative_failure_message
           end
         end
-        return true
       end
 
       ##
@@ -645,6 +623,35 @@ module Capybara
         self.eql?(other) || (other.respond_to?(:base) && base == other.base)
       end
 
+    private
+
+      def _verify_selector_result(query_args, optional_filter_block, &result_block)
+        query = Capybara::Queries::SelectorQuery.new(*query_args, &optional_filter_block)
+        synchronize(query.wait) do
+          result = query.resolve_for(self)
+          result_block.call(result, query)
+        end
+        return true
+      end
+
+      def _verify_match_result(query_args, optional_filter_block, &result_block)
+        query = Capybara::Queries::MatchQuery.new(*query_args, &optional_filter_block)
+        synchronize(query.wait) do
+          result = query.resolve_for(self.query_scope)
+          result_block.call(result)
+        end
+        return true
+      end
+
+      def _verify_text(query_args)
+        query = Capybara::Queries::TextQuery.new(*query_args)
+        synchronize(query.wait) do
+          count = query.resolve_for(self)
+          yield(count, query)
+        end
+        return true
+      end
+
     end
   end
 end

data/lib/capybara/node/simple.rb

@@ -148,6 +148,9 @@ module Capybara
         # no op
       end
 
+      ##
+      #
+      # @return [String]     The title of the document
       def title
         if native.respond_to? :title
           native.title

data/lib/capybara/queries/selector_query.rb

@@ -53,7 +53,9 @@ module Capybara
       def matches_filters?(node)
         if options[:text]
           regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text].to_s)
-          return false if not node.text(visible).match(regexp)
+          text_visible = visible
+          text_visible = :all if text_visible == :hidden
+          return false if not node.text(text_visible).match(regexp)
         end
 
         case visible
@@ -71,7 +73,7 @@ module Capybara
           end
         end
 
-        res &&= @filter_block.call(node) unless @filter_block.nil?
+        res &&= Capybara.using_wait_time(0){ @filter_block.call(node)} unless @filter_block.nil?
         res
       end
 

data/lib/capybara/rack_test/node.rb

@@ -152,7 +152,7 @@ private
     end
   end
 
-  def set_radio(value)
+  def set_radio(_value)
     other_radios_xpath = XPath.generate { |x| x.anywhere(:input)[x.attr(:name).equals(self[:name])] }.to_s
     driver.dom.xpath(other_radios_xpath).each { |node| node.remove_attribute("checked") }
     native['checked'] = 'checked'

data/lib/capybara/result.rb

@@ -40,6 +40,8 @@ module Capybara
     alias :index :find_index
 
     def each(&block)
+      return enum_for(:each) unless block_given?
+
       @result_cache.each(&block)
       loop do
         next_result = @results_enum.next
@@ -137,7 +139,7 @@ module Capybara
 
     def lazy_select_elements(&block)
       if @elements.respond_to? :lazy  #Ruby 2.0+
-        @elements.lazy.select &block
+        @elements.lazy.select(&block)
       else
         Enumerator.new do |yielder|
           @elements.each do |val|

data/lib/capybara/rspec/matchers.rb

@@ -4,6 +4,8 @@ module Capybara
     class Matcher
       include ::RSpec::Matchers::Composable if defined?(::RSpec::Expectations::Version) && (Gem::Version.new(RSpec::Expectations::Version::STRING) >= Gem::Version.new('3.0'))
 
+      attr_reader :failure_message, :failure_message_when_negated
+
       def wrap(actual)
         if actual.respond_to?("has_selector?")
           actual
@@ -11,10 +13,29 @@ module Capybara
           Capybara.string(actual.to_s)
         end
       end
+
+      # RSpec 2 compatibility:
+      def failure_message_for_should; failure_message end
+      def failure_message_for_should_not; failure_message_when_negated end
+
+      private
+
+      def wrap_matches?(actual)
+        yield(wrap(actual))
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message = e.message
+        return false
+      end
+
+      def wrap_does_not_match?(actual)
+        yield(wrap(actual))
+      rescue Capybara::ExpectationNotMet => e
+        @failure_message_when_negated = e.message
+        return false
+      end
     end
 
     class HaveSelector < Matcher
-      attr_reader :failure_message, :failure_message_when_negated
 
       def initialize(*args, &filter_block)
         @args = args
@@ -22,17 +43,11 @@ module Capybara
       end
 
       def matches?(actual)
-        wrap(actual).assert_selector(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message = e.message
-        return false
+        wrap_matches?(actual){ |el| el.assert_selector(*@args, &@filter_block) }
       end
 
       def does_not_match?(actual)
-        wrap(actual).assert_no_selector(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message_when_negated = e.message
-        return false
+        wrap_does_not_match?(actual){ |el| el.assert_no_selector(*@args, &@filter_block) }
       end
 
       def description
@@ -42,17 +57,29 @@ module Capybara
       def query
         @query ||= Capybara::Queries::SelectorQuery.new(*@args, &@filter_block)
       end
+    end
 
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
+    class MatchSelector < HaveSelector
+      def matches?(actual)
+        wrap_matches?(actual) { |el| el.assert_matches_selector(*@args, &@filter_block) }
+      end
+
+      def does_not_match?(actual)
+        wrap_does_not_match?(actual) { |el| el.assert_not_matches_selector(*@args, &@filter_block) }
+      end
+
+      def description
+        "match #{query.description}"
+      end
+
+      def query
+        @query ||= Capybara::Queries::MatchQuery.new(*@args)
+      end
     end
 
     class HaveText < Matcher
       attr_reader :type, :content, :options
 
-      attr_reader :failure_message, :failure_message_when_negated
-
       def initialize(*args)
         @args = args.dup
 
@@ -63,17 +90,11 @@ module Capybara
       end
 
       def matches?(actual)
-        wrap(actual).assert_text(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message = e.message
-        return false
+        wrap_matches?(actual) { |el| el.assert_text(*@args) }
       end
 
       def does_not_match?(actual)
-        wrap(actual).assert_no_text(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message_when_negated = e.message
-        return false
+        wrap_does_not_match?(actual) { |el| el.assert_no_text(*@args) }
       end
 
       def description
@@ -84,17 +105,11 @@ module Capybara
         content = Capybara::Helpers.normalize_whitespace(content) unless content.is_a? Regexp
         content.inspect
       end
-
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
     end
 
     class HaveTitle < Matcher
       attr_reader :title
 
-      attr_reader :failure_message, :failure_message_when_negated
-
       def initialize(*args)
         @args = args
 
@@ -103,33 +118,21 @@ module Capybara
       end
 
       def matches?(actual)
-        wrap(actual).assert_title(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message = e.message
-        return false
+        wrap_matches?(actual) { |el| el.assert_title(*@args) }
       end
 
       def does_not_match?(actual)
-        wrap(actual).assert_no_title(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message_when_negated = e.message
-        return false
+        wrap_does_not_match?(actual) { |el| el.assert_no_title(*@args) }
       end
 
       def description
         "have title #{title.inspect}"
       end
-
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
     end
 
     class HaveCurrentPath < Matcher
       attr_reader :current_path
 
-      attr_reader :failure_message, :failure_message_when_negated
-
       def initialize(*args)
         @args = args
 
@@ -138,26 +141,16 @@ module Capybara
       end
 
       def matches?(actual)
-        wrap(actual).assert_current_path(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message = e.message
-        return false
+        wrap_matches?(actual) { |el| el.assert_current_path(*@args) }
       end
 
       def does_not_match?(actual)
-        wrap(actual).assert_no_current_path(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message_when_negated = e.message
-        return false
+        wrap_does_not_match?(actual) { |el| el.assert_no_current_path(*@args) }
       end
 
       def description
         "have current path #{current_path.inspect}"
       end
-
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
     end
 
     class BecomeClosed
@@ -188,46 +181,12 @@ module Capybara
       alias_method :failure_message_for_should_not, :failure_message_when_negated
     end
 
-    class MatchSelector < Matcher
-      attr_reader :failure_message, :failure_message_when_negated
-
-      def initialize(*args)
-        @args = args
-      end
-
-      def matches?(actual)
-        actual.assert_matches_selector(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message = e.message
-        return false
-      end
-
-      def does_not_match?(actual)
-        actual.assert_not_matches_selector(*@args)
-      rescue Capybara::ExpectationNotMet => e
-        @failure_message_when_negated = e.message
-        return false
-      end
-
-      def description
-        "match #{query.description}"
-      end
-
-      def query
-        @query ||= Capybara::Queries::MatchQuery.new(*@args)
-      end
-
-      # RSpec 2 compatibility:
-      alias_method :failure_message_for_should, :failure_message
-      alias_method :failure_message_for_should_not, :failure_message_when_negated
-    end
-
     def have_selector(*args, &optional_filter_block)
       HaveSelector.new(*args, &optional_filter_block)
     end
 
-    def match_selector(*args)
-      MatchSelector.new(*args)
+    def match_selector(*args, &optional_filter_block)
+      MatchSelector.new(*args, &optional_filter_block)
     end
     # defined_negated_matcher was added in RSpec 3.1 - it's syntactic sugar only since a user can do
     # expect(page).not_to match_selector, so not sure we really need to support not_match_selector for prior to RSpec 3.1
@@ -238,16 +197,16 @@ module Capybara
       HaveSelector.new(:xpath, xpath, options, &optional_filter_block)
     end
 
-    def match_xpath(xpath, options={})
-      MatchSelector.new(:xpath, xpath, options)
+    def match_xpath(xpath, options={}, &optional_filter_block)
+      MatchSelector.new(:xpath, xpath, options, &optional_filter_block)
     end
 
     def have_css(css, options={}, &optional_filter_block)
       HaveSelector.new(:css, css, options, &optional_filter_block)
     end
 
-    def match_css(css, options={})
-      MatchSelector.new(:css, css, options)
+    def match_css(css, options={}, &optional_filter_block)
+      MatchSelector.new(:css, css, options, &optional_filter_block)
     end
 
     def have_text(*args)
@@ -307,6 +266,5 @@ module Capybara
     def become_closed(options = {})
       BecomeClosed.new(options)
     end
-
   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/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/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"