capybara 2.0.3 → 2.1.0.beta1

data/lib/capybara/node/matchers.rb

@@ -13,7 +13,7 @@ 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.
       #
@@ -28,8 +28,12 @@ module Capybara
       #     page.has_selector?(:xpath, XPath.descendant(:p))
       #
       # @param (see Capybara::Node::Finders#all)
-      # @option options [Integer] :count (nil)    Number of times the expression should occur
-      # @return [Boolean]                         If the expression exists
+      # @param options                             a customizable set of options
+      # @option options [Integer] :count (nil)     Number of times the text should occur
+      # @option options [Integer] :minimum (nil)   Minimum number of times the text should occur
+      # @option options [Integer] :maximum (nil)   Maximum number of times the text should occur
+      # @option options [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)
@@ -71,7 +75,7 @@ module Capybara
       #
       #     page.assert_selector('li', :text => 'Horse', :visible => true)
       #
-      # {assert_selector} can also accept XPath expressions generated by the
+      # `assert_selector` can also accept XPath expressions generated by the
       # XPath gem:
       #
       #     page.assert_selector(:xpath, XPath.descendant(:p))
@@ -193,17 +197,26 @@ module Capybara
       # Checks if the page or current node has the given text content,
       # ignoring any HTML tags and normalizing whitespace.
       #
-      # This only matches displayable text and specifically excludes text
-      # contained within non-display nodes such as script or head tags.
+      # By default it will check if the text occurs at least once,
+      # but a different number can be specified.
+      #
+      #     page.has_text?('lorem ipsum', between: 2..4)
+      #
+      # This will check if the text occurs from 2 to 4 times.
       #
-      # @param [String] content       The text to check for
-      # @return [Boolean]             Whether it exists
+      # @overload has_text?([type], text, [options])
+      #   @param [:all, :visible] type               Whether to check for only visible or all text
+      #   @param [String, Regexp] text               The text/regexp to check for
+      #   @param [Hash] options                      additional options
+      #   @option options [Integer] :count (nil)     Number of times the text should occur
+      #   @option options [Integer] :minimum (nil)   Minimum number of times the text should occur
+      #   @option options [Integer] :maximum (nil)   Maximum number of times the text should occur
+      #   @option options [Range]   :between (nil)   Range of times that should contain number of times text occurs
+      #   @return [Boolean]                          Whether it exists
       #
-      def has_text?(content)
+      def has_text?(*args)
         synchronize do
-          unless Capybara::Helpers.normalize_whitespace(text).match(Capybara::Helpers.to_regexp(content))
-            raise ExpectationNotMet
-          end
+          raise ExpectationNotMet unless text_found?(*args)
         end
         return true
       rescue Capybara::ExpectationNotMet
@@ -216,17 +229,12 @@ module Capybara
       # Checks if the page or current node does not have the given text
       # content, ignoring any HTML tags and normalizing whitespace.
       #
-      # This only matches displayable text and specifically excludes text
-      # contained within non-display nodes such as script or head tags.
+      # @param             (see #has_text?)
+      # @return [Boolean]  Whether it doesn't exist
       #
-      # @param [String] content       The text to check for
-      # @return [Boolean]             Whether it doesn't exist
-      #
-      def has_no_text?(content)
+      def has_no_text?(*args)
         synchronize do
-          if Capybara::Helpers.normalize_whitespace(text).match(Capybara::Helpers.to_regexp(content))
-            raise ExpectationNotMet
-          end
+          raise ExpectationNotMet if text_found?(*args)
         end
         return true
       rescue Capybara::ExpectationNotMet
@@ -299,6 +307,8 @@ module Capybara
       #
       #     page.has_field?('Email', :type => 'email')
       #
+      # Note: 'textarea' and 'select' are valid type values, matching the associated tag names.
+      #
       # @param [String] locator           The label, name or id of a field to check for
       # @option options [String] :with    The text content of the field
       # @option options [String] :type    The type attribute of the field
@@ -450,6 +460,13 @@ module Capybara
 
     private
 
+      def text_found?(*args)
+        type = args.shift if args.first.is_a?(Symbol) or args.first.nil?
+        content, options = args
+        count = Capybara::Helpers.normalize_whitespace(text(type)).scan(Capybara::Helpers.to_regexp(content)).count
+
+        Capybara::Helpers.matches_count?(count, options || {})
+      end
     end
   end
 end

