capybara 2.9.0 → 2.10.0

data/lib/capybara/node/matchers.rb

@@ -14,14 +14,14 @@ module Capybara
       # By default it will check if the expression occurs at least once,
       # but a different number can be specified.
       #
-      #     page.has_selector?('p.foo', :count => 4)
+      #     page.has_selector?('p.foo', count: 4)
       #
       # This will check if the expression occurs exactly 4 times.
       #
       # It also accepts all options that {Capybara::Node::Finders#all} accepts,
       # such as :text and :visible.
       #
-      #     page.has_selector?('li', :text => 'Horse', :visible => true)
+      #     page.has_selector?('li', text: 'Horse', visible: true)
       #
       # has_selector? can also accept XPath expressions generated by the
       # XPath gem:
@@ -36,8 +36,8 @@ module Capybara
       # @option args [Range]   :between (nil)   Range of times that should contain number of times text occurs
       # @return [Boolean]                       If the expression exists
       #
-      def has_selector?(*args)
-        assert_selector(*args)
+      def has_selector?(*args, &optional_filter_block)
+        assert_selector(*args, &optional_filter_block)
       rescue Capybara::ExpectationNotMet
         return false
       end
@@ -50,83 +50,12 @@ module Capybara
       # @param (see Capybara::Node::Finders#has_selector?)
       # @return [Boolean]
       #
-      def has_no_selector?(*args)
-        assert_no_selector(*args)
+      def has_no_selector?(*args, &optional_filter_block)
+        assert_no_selector(*args, &optional_filter_block)
       rescue Capybara::ExpectationNotMet
         return false
       end
 
-      ##
-      #
-      # Checks if the current node matches given selector
-      #
-      # @param (see Capybara::Node::Finders#has_selector?)
-      # @return [Boolean]
-      #
-      def matches_selector?(*args)
-        assert_matches_selector(*args)
-      rescue Capybara::ExpectationNotMet
-        return false
-      end
-
-      ##
-      #
-      # Checks if the current node matches given XPath expression
-      #
-      # @param [String, XPath::Expression] xpath The XPath expression to match against the current code
-      # @return [Boolean]
-      #
-      def matches_xpath?(xpath, options={})
-        matches_selector?(:xpath, xpath, options)
-      end
-
-      ##
-      #
-      # Checks if the current node matches given CSS selector
-      #
-      # @param [String] css The CSS selector to match against the current code
-      # @return [Boolean]
-      #
-      def matches_css?(css, options={})
-        matches_selector?(:css, css, options)
-      end
-
-      ##
-      #
-      # Checks if the current node does not match given selector
-      # Usage is identical to Capybara::Node::Matchers#has_selector?
-      #
-      # @param (see Capybara::Node::Finders#has_selector?)
-      # @return [Boolean]
-      #
-      def not_matches_selector?(*args)
-        assert_not_matches_selector(*args)
-      rescue Capybara::ExpectationNotMet
-        return false
-      end
-
-      ##
-      #
-      # Checks if the current node does not match given XPath expression
-      #
-      # @param [String, XPath::Expression] xpath The XPath expression to match against the current code
-      # @return [Boolean]
-      #
-      def not_matches_xpath?(xpath, options={})
-        not_matches_selector?(:xpath, xpath, options)
-      end
-
-      ##
-      #
-      # Checks if the current node does not match given CSS selector
-      #
-      # @param [String] css The CSS selector to match against the current code
-      # @return [Boolean]
-      #
-      def not_matches_css?(css, options={})
-        not_matches_selector?(:css, css, options)
-      end
-
       ##
       #
       # Asserts that a given selector is on the page or a descendant of the current node.
@@ -138,7 +67,7 @@ module Capybara
       # By default it will check if the expression occurs at least once,
       # but a different number can be specified.
       #
-      #     page.assert_selector('p#foo', :count => 4)
+      #     page.assert_selector('p#foo', count: 4)
       #
       # This will check if the expression occurs exactly 4 times. See
       # {Capybara::Node::Finders#all} for other available result size options.
@@ -149,7 +78,7 @@ module Capybara
       # It also accepts all options that {Capybara::Node::Finders#all} accepts,
       # such as :text and :visible.
       #
