aslakhellesoy-webrat 0.3.2.2 → 0.4.4.1

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,20 +12,20 @@ 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)
+        Webrat::XML.xpath_at(@element, *Field.xpath_search_excluding_hidden)
       else
-        Webrat::XML.css_search(@session.dom, "#" + for_id).first
+        Webrat::XML.css_search(@session.current_dom, "#" + for_id).first
       end
     end
-    
+
   end
 end

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

@@ -4,30 +4,30 @@ require "webrat/core/elements/element"
 
 module Webrat
   class Link < Element #:nodoc:
-    
+
     def self.xpath_search
       ".//a[@href]"
     end
-    
+
     def click(options = {})
       method = options[:method] || http_method
       return if href =~ /^#/ && method == :get
-      
+
       options[:javascript] = true if options[:javascript].nil?
-      
+
       if options[:javascript]
         @session.request_page(absolute_href, method, data)
       else
         @session.request_page(absolute_href, :get, {})
       end
     end
-    
+
   protected
-  
+
     def id
       Webrat::XML.attribute(@element, "id")
     end
-  
+
     def data
       authenticity_token.blank? ? {} : {"authenticity_token" => authenticity_token}
     end
@@ -49,17 +49,17 @@ module Webrat
         href
       end
     end
-    
+
     def authenticity_token
       return unless onclick && onclick.include?("s.setAttribute('name', 'authenticity_token');") &&
         onclick =~ /s\.setAttribute\('value', '([a-f0-9]{40})'\);/
       $LAST_MATCH_INFO.captures.first
     end
-    
+
     def onclick
       Webrat::XML.attribute(@element, "onclick")
     end
-    
+
     def http_method
       if !onclick.blank? && onclick.include?("f.submit()")
         http_method_from_js_form
@@ -81,10 +81,12 @@ module Webrat
         :delete
       elsif onclick.include?("m.setAttribute('value', 'put')")
         :put
+      elsif onclick.include?("m.setAttribute('value', 'post')")
+        :post
       else
         raise Webrat::WebratError.new("No HTTP method for _method param in #{onclick.inspect}")
       end
     end
-    
+
   end
 end

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

@@ -2,34 +2,34 @@ require "webrat/core/elements/element"
 
 module Webrat
   class SelectOption < Element #:nodoc:
-    
+
     def self.xpath_search
       ".//option"
     end
-    
+
     def choose
       select.raise_error_if_disabled
       select.set(value)
     end
-    
+
   protected
-    
+
     def select
       SelectField.load(@session, select_element)
     end
-    
+
     def select_element
       parent = @element.parent
-      
+
       while parent.respond_to?(:parent)
         return parent if parent.name == 'select'
         parent = parent.parent
       end
     end
-    
+
     def value
       Webrat::XML.attribute(@element, "value") || Webrat::XML.inner_html(@element)
     end
-    
+
   end
-end
+end

data/lib/webrat/core/locators.rb

@@ -11,10 +11,10 @@ require "webrat/core/locators/form_locator"
 
 module Webrat
   module Locators
-    
+
     def field_by_xpath(xpath)
       Field.load(@session, Webrat::XML.xpath_at(dom, xpath))
     end
-    
+
   end
 end

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

@@ -2,37 +2,37 @@ require "webrat/core/locators/locator"
 
 module Webrat
   module Locators
-    
+
     class AreaLocator < Locator # :nodoc:
-      
+
       def locate
         Area.load(@session, area_element)
       end
-  
+
       def area_element
         area_elements.detect do |area_element|
           Webrat::XML.attribute(area_element, "title") =~ matcher ||
           Webrat::XML.attribute(area_element, "id") =~ matcher
         end
       end
-  
+
       def matcher
         /#{Regexp.escape(@value.to_s)}/i
       end
-  
+
       def area_elements
         Webrat::XML.xpath_search(@dom, Area.xpath_search)
       end
-  
+
       def error_message
         "Could not find area with name #{@value}"
       end
-      
+
     end
-    
+
     def find_area(id_or_title) #:nodoc:
       AreaLocator.new(@session, dom, id_or_title).locate!
     end
-    
+
   end
-end
+end

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

@@ -2,13 +2,13 @@ require "webrat/core/locators/locator"
 
 module Webrat
   module Locators
-    
+
     class ButtonLocator < Locator # :nodoc:
-  
+
       def locate
         ButtonField.load(@session, button_element)
       end
-  
+
       def button_element
         button_elements.detect do |element|
           @value.nil?             ||
@@ -18,37 +18,37 @@ module Webrat
           matches_alt?(element)
         end
       end
-  
+
       def matches_id?(element)
         (@value.is_a?(Regexp) && Webrat::XML.attribute(element, "id") =~ @value) ||
         (!@value.is_a?(Regexp) && Webrat::XML.attribute(element, "id") == @value.to_s)
       end
-  
+
       def matches_value?(element)
         Webrat::XML.attribute(element, "value") =~ /^\W*#{Regexp.escape(@value.to_s)}/i
       end