data/lib/capybara/node/simple.rb

@@ -26,7 +26,7 @@ module Capybara
       #
       # @return [String]    The text of the element
       #
-      def text
+      def text(type=nil)
         native.text
       end
 
@@ -108,6 +108,15 @@ module Capybara
         native[:checked]
       end
 
+      ##
+      #
+      # Whether or not the element is disabled.
+      #
+      # @return [Boolean]     Whether the element is disabled
+      def disabled?
+        native[:disabled]
+      end
+
       ##
       #
       # Whether or not the element is selected.
@@ -118,7 +127,7 @@ module Capybara
         native[:selected]
       end
 
-      def synchronize
+      def synchronize(seconds=nil)
         yield # simple nodes don't need to wait
       end
 
@@ -126,13 +135,26 @@ module Capybara
         # no op
       end
 
-      def unsynchronized
-        yield # simple nodes don't need to wait
+      def title
+        native.xpath("//title").first.text
       end
 
-      def all(*args)
-        query = Capybara::Query.new(*args)
-        elements = native.xpath(query.xpath).map do |node|
+      def has_title?(content)
+        title.match(Capybara::Helpers.to_regexp(content))
+      end
+
+      def has_no_title?(content)
+        not has_title?(content)
+      end
+
+    private
+
+      def resolve_query(query, exact=nil)
+        elements = if query.selector.format == :css
+          native.css(query.css)
+        else
+          native.xpath(query.xpath(exact))
+        end.map do |node|
           self.class.new(node)
         end
         Capybara::Result.new(elements, query)

data/lib/capybara/query.rb

@@ -1,16 +1,13 @@
 module Capybara
   class Query
-    attr_accessor :selector, :locator, :options, :xpath, :find, :negative
+    attr_accessor :selector, :locator, :options, :expression, :find, :negative
 
-    VALID_KEYS = [:text, :visible, :between, :count, :maximum, :minimum]
+    VALID_KEYS = [:text, :visible, :between, :count, :maximum, :minimum, :exact, :match, :wait]
+    VALID_MATCH = [:first, :smart, :prefer_exact, :one]
 
     def initialize(*args)
       @options = if args.last.is_a?(Hash) then args.pop.dup else {} end
 
-      unless options.has_key?(:visible)
-        @options[:visible] = Capybara.ignore_hidden_elements
-      end
-
       if args[0].is_a?(Symbol)
         @selector = Selector.all[args[0]]
         @locator = args[1]
@@ -20,8 +17,12 @@ module Capybara
       end
       @selector ||= Selector.all[Capybara.default_selector]
 
-      @xpath = @selector.call(@locator).to_s
+      # for compatibility with Capybara 2.0
+      if Capybara.exact_options and @selector == Selector.all[:option]
+        @options[:exact] = true
+      end
 
+      @expression = @selector.call(@locator)
       assert_valid_keys!
     end
 
@@ -35,34 +36,76 @@ module Capybara
     end
 
     def matches_filters?(node)
-      node.unsynchronized do
-        if options[:text]
-          regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text])
-          return false if not node.text.match(regexp)
+      if options[:text]
+        regexp = options[:text].is_a?(Regexp) ? options[:text] : Regexp.escape(options[:text])
+        return false if not node.text(visible).match(regexp)
+      end
+      case visible
+        when :visible then return false unless node.visible?
+        when :hidden then return false if node.visible?
+      end
+      selector.custom_filters.each do |name, filter|
+        if options.has_key?(name)
+          return false unless filter.matches?(node, options[name])
+        elsif filter.default?
+          return false unless filter.matches?(node, filter.default)
         end
-        return false if options[:visible] and not node.visible?
-        selector.custom_filters.each do |name, block|
-          return false if options.has_key?(name) and not block.call(node, options[name])
+      end
+    end
+
+    def visible
+      if options.has_key?(:visible)
+        case @options[:visible]
+          when true then :visible
+          when false then :all
+          else @options[:visible]
+        end
+      else
+        if Capybara.ignore_hidden_elements
+          :visible
+        else
+          :all
         end
-        true
       end
     end
 