-      #     page.assert_selector('li', :text => 'Horse', :visible => true)
+      #     page.assert_selector('li', text: 'Horse', visible: true)
       #
       # `assert_selector` can also accept XPath expressions generated by the
       # XPath gem:
@@ -160,8 +89,8 @@ module Capybara
       # @option options [Integer] :count (nil)    Number of times the expression should occur
       # @raise [Capybara::ExpectationNotMet]      If the selector does not exist
       #
-      def assert_selector(*args)
-        query = Capybara::Queries::SelectorQuery.new(*args)
+      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)
           unless result.matches_count? && ((!result.empty?) || query.expects_none?)
@@ -180,15 +109,15 @@ module Capybara
       # considered to be an integral part of the selector. This will return
       # true, for example, if a page contains 4 anchors but the query expects 5:
       #
-      #     page.assert_no_selector('a', :minimum => 1) # Found, raises Capybara::ExpectationNotMet
-      #     page.assert_no_selector('a', :count => 4)   # Found, raises Capybara::ExpectationNotMet
-      #     page.assert_no_selector('a', :count => 5)   # Not Found, returns true
+      #     page.assert_no_selector('a', minimum: 1) # Found, raises Capybara::ExpectationNotMet
+      #     page.assert_no_selector('a', count: 4)   # Found, raises Capybara::ExpectationNotMet
+      #     page.assert_no_selector('a', count: 5)   # Not Found, returns true
       #
       # @param (see Capybara::Node::Finders#assert_selector)
       # @raise [Capybara::ExpectationNotMet]      If the selector exists
       #
-      def assert_no_selector(*args)
-        query = Capybara::Queries::SelectorQuery.new(*args)
+      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)
           if result.matches_count? && ((!result.empty?) || query.expects_none?)
@@ -199,45 +128,6 @@ module Capybara
       end
       alias_method :refute_selector, :assert_no_selector
 
-      ##
-      #
-      # Asserts that the current_node matches a given selector
-      #
-      #     node.assert_matches_selector('p#foo')
-      #     node.assert_matches_selector(:xpath, '//p[@id="foo"]')
-      #     node.assert_matches_selector(:foo)
-      #
-      # It also accepts all options that {Capybara::Node::Finders#all} accepts,
-      # such as :text and :visible.
-      #
-      #     node.assert_matches_selector('li', :text => 'Horse', :visible => true)
-      #
-      # @param (see Capybara::Node::Finders#all)
-      # @raise [Capybara::ExpectationNotMet]      If the selector does not match
-      #
-      def assert_matches_selector(*args)
-        query = Capybara::Queries::MatchQuery.new(*args)
-        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
-        end
-        return true
-      end
-
-      def assert_not_matches_selector(*args)
-        query = Capybara::Queries::MatchQuery.new(*args)
-        synchronize(query.wait) do
-          result = query.resolve_for(self.query_scope)
-          if result.include? self
-            raise Capybara::ExpectationNotMet, 'Item matched the provided selector'
-          end
-        end
-        return true
-      end
-      alias_method :refute_matches_selector, :assert_not_matches_selector
-
       ##
       #
       # Checks if a given XPath expression is on the page or a descendant of the current node.
@@ -247,14 +137,14 @@ module Capybara
       # By default it will check if the expression occurs at least once,
       # but a different number can be specified.
       #
-      #     page.has_xpath?('.//p[@id="foo"]', :count => 4)
+      #     page.has_xpath?('.//p[@id="foo"]', count: 4)
       #
       # This will check if the expression occurs exactly 4 times.
       #
       # It also accepts all options that {Capybara::Node::Finders#all} accepts,
       # such as :text and :visible.
       #
-      #     page.has_xpath?('.//li', :text => 'Horse', :visible => true)
+      #     page.has_xpath?('.//li', text: 'Horse', visible: true)
       #
       # has_xpath? can also accept XPath expressions generate by the
       # XPath gem:
@@ -267,8 +157,8 @@ module Capybara
       # @option options [Integer] :count (nil)    Number of times the expression should occur
       # @return [Boolean]                         If the expression exists
       #
-      def has_xpath?(path, options={})
-        has_selector?(:xpath, path, options)
+      def has_xpath?(path, options={}, &optional_filter_block)
+        has_selector?(:xpath, path, options, &optional_filter_block)
       end
 
       ##