-  
+
       def matches_html?(element)
         Webrat::XML.inner_html(element) =~ /#{Regexp.escape(@value.to_s)}/i
       end
-  
+
       def matches_alt?(element)
         Webrat::XML.attribute(element, "alt") =~ /^\W*#{Regexp.escape(@value.to_s)}/i
       end
-  
+
       def button_elements
         Webrat::XML.xpath_search(@dom, *ButtonField.xpath_search)
       end
-  
+
       def error_message
         "Could not find button #{@value.inspect}"
       end
-      
+
     end
-    
+
     def find_button(value) #:nodoc:
       ButtonLocator.new(@session, dom, value).locate!
     end
-    
+
   end
-end
+end

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

@@ -2,13 +2,13 @@ require "webrat/core/locators/locator"
 
 module Webrat
   module Locators
-    
+
     class FieldByIdLocator < Locator # :nodoc:
-  
+
       def locate
         Field.load(@session, field_element)
       end
-  
+
       def field_element
         field_elements.detect do |field_element|
           if @value.is_a?(Regexp)
@@ -18,7 +18,7 @@ module Webrat
           end
         end
       end
-  
+
       def field_elements
         Webrat::XML.xpath_search(@dom, *Field.xpath_search)
       end
@@ -26,12 +26,12 @@ module Webrat
       def error_message
         "Could not find field with id #{@value.inspect}"
       end
-      
+
     end
-    
+
     def field_with_id(id, *field_types)
       FieldByIdLocator.new(@session, dom, id, *field_types).locate!
     end
-    
+
   end
-end
+end

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

@@ -3,13 +3,13 @@ require "webrat/core/locators/locator"
 
 module Webrat
   module Locators
-    
+
     class FieldLabeledLocator < Locator # :nodoc:
-  
+
       def locate
-        matching_labels.any? && matching_labels.first.field
+        matching_labels.any? && matching_labels.detect_mapped { |label| label.field }
       end
-      
+
       def matching_labels
         matching_label_elements.sort_by do |label_element|
           text(label_element).length
@@ -17,21 +17,21 @@ module Webrat
           Label.load(@session, label_element)
         end
       end
-      
+
       def matching_label_elements
         label_elements.select do |label_element|
-          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}\b/i
+          text(label_element) =~ /^\W*#{Regexp.escape(@value.to_s)}(\b|\Z)/i
         end
       end
-      
+
       def label_elements
         Webrat::XML.xpath_search(@dom, Label.xpath_search)
       end
-  
+
       def error_message
         "Could not find field labeled #{@value.inspect}"
       end
-      
+
       def text(element)
         str = Webrat::XML.all_inner_text(element)
         str.gsub!("\n","")
@@ -39,12 +39,18 @@ module Webrat
         str.squeeze!(" ")
         str
       end
-      
+
     end
-    
+
+    # Locates a form field based on a <tt>label</tt> element in the HTML source.
+    # This can be useful in order to verify that a field is pre-filled with the
+    # correct value.
+    #
+    # Example:
+    #   field_labeled("First name").value.should == "Bryan"
     def field_labeled(label, *field_types)
       FieldLabeledLocator.new(@session, dom, label, *field_types).locate!
     end
-    
+
   end
-end
+end

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

@@ -2,24 +2,24 @@ require "webrat/core/locators/locator"
 
 module Webrat
   module Locators
-    
+
     class FieldLocator < Locator # :nodoc:
-  
+
       def locate
         FieldByIdLocator.new(@session, @dom, @value).locate   ||
         FieldNamedLocator.new(@session, @dom, @value, *@field_types).locate   ||
         FieldLabeledLocator.new(@session, @dom, @value, *@field_types).locate
       end
-      
+
       def error_message
         "Could not find field: #{@value.inspect}"
       end
-      
+
     end
-    
+
     def field(*args) # :nodoc:
       FieldLocator.new(@session, dom, *args).locate!
     end
-    
+
   end
-end
+end

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

@@ -2,23 +2,23 @@ require "webrat/core/locators/locator"
 
 module Webrat
   module Locators
-    
+
     class FieldNamedLocator < Locator # :nodoc:
-  
+
       def locate
         Field.load(@session, field_element)
       end
-  
+
       def field_element
         field_elements.detect do |field_element|
           Webrat::XML.attribute(field_element, "name") == @value.to_s
         end
       end
-  
+
       def field_elements
         Webrat::XML.xpath_search(@dom, *xpath_searches)
       end
-  
+
       def xpath_searches
         if @field_types.any?
           @field_types.map { |field_type| field_type.xpath_search }.flatten
@@ -26,16 +26,16 @@ module Webrat
           Array(Field.xpath_search)
         end
       end
-  
+
       def error_message
         "Could not find field named #{@value.inspect}"
       end
-      
+
     end
-    
+
     def field_named(name, *field_types)
       FieldNamedLocator.new(@session, dom, name, *field_types).locate!
     end
-    
+
   end
-end
+end