-    def matches_count?(count)
-      case
-      when options[:between]
-        options[:between] === count
-      when options[:count]
-        options[:count].to_i == count
-      when options[:maximum]
-        options[:maximum].to_i >= count
-      when options[:minimum]
-        options[:minimum].to_i <= count
+    def wait
+      if options.has_key?(:wait)
+        @options[:wait] or 0
       else
-        count > 0
+        Capybara.default_wait_time
       end
     end
 
+    def exact?
+      if options.has_key?(:exact)
+        @options[:exact]
+      else
+        Capybara.exact
+      end
+    end
+
+    def match
+      if options.has_key?(:match)
+        @options[:match]
+      else
+        Capybara.match
+      end
+    end
+
+    def xpath(exact=nil)
+      exact = self.exact? if exact == nil
+      if @expression.respond_to?(:to_xpath) and exact
+        @expression.to_xpath(:exact)
+      else
+        @expression.to_s
+      end
+    end
+
+    def css
+      @expression
+    end
+
   private
 
     def assert_valid_keys!
@@ -73,6 +116,9 @@ module Capybara
         valid_names = valid_keys.map(&:inspect).join(", ")
         raise ArgumentError, "invalid keys #{invalid_names}, should be one of #{valid_names}"
       end
+      unless VALID_MATCH.include?(match)
+        raise ArgumentError, "invalid option #{match.inspect} for :match, should be one of #{VALID_MATCH.map(&:inspect).join(", ")}"
+      end
     end
   end
 end

data/lib/capybara/rack_test/browser.rb

@@ -80,8 +80,12 @@ class Capybara::RackTest::Browser
     @dom ||= Nokogiri::HTML(html)
   end
 
-  def find(selector)
-    dom.xpath(selector).map { |node| Capybara::RackTest::Node.new(self, node) }
+  def find(format, selector)
+    if format==:css
+      dom.css(selector, Capybara::RackTest::CSSHandlers.new)
+    else
+      dom.xpath(selector)
+    end.map { |node| Capybara::RackTest::Node.new(self, node) }
   end
 
   def html
@@ -89,7 +93,11 @@ class Capybara::RackTest::Browser
   rescue Rack::Test::Error
     ""
   end
-
+  
+  def title
+    dom.xpath("//title").text
+  end
+  
 protected
 
   def build_rack_mock_session

data/lib/capybara/rack_test/css_handlers.rb

@@ -0,0 +1,8 @@
+class Capybara::RackTest::CSSHandlers
+  def disabled list
+    list.find_all { |node| node.has_attribute? 'disabled' }
+  end        
+  def enabled list
+    list.find_all { |node| !node.has_attribute? 'disabled' }
+  end
+end

data/lib/capybara/rack_test/driver.rb

@@ -62,10 +62,14 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
     response.status
   end
 
-  def find(selector)
-    browser.find(selector)
+  def find_xpath(selector)
+    browser.find(:xpath, selector)
   end
-
+  
+  def find_css(selector)
+    browser.find(:css,selector)
+  end
+  
   def html
     browser.html
   end
@@ -73,6 +77,10 @@ class Capybara::RackTest::Driver < Capybara::Driver::Base
   def dom
     browser.dom
   end
+  
+  def title
+    browser.title
+  end
 
   def reset!
     @browser = nil

data/lib/capybara/rack_test/form.rb

@@ -17,7 +17,14 @@ class Capybara::RackTest::Form < Capybara::RackTest::Node
   def params(button)
     params = {}
 
-    native.xpath("(.//input|.//select|.//textarea)[not(@disabled)]").map do |field|
+    form_element_types=[:input, :select, :textarea]
+    form_elements_xpath=XPath.generate do |x| 
+      xpath=x.descendant(*form_element_types).where(~x.attr(:form))
+      xpath=xpath.union(x.anywhere(*form_element_types).where(x.attr(:form) == native[:id])) if native[:id]
+      xpath.where(~x.attr(:disabled))
+    end.to_s
+    
+    native.xpath(form_elements_xpath).map do |field|
       case field.name
       when 'input'
         if %w(radio checkbox).include? field['type']

data/lib/capybara/rack_test/node.rb

@@ -1,5 +1,9 @@
 class Capybara::RackTest::Node < Capybara::Driver::Node
-  def text
+  def all_text
+    Capybara::Helpers.normalize_whitespace(native.text)
+  end
+
+  def visible_text
     Capybara::Helpers.normalize_whitespace(unnormalized_text)
   end
 