@@ -279,8 +169,8 @@ module Capybara
       # @param (see Capybara::Node::Finders#has_xpath?)
       # @return [Boolean]
       #
-      def has_no_xpath?(path, options={})
-        has_no_selector?(:xpath, path, options)
+      def has_no_xpath?(path, options={}, &optional_filter_block)
+        has_no_selector?(:xpath, path, options, &optional_filter_block)
       end
 
       ##
@@ -292,22 +182,22 @@ module Capybara
       # By default it will check if the selector occurs at least once,
       # but a different number can be specified.
       #
-      #     page.has_css?('p#foo', :count => 4)
+      #     page.has_css?('p#foo', count: 4)
       #
       # This will check if the selector occurs exactly 4 times.
       #
       # It also accepts all options that {Capybara::Node::Finders#all} accepts,
       # such as :text and :visible.
       #
-      #     page.has_css?('li', :text => 'Horse', :visible => true)
+      #     page.has_css?('li', text: 'Horse', visible: true)
       #
       # @param [String] path                      A CSS selector
       # @param options                            (see Capybara::Node::Finders#all)
       # @option options [Integer] :count (nil)    Number of times the selector should occur
       # @return [Boolean]                         If the selector exists
       #
-      def has_css?(path, options={})
-        has_selector?(:css, path, options)
+      def has_css?(path, options={}, &optional_filter_block)
+        has_selector?(:css, path, options, &optional_filter_block)
       end
 
       ##
@@ -318,8 +208,8 @@ module Capybara
       # @param (see Capybara::Node::Finders#has_css?)
       # @return [Boolean]
       #
-      def has_no_css?(path, options={})
-        has_no_selector?(:css, path, options)
+      def has_no_css?(path, options={}, &optional_filter_block)
+        has_no_selector?(:css, path, options, &optional_filter_block)
       end
 
       ##
@@ -332,8 +222,9 @@ module Capybara
       # @option options [String, Regexp] :href    The value the href attribute must be
       # @return [Boolean]                 Whether it exists
       #
-      def has_link?(locator, options={})
-        has_selector?(:link, locator, options)
+      def has_link?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_selector?(:link, locator, options, &optional_filter_block)
       end
 
       ##
@@ -344,8 +235,9 @@ module Capybara
       # @param (see Capybara::Node::Finders#has_link?)
       # @return [Boolean]            Whether it doesn't exist
       #
-      def has_no_link?(locator, options={})
-        has_no_selector?(:link, locator, options)
+      def has_no_link?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_no_selector?(:link, locator, options, &optional_filter_block)
       end
 
       ##
@@ -356,8 +248,9 @@ module Capybara
       # @param [String] locator      The text, value or id of a button to check for
       # @return [Boolean]            Whether it exists
       #
-      def has_button?(locator, options={})
-        has_selector?(:button, locator, options)
+      def has_button?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_selector?(:button, locator, options, &optional_filter_block)
       end
 
       ##
@@ -368,8 +261,9 @@ module Capybara
       # @param [String] locator      The text, value or id of a button to check for
       # @return [Boolean]            Whether it doesn't exist
       #
-      def has_no_button?(locator, options={})
-        has_no_selector?(:button, locator, options)
+      def has_no_button?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_no_selector?(:button, locator, options, &optional_filter_block)
       end
 
       ##
@@ -381,11 +275,11 @@ module Capybara
       # HTML5 email/url/etc. fields, it's possible to specify a :with
       # option to specify the text the field should contain:
       #
-      #     page.has_field?('Name', :with => 'Jonas')
+      #     page.has_field?('Name', with: 'Jonas')
       #
       # It is also possible to filter by the field type attribute:
       #
-      #     page.has_field?('Email', :type => 'email')
+      #     page.has_field?('Email', type: 'email')
       #
       # Note: 'textarea' and 'select' are valid type values, matching the associated tag names.
       #
@@ -394,8 +288,9 @@ module Capybara
       # @option options [String] :type           The type attribute of the field
       # @return [Boolean]                        Whether it exists
       #
