webrat 0.4.4 → 0.4.5

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

@@ -8,10 +8,10 @@ module Webrat
   # Raised when Webrat is asked to manipulate a disabled form field
   class DisabledFieldError < WebratError
   end
-  
+
   class Field < Element #:nodoc:
     attr_reader :value
-    
+
     def self.xpath_search
       [".//button", ".//input", ".//textarea", ".//select"]
     end
@@ -19,22 +19,22 @@ module Webrat
     def self.xpath_search_excluding_hidden
       [".//button", ".//input[ @type != 'hidden']", ".//textarea", ".//select"]
     end
-    
+
     def self.field_classes
       @field_classes || []
     end
-    
+
     def self.inherited(klass)
       @field_classes ||= []
       @field_classes << klass
       # raise args.inspect
     end
-    
+
     def self.load(session, element)
       return nil if element.nil?
       session.elements[Webrat::XML.xpath_to(element)] ||= field_class(element).new(session, element)
     end
-    
+
     def self.field_class(element)
       case element.name
       when "button"   then ButtonField
@@ -55,7 +55,7 @@ module Webrat
         end
       end
     end
-    
+
     def initialize(*args)
       super
       @value = default_value
@@ -65,7 +65,7 @@ module Webrat
       return nil if labels.empty?
       labels.first.text
     end
-    
+
     def id
       Webrat::XML.attribute(@element, "id")
     end
@@ -73,35 +73,37 @@ module Webrat
     def disabled?
       @element.attributes.has_key?("disabled") && Webrat::XML.attribute(@element, "disabled") != 'false'
     end
-    
+
     def raise_error_if_disabled
       return unless disabled?
       raise DisabledFieldError.new("Cannot interact with disabled form element (#{self})")
     end
-        
+
     def to_param
       return nil if disabled?
-      
+
       case Webrat.configuration.mode
       when :rails
         parse_rails_request_params("#{name}=#{escaped_value}")
       when :merb
         ::Merb::Parse.query("#{name}=#{escaped_value}")
+      when :mechanize
+        { name => value }
       else
         { name => escaped_value }
       end
     end
-    
+
     def set(value)
       @value = value
     end
-    
+
     def unset
       @value = default_value
     end
-    
+
   protected
-  
+
     def parse_rails_request_params(params)
       if defined?(ActionController::AbstractRequest)
         ActionController::AbstractRequest.parse_query_parameters(params)
@@ -113,38 +115,38 @@ module Webrat
         Rack::Utils.parse_nested_query(params)
       end
     end
-  
+
     def form
       Form.load(@session, form_element)
     end
-    
+
     def form_element
       parent = @element.parent
-      
+
       while parent.respond_to?(:parent)
         return parent if parent.name == 'form'
         parent = parent.parent
       end
     end
-    
+
     def name
       Webrat::XML.attribute(@element, "name")
     end
-    
+
     def escaped_value
-      CGI.escape(@value.to_s)
+      CGI.escape([*@value].first.to_s)
     end
-    
+
     def labels
       @labels ||= label_elements.map do |element|
         Label.load(@session, element)
       end
     end
-    
+
     def label_elements
       return @label_elements unless @label_elements.nil?
       @label_elements = []
-    
+
       parent = @element.parent
       while parent.respond_to?(:parent)
         if parent.name == 'label'
@@ -153,18 +155,18 @@ module Webrat
         end
         parent = parent.parent
       end
-    
+
       unless id.blank?
         @label_elements += Webrat::XML.xpath_search(form.element, ".//label[@for = '#{id}']")
       end
-    
+
       @label_elements
     end
-    
+
     def default_value
       Webrat::XML.attribute(@element, "value")
     end
-    
+
     def replace_param_value(params, oval, nval)
       output = Hash.new
       params.each do |key, value|
@@ -181,13 +183,13 @@ module Webrat
       output
     end
   end
-  
+
   class ButtonField < Field #:nodoc:
 
     def self.xpath_search
       [".//button", ".//input[@type = 'submit']", ".//input[@type = 'button']", ".//input[@type = 'image']"]
     end
-    
+
     def to_param
       return nil if @value.nil?
       super
@@ -210,7 +212,7 @@ module Webrat
     def self.xpath_search
       ".//input[@type = 'hidden']"
     end
-    
+
     def to_param
       if collection_name?
         super
@@ -238,7 +240,7 @@ module Webrat
     def self.xpath_search
       ".//input[@type = 'checkbox']"
     end
-    
+
     def to_param
       return nil if @value.nil?
       super
@@ -248,7 +250,7 @@ module Webrat
       raise_error_if_disabled
       set(Webrat::XML.attribute(@element, "value") || "on")
     end
-    
+
     def checked?
       Webrat::XML.attribute(@element, "checked") == "checked"
     end
@@ -271,11 +273,11 @@ module Webrat
   end
 
   class PasswordField < Field #:nodoc:
-    
+
     def self.xpath_search
       ".//input[@type = 'password']"
     end
