webrat 0.5.3 → 0.6.0

data/lib/webrat/core/elements/element.rb

@@ -3,14 +3,14 @@ module Webrat
   class Element # :nodoc:
 
     def self.load_all(session, dom)
-      Webrat::XML.xpath_search(dom, xpath_search).map do |element|
+      dom.xpath(*xpath_search).map do |element|
         load(session, element)
       end
     end
 
     def self.load(session, element)
       return nil if element.nil?
-      session.elements[Webrat::XML.xpath_to(element)] ||= self.new(session, element)
+      session.elements[element.path] ||= self.new(session, element)
     end
 
     attr_reader :element
@@ -21,7 +21,7 @@ module Webrat
     end
 
     def path
-      Webrat::XML.xpath_to(@element)
+      @element.path
     end
 
     def inspect

data/lib/webrat/core/elements/field.rb

@@ -32,16 +32,21 @@ module Webrat
 
     def self.load(session, element)
       return nil if element.nil?
-      session.elements[Webrat::XML.xpath_to(element)] ||= field_class(element).new(session, element)
+      session.elements[element.path] ||= field_class(element).new(session, element)
     end
 
     def self.field_class(element)
       case element.name
       when "button"   then ButtonField
-      when "select"   then SelectField
+      when "select"
+        if element.attributes["multiple"].nil?
+          SelectField
+        else
+          MultipleSelectField
+        end
       when "textarea" then TextareaField
       else
-        case Webrat::XML.attribute(element, "type")
+        case element["type"]
         when "checkbox" then CheckboxField
         when "hidden"   then HiddenField
         when "radio"    then RadioField
@@ -67,11 +72,11 @@ module Webrat
     end
 
     def id
-      Webrat::XML.attribute(@element, "id")
+      @element["id"]
     end
 
     def disabled?
-      @element.attributes.has_key?("disabled") && Webrat::XML.attribute(@element, "disabled") != 'false'
+      @element.attributes.has_key?("disabled") && @element["disabled"] != 'false'
     end
 
     def raise_error_if_disabled
@@ -82,14 +87,16 @@ module Webrat
     def to_param
       return nil if disabled?
 
-      case Webrat.configuration.mode
+      params = case Webrat.configuration.mode
       when :rails
         parse_rails_request_params("#{name}=#{escaped_value}")
       when :merb
         ::Merb::Parse.query("#{name}=#{escaped_value}")
       else
-        { name => value }
+        { name => [*@value].first.to_s }
       end
+
+      unescape_params(params)
     end
 
     def set(value)
@@ -128,11 +135,26 @@ module Webrat
     end
 
     def name
-      Webrat::XML.attribute(@element, "name")
+      @element["name"]
     end
 
     def escaped_value
-      CGI.escape([*@value].first.to_s)
+      CGI.escape(@value.to_s)
+    end
+
+    # Because we have to escape it before sending it to the above case statement,
+    # we have to make sure we unescape each value when it gets back so assertions
+    # involving characters like <, >, and &  work as expected
+    def unescape_params(params)
+      case params.class.name
+      when 'Hash', 'Mash'
+        params.each { |key,value| params[key] = unescape_params(value) }
+        params
+      when 'Array'
+        params.collect { |value| unescape_params(value) }
+      else
+        CGI.unescapeHTML(params)
+      end
     end
 
     def labels
@@ -155,14 +177,14 @@ module Webrat
       end
 
       unless id.blank?
-        @label_elements += Webrat::XML.xpath_search(form.element, ".//label[@for = '#{id}']")
+        @label_elements += form.element.xpath(".//label[@for = '#{id}']")
       end
 
       @label_elements
     end
 
     def default_value
-      Webrat::XML.attribute(@element, "value")
+      @element["value"]
     end
 
     def replace_param_value(params, oval, nval)
@@ -199,7 +221,7 @@ module Webrat
 
     def click
       raise_error_if_disabled
-      set(Webrat::XML.attribute(@element, "value")) unless Webrat::XML.attribute(@element, "name").blank?
+      set(@element["value"]) unless @element["name"].blank?
       form.submit
     end
 
@@ -246,11 +268,11 @@ module Webrat
 
     def check
       raise_error_if_disabled
-      set(Webrat::XML.attribute(@element, "value") || "on")
+      set(@element["value"] || "on")
     end
 
     def checked?
-      Webrat::XML.attribute(@element, "checked") == "checked"
+      @element["checked"] == "checked"
     end
 
     def uncheck