-      def has_field?(locator, options={})
-        has_selector?(:field, locator, options)
+      def has_field?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_selector?(:field, locator, options, &optional_filter_block)
       end
 
       ##
@@ -408,8 +303,9 @@ module Capybara
       # @option options [String] :type           The type attribute of the field
       # @return [Boolean]                        Whether it doesn't exist
       #
-      def has_no_field?(locator, options={})
-        has_no_selector?(:field, locator, options)
+      def has_no_field?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_no_selector?(:field, locator, options, &optional_filter_block)
       end
 
       ##
@@ -421,8 +317,9 @@ module Capybara
       # @param [String] locator           The label, name or id of a checked field
       # @return [Boolean]                 Whether it exists
       #
-      def has_checked_field?(locator, options={})
-        has_selector?(:field, locator, options.merge(:checked => true))
+      def has_checked_field?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_selector?(:field, locator, options.merge(checked: true), &optional_filter_block)
       end
 
       ##
@@ -434,8 +331,9 @@ module Capybara
       # @param [String] locator           The label, name or id of a checked field
       # @return [Boolean]                 Whether it doesn't exist
       #
-      def has_no_checked_field?(locator, options={})
-        has_no_selector?(:field, locator, options.merge(:checked => true))
+      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))
       end
 
       ##
@@ -447,8 +345,9 @@ module Capybara
       # @param [String] locator           The label, name or id of an unchecked field
       # @return [Boolean]                 Whether it exists
       #
-      def has_unchecked_field?(locator, options={})
-        has_selector?(:field, locator, options.merge(:unchecked => true))
+      def has_unchecked_field?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_selector?(:field, locator, options.merge(unchecked: true), &optional_filter_block)
       end
 
       ##
@@ -460,8 +359,9 @@ module Capybara
       # @param [String] locator           The label, name or id of an unchecked field
       # @return [Boolean]                 Whether it doesn't exist
       #
-      def has_no_unchecked_field?(locator, options={})
-        has_no_selector?(:field, locator, options.merge(:unchecked => true))
+      def has_no_unchecked_field?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_no_selector?(:field, locator, options.merge(unchecked: true), &optional_filter_block)
       end
 
       ##
@@ -471,20 +371,20 @@ module Capybara
       #
       # It can be specified which option should currently be selected:
       #
-      #     page.has_select?('Language', :selected => 'German')
+      #     page.has_select?('Language', selected: 'German')
       #
       # For multiple select boxes, several options may be specified:
       #
-      #     page.has_select?('Language', :selected => ['English', 'German'])
+      #     page.has_select?('Language', selected: ['English', 'German'])
       #
       # It's also possible to check if the exact set of options exists for
       # this select box:
       #
-      #     page.has_select?('Language', :options => ['English', 'German', 'Spanish'])
+      #     page.has_select?('Language', options: ['English', 'German', 'Spanish'])
       #
       # You can also check for a partial set of options:
       #
-      #     page.has_select?('Language', :with_options => ['English', 'German'])
+      #     page.has_select?('Language', with_options: ['English', 'German'])
       #
       # @param [String] locator                      The label, name or id of a select box
       # @option options [Array] :options             Options which should be contained in this select box
@@ -492,8 +392,9 @@ module Capybara
       # @option options [String, Array] :selected    Options which should be selected
       # @return [Boolean]                            Whether it exists
       #
-      def has_select?(locator, options={})
-        has_selector?(:select, locator, options)
+      def has_select?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_selector?(:select, locator, options, &optional_filter_block)
       end
 
       ##
@@ -504,8 +405,9 @@ module Capybara
       # @param (see Capybara::Node::Matchers#has_select?)
       # @return [Boolean]     Whether it doesn't exist
       #
-      def has_no_select?(locator, options={})
-        has_no_selector?(:select, locator, options)
+      def has_no_select?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_no_selector?(:select, locator, options, &optional_filter_block)
       end
 
       ##
@@ -518,8 +420,9 @@ module Capybara
       # @param [String] locator                        The id or caption of a table
       # @return [Boolean]                              Whether it exist
       #
-      def has_table?(locator, options={})
-        has_selector?(:table, locator, options)
+      def has_table?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_selector?(:table, locator, options, &optional_filter_block)
       end
 
       ##