-    
+
   end
 
   class RadioField < Field #:nodoc:
@@ -283,31 +285,31 @@ module Webrat
     def self.xpath_search
       ".//input[@type = 'radio']"
     end
-    
+
     def to_param
       return nil if @value.nil?
       super
     end
-    
+
     def choose
       raise_error_if_disabled
       other_options.each do |option|
         option.set(nil)
       end
-      
+
       set(Webrat::XML.attribute(@element, "value") || "on")
     end
-    
+
     def checked?
       Webrat::XML.attribute(@element, "checked") == "checked"
     end
-    
+
   protected
 
     def other_options
       form.fields.select { |f| f.name == name }
     end
-    
+
     def default_value
       if Webrat::XML.attribute(@element, "checked") == "checked"
         Webrat::XML.attribute(@element, "value") || "on"
@@ -323,7 +325,7 @@ module Webrat
     def self.xpath_search
       ".//textarea"
     end
-    
+
   protected
 
     def default_value
@@ -331,13 +333,13 @@ module Webrat
     end
 
   end
-  
+
   class FileField < Field #:nodoc:
-    
+
     def self.xpath_search
       ".//input[@type = 'file']"
     end
-    
+
     attr_accessor :content_type
 
     def set(value, content_type = nil)
@@ -352,14 +354,20 @@ module Webrat
         replace_param_value(super, @value, test_uploaded_file)
       end
     end
-    
+
   protected
-  
+
     def test_uploaded_file
-      if content_type
-        ActionController::TestUploadedFile.new(@value, content_type)
-      else
-        ActionController::TestUploadedFile.new(@value)
+      case Webrat.configuration.mode
+      when :rails
+        if content_type
+          ActionController::TestUploadedFile.new(@value, content_type)
+        else
+          ActionController::TestUploadedFile.new(@value)
+        end
+      when :merb
+        # TODO: support content_type
+        File.new(@value)
       end
     end
 
@@ -386,17 +394,17 @@ module Webrat
     def options
       @options ||= SelectOption.load_all(@session, @element)
     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 = Webrat::XML.xpath_search(@element, ".//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)
-      end
+      end.uniq
     end
 
   end

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

@@ -7,7 +7,7 @@ require "webrat/core/locators/field_named_locator"
 module Webrat
   class Form < Element #:nodoc:
     attr_reader :element
-    
+
     def self.xpath_search
       ".//form"
     end
@@ -15,21 +15,21 @@ module Webrat
     def fields
       @fields ||= Field.load_all(@session, @element)
     end
-    
+
     def submit
       @session.request_page(form_action, form_method, params)
     end
-    
+
     def field_named(name, *field_types)
       Webrat::Locators::FieldNamedLocator.new(@session, dom, name, *field_types).locate
     end
-    
+
   protected
-  
+
     def dom
       Webrat::XML.xpath_at(@session.dom, path)
     end
-    
+
     def fields_by_type(field_types)
       if field_types.any?
         fields.select { |f| field_types.include?(f.class) }
@@ -37,26 +37,26 @@ module Webrat
         fields
       end
     end
-    
+
     def params
       all_params = {}
-      
+
       fields.each do |field|
         next if field.to_param.nil?
         merge(all_params, field.to_param)
       end
-      
+
       all_params
     end
-    
+
     def form_method
       Webrat::XML.attribute(@element, "method").blank? ? :get : Webrat::XML.attribute(@element, "method").downcase
     end
-    
+
     def form_action
       Webrat::XML.attribute(@element, "action").blank? ? @session.current_url : Webrat::XML.attribute(@element, "action")
     end
-    
+
     def merge(all_params, new_param)
       new_param.each do |key, value|
         case all_params[key]
@@ -69,7 +69,7 @@ module Webrat
         end
       end
     end
-  
+
     def merge_hash_values(a, b) # :nodoc:
       a.keys.each do |k|
         if b.has_key?(k)
@@ -85,19 +85,19 @@ module Webrat
       end
       a.merge!(b)
     end
-    
+
     def hash_classes
       klasses = [Hash]
-      
+
       case Webrat.configuration.mode
       when :rails
         klasses << HashWithIndifferentAccess
       when :merb
         klasses << Mash
       end
-      
+
       klasses
     end
-    
+
   end
 end

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

@@ -2,9 +2,9 @@ require "webrat/core/elements/element"
 
 module Webrat
   class Label < Element #:nodoc:
-    
+
     attr_reader :element
-    
+
     def self.xpath_search
       ".//label"
     end
@@ -12,13 +12,13 @@ module Webrat
     def for_id
       Webrat::XML.attribute(@element, "for")
     end
-    
+
     def field
       Field.load(@session, field_element)
     end
-    
+
   protected
-  
+
     def field_element
       if for_id.blank?
         Webrat::XML.xpath_at(@element, *Field.xpath_search_excluding_hidden)
@@ -26,6 +26,6 @@ module Webrat
         Webrat::XML.css_search(@session.current_dom, "#" + for_id).first
       end
     end
-    
+
   end
 end