@@ -261,8 +283,8 @@ module Webrat
   protected
 
     def default_value
-      if Webrat::XML.attribute(@element, "checked") == "checked"
-        Webrat::XML.attribute(@element, "value") || "on"
+      if @element["checked"] == "checked"
+        @element["value"] || "on"
       else
         nil
       end
@@ -295,11 +317,11 @@ module Webrat
         option.set(nil)
       end
 
-      set(Webrat::XML.attribute(@element, "value") || "on")
+      set(@element["value"] || "on")
     end
 
     def checked?
-      Webrat::XML.attribute(@element, "checked") == "checked"
+      @element["checked"] == "checked"
     end
 
   protected
@@ -309,8 +331,8 @@ module Webrat
     end
 
     def default_value
-      if Webrat::XML.attribute(@element, "checked") == "checked"
-        Webrat::XML.attribute(@element, "value") || "on"
+      if @element["checked"] == "checked"
+        @element["value"] || "on"
       else
         nil
       end
@@ -327,7 +349,7 @@ module Webrat
   protected
 
     def default_value
-      Webrat::XML.inner_html(@element)
+      @element.inner_html
     end
 
   end
@@ -363,10 +385,7 @@ module Webrat
         else
           ActionController::TestUploadedFile.new(@value)
         end
-      when :merb
-        # TODO: support content_type
-        File.new(@value)
-      when :rack
+      when :rack, :merb
         Rack::Test::UploadedFile.new(@value, content_type)
       end
     end
@@ -381,31 +400,88 @@ module Webrat
 
   class ResetField < Field #:nodoc:
     def self.xpath_search
-      ".//input[@type = 'reset']"
+      [".//input[@type = 'reset']"]
     end
   end
 
   class SelectField < Field #:nodoc:
 
     def self.xpath_search
-      ".//select"
+      [".//select[not(@multiple)]"]
     end
 
     def options
       @options ||= SelectOption.load_all(@session, @element)
     end
 
+    def unset(value)
+      @value = nil
+    end
+
   protected
 
     def default_value
-      selected_options = Webrat::XML.xpath_search(@element, ".//option[@selected = 'selected']")
-      selected_options = Webrat::XML.xpath_search(@element, ".//option[position() = 1]") if selected_options.empty?
+      selected_options = @element.xpath(".//option[@selected = 'selected']")
+      selected_options = @element.xpath(".//option[position() = 1]") if selected_options.empty?
 
       selected_options.map do |option|
         return "" if option.nil?
-        Webrat::XML.attribute(option, "value") || Webrat::XML.inner_html(option)
+        option["value"] || option.inner_html
+      end.uniq.first
+    end
+
+  end
+
+  class MultipleSelectField < Field #:nodoc:
+
+    def self.xpath_search
+      [".//select[@multiple='multiple']"]
+    end
+
+    def options
+      @options ||= SelectOption.load_all(@session, @element)
+    end
+
+    def set(value)
+      @value << value
+    end
+
+    def unset(value)
+      @value.delete(value)
+    end
+
+    # We have to overide how the uri string is formed when dealing with multiples
+    # Where normally a select field might produce   name=value   with a multiple,
+    # we need to form something like   name[]=value1&name[]=value2
+    def to_param
+      return nil if disabled?
+
+      uri_string = @value.collect {|value| "#{name}=#{CGI.escape(value)}"}.join("&")
+      params = case Webrat.configuration.mode
+      when :rails
+        parse_rails_request_params(uri_string)
+      when :merb
+        ::Merb::Parse.query(uri_string)
+      else
+        { name => @value }
+      end
+
+      unescape_params(params)
+    end
+
+  protected
+
+    # Overwrite SelectField definition because we don't want to select the first option
+    # (mutliples don't select the first option unlike their non multiple versions)
+    def default_value
+      selected_options = @element.xpath(".//option[@selected = 'selected']")
+
+      selected_options.map do |option|
+        return "" if option.nil?
+        option["value"] || option.inner_html
       end.uniq
     end
 
   end
+
 end

data/lib/webrat/core/elements/form.rb

@@ -9,7 +9,7 @@ module Webrat
     attr_reader :element
 
     def self.xpath_search
-      ".//form"
+      [".//form"]
     end
 
     def fields
@@ -27,7 +27,7 @@ module Webrat
   protected
 
     def dom
-      Webrat::XML.xpath_at(@session.dom, path)
+      @session.dom.xpath(path).first
     end
 
     def fields_by_type(field_types)