@@ -530,10 +433,122 @@ module Capybara
       # @param (see Capybara::Node::Matchers#has_table?)
       # @return [Boolean]       Whether it doesn't exist
       #
-      def has_no_table?(locator, options={})
-        has_no_selector?(:table, locator, options)
+      def has_no_table?(locator=nil, options={}, &optional_filter_block)
+        locator, options = nil, locator if locator.is_a? Hash
+        has_no_selector?(:table, locator, options, &optional_filter_block)
+      end
+
+      ##
+      #
+      # Asserts that the current_node matches a given selector
+      #
+      #     node.assert_matches_selector('p#foo')
+      #     node.assert_matches_selector(:xpath, '//p[@id="foo"]')
+      #     node.assert_matches_selector(:foo)
+      #
+      # It also accepts all options that {Capybara::Node::Finders#all} accepts,
+      # such as :text and :visible.
+      #
+      #     node.assert_matches_selector('li', text: 'Horse', visible: true)
+      #
+      # @param (see Capybara::Node::Finders#all)
+      # @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
+        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
+        end
+        return true
+      end
+      alias_method :refute_matches_selector, :assert_not_matches_selector
+
+      ##
+      #
+      # Checks if the current node matches given selector
+      #
+      # @param (see Capybara::Node::Finders#has_selector?)
+      # @return [Boolean]
+      #
+      def matches_selector?(*args, &optional_filter_block)
+        assert_matches_selector(*args, &optional_filter_block)
+      rescue Capybara::ExpectationNotMet
+        return false
+      end
+
+      ##
+      #
+      # Checks if the current node matches given XPath expression
+      #
+      # @param [String, XPath::Expression] xpath The XPath expression to match against the current code
+      # @return [Boolean]
+      #
+      def matches_xpath?(xpath, options={}, &optional_filter_block)
+        matches_selector?(:xpath, xpath, options, &optional_filter_block)
+      end
+
+      ##
+      #
+      # Checks if the current node matches given CSS selector
+      #
+      # @param [String] css The CSS selector to match against the current code
+      # @return [Boolean]
+      #
+      def matches_css?(css, options={}, &optional_filter_block)
+        matches_selector?(:css, css, options, &optional_filter_block)
       end
 
+      ##
+      #
+      # Checks if the current node does not match given selector
+      # Usage is identical to Capybara::Node::Matchers#has_selector?
+      #
+      # @param (see Capybara::Node::Finders#has_selector?)
+      # @return [Boolean]
+      #
+      def not_matches_selector?(*args, &optional_filter_block)
+        assert_not_matches_selector(*args, &optional_filter_block)
+      rescue Capybara::ExpectationNotMet
+        return false
+      end
+
+      ##
+      #
+      # Checks if the current node does not match given XPath expression
+      #
+      # @param [String, XPath::Expression] xpath The XPath expression to match against the current code
+      # @return [Boolean]
+      #
+      def not_matches_xpath?(xpath, options={}, &optional_filter_block)
+        not_matches_selector?(:xpath, xpath, options, &optional_filter_block)
+      end
+
+      ##
+      #
+      # Checks if the current node does not match given CSS selector
+      #
+      # @param [String] css The CSS selector to match against the current code
+      # @return [Boolean]
+      #
+      def not_matches_css?(css, options={}, &optional_filter_block)
+        not_matches_selector?(:css, css, options, &optional_filter_block)
+      end
+
+
       ##
       # Asserts that the page or current node has the given text content,
       # ignoring any HTML tags.
@@ -629,6 +644,7 @@ module Capybara
       def ==(other)
         self.eql?(other) || (other.respond_to?(:base) && base == other.base)
       end
+
     end
   end
 end

data/lib/capybara/queries/match_query.rb

@@ -1,8 +1,6 @@
 module Capybara
   module Queries
     class MatchQuery < Capybara::Queries::SelectorQuery
-      VALID_KEYS = [:text, :visible, :exact, :wait]
-
       def visible
         if options.has_key?(:visible)
           super
@@ -14,7 +12,7 @@ module Capybara
       private
 
       def valid_keys
-        VALID_KEYS + @selector.custom_filters.keys
+        super - COUNT_KEYS
       end
     end
   end