@@ -15,42 +19,21 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     if (Array === value) && !self[:multiple]
       raise ArgumentError.new "Value cannot be an Array when 'multiple' attribute is not present. Not a #{value.class}"
     end
-    if tag_name == 'input' and type == 'radio'
-      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'
-    elsif tag_name == 'input' and type == 'checkbox'
-      if value && !native['checked']
-        native['checked'] = 'checked'
-      elsif !value && native['checked']
-        native.remove_attribute('checked')
-      end
-    elsif tag_name == 'input'
-      if (type == 'text' || type == 'password') && self[:maxlength] &&
-        !self[:maxlength].empty?
-        # Browser behavior for maxlength="0" is inconsistent, so we stick with
-        # Firefox, allowing no input
-        value = value[0...self[:maxlength].to_i]
-      end
-      if Array === value #Assert multiple attribute is present
-        value.each do |v|
-          new_native = native.clone
-          new_native.remove_attribute('value')
-          native.add_next_sibling(new_native)
-          new_native['value'] = v.to_s
-        end
-        native.remove
-      else
-        native['value'] = value.to_s
-      end
-    elsif tag_name == "textarea"
-      native.content = value.to_s
+
+    if radio?
+      set_radio(value)
+    elsif checkbox?
+      set_checkbox(value)
+    elsif input_field?
+      set_input(value)
+    elsif textarea?
+      native.content = value.to_s unless self[:readonly]
     end
   end
 
   def select_option
     if select_node['multiple'] != 'multiple'
-      select_node.find(".//option[@selected]").each { |node| node.native.remove_attribute("selected") }
+      select_node.find_xpath(".//option[@selected]").each { |node| node.native.remove_attribute("selected") }
     end
     native["selected"] = 'selected'
   end
@@ -89,14 +72,26 @@ class Capybara::RackTest::Node < Capybara::Driver::Node
     string_node.selected?
   end
 
+  def disabled?
+    if %w(option optgroup).include? tag_name
+      string_node.disabled? || find_xpath("parent::*")[0].disabled?
+    else
+      string_node.disabled?
+    end
+  end
+  
   def path
     native.path
   end
 
-  def find(locator)
+  def find_xpath(locator)
     native.xpath(locator).map { |n| self.class.new(driver, n) }
   end
-
+  
+  def find_css(locator)    
+    native.css(locator, Capybara::RackTest::CSSHandlers.new).map { |n| self.class.new(driver, n) }
+  end
+  
   def ==(other)
     native == other.native
   end
@@ -125,7 +120,7 @@ private
 
   # a reference to the select node if this is an option node
   def select_node
-    find('./ancestor::select').first
+    find_xpath('./ancestor::select').first
   end
 
   def type
@@ -133,6 +128,67 @@ private
   end
 
   def form
-    native.ancestors('form').first
+    if native[:form]
+      native.xpath("//form[@id='#{native[:form]}']").first
+    else
+      native.ancestors('form').first
+    end
+  end
+
+  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'
+  end
+
+  def set_checkbox(value)
+    if value && !native['checked']
+      native['checked'] = 'checked'
+    elsif !value && native['checked']
+      native.remove_attribute('checked')
+    end
+  end
+
+  def set_input(value)
+    if text_or_password? && attribute_is_not_blank?(:maxlength)
+      # Browser behavior for maxlength="0" is inconsistent, so we stick with
+      # Firefox, allowing no input
+      value = value[0...self[:maxlength].to_i]
+    end
+    if Array === value #Assert multiple attribute is present
+      value.each do |v|
+        new_native = native.clone
+        new_native.remove_attribute('value')
+        native.add_next_sibling(new_native)
+        new_native['value'] = v.to_s
+      end
+      native.remove
+    else
+      native['value'] = value.to_s unless self[:readonly]
+    end
+  end
+
+  def attribute_is_not_blank?(attribute)
+    self[attribute] && !self[attribute].empty?
+  end
+
+  def checkbox?
+    input_field? && type == 'checkbox'
+  end
+
+  def input_field?
+    tag_name == 'input'
+  end
+
+  def radio?
+    input_field? && type == 'radio'
+  end
+
+  def textarea?
+    tag_name == "textarea"
+  end
+
+  def text_or_password?
+    input_field? && (type == 'text' || type == 'password')
   end
 end