@@ -50,11 +50,11 @@ module Webrat
     end
 
     def form_method
-      Webrat::XML.attribute(@element, "method").blank? ? :get : Webrat::XML.attribute(@element, "method").downcase
+      @element["method"].blank? ? :get : @element["method"].downcase
     end
 
     def form_action
-      Webrat::XML.attribute(@element, "action").blank? ? @session.current_url : Webrat::XML.attribute(@element, "action")
+      @element["action"].blank? ? @session.current_url : @element["action"]
     end
 
     def merge(all_params, new_param)

data/lib/webrat/core/elements/label.rb

@@ -6,11 +6,11 @@ module Webrat
     attr_reader :element
 
     def self.xpath_search
-      ".//label"
+      [".//label"]
     end
 
     def for_id
-      Webrat::XML.attribute(@element, "for")
+      @element["for"]
     end
 
     def field
@@ -21,9 +21,9 @@ module Webrat
 
     def field_element
       if for_id.blank?
-        Webrat::XML.xpath_at(@element, *Field.xpath_search_excluding_hidden)
+        @element.xpath(*Field.xpath_search_excluding_hidden).first
       else
-        Webrat::XML.css_search(@session.current_dom, "#" + for_id).first
+        @session.current_dom.css("#" + for_id).first
       end
     end
 

data/lib/webrat/core/elements/link.rb

@@ -7,7 +7,7 @@ module Webrat
   class Link < Element #:nodoc:
 
     def self.xpath_search
-      ".//a[@href]"
+      [".//a[@href]"]
     end
 
     def click(options = {})
@@ -26,7 +26,7 @@ module Webrat
   protected
 
     def id
-      Webrat::XML.attribute(@element, "id")
+      @element["id"]
     end
 
     def data
@@ -34,11 +34,11 @@ module Webrat
     end
 
     def title
-      Webrat::XML.attribute(@element, "title")
+      @element["title"]
     end
 
     def href
-      Webrat::XML.attribute(@element, "href")
+      @element["href"]
     end
 
     def absolute_href
@@ -53,12 +53,12 @@ module Webrat
 
     def authenticity_token
       return unless onclick && onclick.include?("s.setAttribute('name', 'authenticity_token');") &&
-        onclick =~ /s\.setAttribute\('value', '([a-f0-9]{40})'\);/
+        ( onclick =~ /s\.setAttribute\('value', '([a-f0-9]{40})'\);/ || onclick =~ /s\.setAttribute\('value', '(.{44})'\);/ )
       $LAST_MATCH_INFO.captures.first
     end
 
     def onclick
-      Webrat::XML.attribute(@element, "onclick")
+      @element["onclick"]
     end
 
     def http_method

data/lib/webrat/core/elements/select_option.rb

@@ -4,7 +4,7 @@ module Webrat
   class SelectOption < Element #:nodoc:
 
     def self.xpath_search
-      ".//option"
+      [".//option"]
     end
 
     def choose
@@ -12,6 +12,15 @@ module Webrat
       select.set(value)
     end
 
+    def unchoose
+      select.raise_error_if_disabled
+      select.unset(value)
+    end
+
+    def inner_text
+      @element.inner_text
+    end
+
   protected
 
     def select
@@ -28,7 +37,11 @@ module Webrat
     end
 
     def value
-      Webrat::XML.attribute(@element, "value") || Webrat::XML.inner_html(@element)
+      @element["value"] || @element.inner_html
+    end
+
+    def label
+      @element.inner_html
     end
 
   end

data/lib/webrat/core/locators.rb

@@ -13,7 +13,7 @@ module Webrat
   module Locators
 
     def field_by_xpath(xpath)
-      Field.load(@session, Webrat::XML.xpath_at(dom, xpath))
+      Field.load(@session, dom.xpath(xpath).first)
     end
 
   end

data/lib/webrat/core/locators/area_locator.rb

@@ -11,8 +11,8 @@ module Webrat
 
       def area_element
         area_elements.detect do |area_element|
-          Webrat::XML.attribute(area_element, "title") =~ matcher ||
-          Webrat::XML.attribute(area_element, "id") =~ matcher
+          area_element["title"] =~ matcher ||
+          area_element["id"] =~ matcher
         end
       end
 
@@ -21,7 +21,7 @@ module Webrat
       end
 
       def area_elements
-        Webrat::XML.xpath_search(@dom, Area.xpath_search)
+        @dom.xpath(*Area.xpath_search)
       end
 
       def error_message