jwilger-webrat 0.4.3.4 → 0.4.4.2

data/lib/webrat/core/scope.rb

@@ -6,36 +6,36 @@ module Webrat
   # An HTML element (link, button, field, etc.) that Webrat expected was not found on the page
   class NotFoundError < WebratError
   end
-  
+
   class Scope
     include Logging
     include Locators
-    
+
     def self.from_page(session, response, response_body) #:nodoc:
       new(session) do
         @response = response
         @response_body = response_body
       end
     end
-    
+
     def self.from_scope(session, scope, selector) #:nodoc:
       new(session) do
         @scope = scope
         @selector = selector
       end
     end
-    
+
     attr_reader :session
-    
+
     def initialize(session, &block) #:nodoc:
       @session = session
       instance_eval(&block) if block_given?
-      
+
       if @selector && scoped_dom.nil?
         raise Webrat::NotFoundError.new("The scope was not found on the page: #{@selector.inspect}")
       end
     end
-    
+
     # Verifies an input field or textarea exists on the current page, and stores a value for
     # it which will be sent when the form is submitted.
     #
@@ -53,7 +53,7 @@ module Webrat
     end
 
     webrat_deprecate :fills_in, :fill_in
-    
+
     # Verifies that a hidden field exists on the current page and sets
     # the value to that given by the <tt>:to</tt> option.
     #
@@ -63,7 +63,7 @@ module Webrat
       field = locate_field(field_locator, HiddenField)
       field.set(options[:to])
     end
-    
+
     # Verifies that an input checkbox exists on the current page and marks it
     # as checked, so that the value will be submitted with the form.
     #
@@ -74,7 +74,7 @@ module Webrat
     end
 
     webrat_deprecate :checks, :check
-    
+
     # Verifies that an input checkbox exists on the current page and marks it
     # as unchecked, so that the value will not be submitted with the form.
     #
@@ -85,7 +85,7 @@ module Webrat
     end
 
     webrat_deprecate :unchecks, :uncheck
-    
+
     # Verifies that an input radio button exists on the current page and marks it
     # as checked, so that the value will be submitted with the form.
     #
@@ -96,7 +96,7 @@ module Webrat
     end
 
     webrat_deprecate :chooses, :choose
-    
+
     # Verifies that a an option element exists on the current page with the specified
     # text. You can optionally restrict the search to a specific select list by
     # assigning <tt>options[:from]</tt> the value of the select list's name or
@@ -111,7 +111,7 @@ module Webrat
     end
 
     webrat_deprecate :selects, :select
-    
+
     DATE_TIME_SUFFIXES = {
       :year   => '1i',
       :month  => '2i',
@@ -120,9 +120,9 @@ module Webrat
       :minute => '5i'
     }
 
-    # Verifies that date elements (year, month, day) exist on the current page 
+    # Verifies that date elements (year, month, day) exist on the current page
     # with the specified values. You can optionally restrict the search to a specific
-    # date's elements by assigning <tt>options[:from]</tt> the value of the date's 
+    # date's elements by assigning <tt>options[:from]</tt> the value of the date's
     # label. Selects all the date elements with date provided.  The date provided may
     # be a string or a Date/Time object.
     #
@@ -136,15 +136,15 @@ module Webrat
     #   select_date Date.parse("December 25, 2000"), :from => "Event"
     #   select_date "April 26, 1982", :id_prefix => 'birthday'
     def select_date(date_to_select, options ={})
-      date = date_to_select.is_a?(Date) || date_to_select.is_a?(Time) ? 
-                date_to_select : Date.parse(date_to_select) 
-      
+      date = date_to_select.is_a?(Date) || date_to_select.is_a?(Time) ?
+                date_to_select : Date.parse(date_to_select)
+
       id_prefix = locate_id_prefix(options) do
         year_field = FieldByIdLocator.new(@session, dom, /(.*?)_#{DATE_TIME_SUFFIXES[:year]}$/).locate
         raise NotFoundError.new("No date fields were found") unless year_field && year_field.id =~ /(.*?)_1i/
         $1
       end
-        
+
       select date.year, :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:year]}"
       select date.strftime('%B'), :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:month]}"
       select date.day, :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:day]}"
@@ -152,9 +152,9 @@ module Webrat
 
     webrat_deprecate :selects_date, :select_date
 
-    # Verifies that time elements (hour, minute) exist on the current page 
+    # Verifies that time elements (hour, minute) exist on the current page
     # with the specified values. You can optionally restrict the search to a specific
-    # time's elements by assigning <tt>options[:from]</tt> the value of the time's 
+    # time's elements by assigning <tt>options[:from]</tt> the value of the time's
     # label. Selects all the time elements with date provided.  The time provided may
     # be a string or a Time object.
     #
@@ -164,28 +164,28 @@ module Webrat
     #
     # Note: Just like Rails' time_select helper this assumes the form is using
     # 24 hour select boxes, and not 12 hours with AM/PM.
-    # 
+    #
     # Examples:
     #   select_time "9:30"
     #   select_date "3:30PM", :from => "Party Time"
     #   select_date Time.parse("10:00PM"), :from => "Event"
     #   select_date "10:30AM", :id_prefix => 'meeting'
     def select_time(time_to_select, options ={})
-      time = time_to_select.is_a?(Time) ? time_to_select : Time.parse(time_to_select) 
+      time = time_to_select.is_a?(Time) ? time_to_select : Time.parse(time_to_select)
 
       id_prefix = locate_id_prefix(options) do
         hour_field = FieldByIdLocator.new(@session, dom, /(.*?)_#{DATE_TIME_SUFFIXES[:hour]}$/).locate
         raise NotFoundError.new("No time fields were found") unless hour_field && hour_field.id =~ /(.*?)_4i/
         $1
       end
-        
+
       select time.hour.to_s.rjust(2,'0'), :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:hour]}"
       select time.min.to_s.rjust(2,'0'), :from => "#{id_prefix}_#{DATE_TIME_SUFFIXES[:minute]}"
     end
 
     webrat_deprecate :selects_time, :select_time
-   
-    # Verifies and selects all the date and time elements on the current page. 
+
+    # Verifies and selects all the date and time elements on the current page.
     # See #select_time and #select_date for more details and available options.
     #
     # Examples:
@@ -194,23 +194,23 @@ module Webrat
     #   select_datetime Time.parse("December 25, 2000 15:30"), :from => "Event"
     #   select_datetime "April 26, 1982 5:50PM", :id_prefix => 'birthday'
     def select_datetime(time_to_select, options ={})
-      time = time_to_select.is_a?(Time) ? time_to_select : Time.parse(time_to_select) 
-      
+      time = time_to_select.is_a?(Time) ? time_to_select : Time.parse(time_to_select)
+
       options[:id_prefix] ||= (options[:from] ? FieldByIdLocator.new(@session, dom, options[:from]).locate : nil)
-      
+
       select_date time, options
       select_time time, options
     end
 
     webrat_deprecate :selects_datetime, :select_datetime
-    
+
     # Verifies that an input file field exists on the current page and sets
     # its value to the given +file+, so that the file will be uploaded
     # along with the form. An optional <tt>content_type</tt> may be given.
     #
     # Example:
-    #   attaches_file "Resume", "/path/to/the/resume.txt"
-    #   attaches_file "Photo", "/path/to/the/image.png", "image/png"
+    #   attach_file "Resume", "/path/to/the/resume.txt"
+    #   attach_file "Photo", "/path/to/the/image.png", "image/png"
     def attach_file(field_locator, path, content_type = nil)
       locate_field(field_locator, FileField).set(path, content_type)
     end
@@ -229,13 +229,13 @@ module Webrat
     def click_area(area_name)
       find_area(area_name).click
     end
-    
+
     webrat_deprecate :clicks_area, :click_area
-    
+
     # Issues a request for the URL pointed to by a link on the current page,
     # follows any redirects, and verifies the final page load was successful.
-    # 
-    # click_link has very basic support for detecting Rails-generated 
+    #
+    # click_link has very basic support for detecting Rails-generated
     # JavaScript onclick handlers for PUT, POST and DELETE links, as well as
     # CSRF authenticity tokens if they are present.
     #
@@ -243,15 +243,15 @@ module Webrat
     #
     # Passing a :method in the options hash overrides the HTTP method used
     # for making the link request
-    # 
+    #
     # It will try to find links by (in order of precedence):
     #   innerHTML, with simple &nbsp; handling
     #   title
     #   id
-    #    
+    #
     # innerHTML and title are matchable by text subtring or Regexp
     # id is matchable by full text equality or Regexp
-    # 
+    #
     # Example:
     #   click_link "Sign up"
     #   click_link "Sign up", :javascript => false
@@ -261,7 +261,7 @@ module Webrat
     end
 
     webrat_deprecate :clicks_link, :click_link
-    
+
     # Verifies that a submit button exists for the form, then submits the form, follows
     # any redirects, and verifies the final page was successful.
     #
@@ -288,36 +288,38 @@ module Webrat
     def submit_form(id)
       FormLocator.new(@session, dom, id).locate.submit
     end
-    
+
     def dom # :nodoc:
       return @dom if @dom
-      
+
       if @selector
         @dom = scoped_dom
       else
         @dom = page_dom
       end
-      
+
       return @dom
     end
-    
+
+  protected
+
     def page_dom #:nodoc:
       return @response.dom if @response.respond_to?(:dom)
-      
+
       if @session.xml_content_type?
         dom = Webrat::XML.xml_document(@response_body)
       else
         dom = Webrat::XML.html_document(@response_body)
       end
-      
+
       Webrat.define_dom_method(@response, dom)
       return dom
     end
-    
+
     def scoped_dom
       Webrat::XML.css_at(@scope.dom, @selector)
     end
-    
+
     def locate_field(field_locator, *field_types) #:nodoc:
       if field_locator.is_a?(Field)
         field_locator
@@ -325,10 +327,10 @@ module Webrat
         field(field_locator, *field_types)
       end
     end
-    
+
     def locate_id_prefix(options, &location_strategy) #:nodoc:
       return options[:id_prefix] if options[:id_prefix]
-      
+
       if options[:from]
         if (label = LabelLocator.new(@session, dom, options[:from]).locate)
           label.for_id
@@ -339,10 +341,10 @@ module Webrat
         yield
       end
     end
-    
+
     def forms #:nodoc:
       @forms ||= Form.load_all(@session, dom)
     end
-    
+
   end
 end

data/lib/webrat/core/session.rb

@@ -11,7 +11,7 @@ module Webrat
 
   class InfiniteRedirectError < WebratError
   end
-  
+
   def self.session_class
     case Webrat.configuration.mode
     when :rails
@@ -26,6 +26,8 @@ module Webrat
       SinatraSession
     when :mechanize
       MechanizeSession
+    when :rack_test
+      RackTestSession
     else
       raise WebratError.new(<<-STR)
 Unknown Webrat mode: #{Webrat.configuration.mode.inspect}
@@ -77,7 +79,7 @@ For example:
     def doc_root #:nodoc:
       nil
     end
-    
+
     def header(key, value)
       @custom_headers[key] = value
     end
@@ -100,11 +102,8 @@ For example:
       h['HTTP_REFERER'] = @current_url if @current_url
 
       debug_log "REQUESTING PAGE: #{http_method.to_s.upcase} #{url} with #{data.inspect} and HTTP headers #{h.inspect}"
-      if h.empty?
-        send "#{http_method}", url, data || {}
-      else
-        send "#{http_method}", url, data || {}, h
-      end
+
+      process_request(http_method, url, data, h)
 
       save_and_open_page if exception_caught? && Webrat.configuration.open_error_files?
       raise PageLoadError.new("Page load was not successful (Code: #{response_code.inspect}):\n#{formatted_error}") unless success_code?
@@ -122,13 +121,13 @@ For example:
 
       return response
     end
-    
+
     def check_for_infinite_redirects
       if current_url == response_location
         @_identical_redirect_count ||= 0
         @_identical_redirect_count += 1
       end
-      
+
       if infinite_redirect_limit_exceeded?
         raise InfiniteRedirectError.new("#{Webrat.configuration.infinite_redirect_limit} redirects to the same URL (#{current_url.inspect})")
       end
@@ -138,7 +137,7 @@ For example:
        Webrat.configuration.infinite_redirect_limit &&
        (@_identical_redirect_count || 0) > Webrat.configuration.infinite_redirect_limit
     end
-    
+
     def success_code? #:nodoc:
       (200..499).include?(response_code)
     end
@@ -154,7 +153,7 @@ For example:
       response_location_host_domain = response_location_host.split('.')[-2..-1].join('.') rescue response_location_host
       current_host_domain == response_location_host_domain
     end
-    
+
     #easy helper to pull out where we were redirected to
     def redirected_to
       redirect? ? response_location : nil
@@ -259,12 +258,20 @@ For example:
 
   private
 
+    def process_request(http_method, url, data, headers)
+      if headers.empty?
+        send "#{http_method}", url, data || {}
+      else
+        send "#{http_method}", url, data || {}, headers
+      end
+    end
+
     def response_location
       response.headers["Location"]
     end
 
     def current_host
-      URI.parse(current_url).host || @custom_headers["Host"] || "www.example.com"
+      URI.parse(current_url).host || "www.example.com"
     end
 
     def response_location_host
@@ -276,6 +283,6 @@ For example:
       @_scopes      = nil
       @_page_scope  = nil
     end
-    
+
   end
 end

data/lib/webrat/core/xml/hpricot.rb

@@ -1,5 +1,5 @@
 module Webrat
-  
+
   def self.hpricot_document(stringlike)
     return stringlike.dom if stringlike.respond_to?(:dom)
 
@@ -15,5 +15,5 @@ module Webrat
       Hpricot(stringlike.to_s)
     end
   end
-  
-end
+
+end

data/lib/webrat/core/xml/nokogiri.rb

@@ -1,10 +1,10 @@
 require "webrat/core_extensions/meta_class"
 
 module Webrat
-  
+
   def self.nokogiri_document(stringlike) #:nodoc:
     return stringlike.dom if stringlike.respond_to?(:dom)
-    
+
     if Nokogiri::HTML::Document === stringlike
       stringlike
     elsif Nokogiri::XML::NodeSet === stringlike
@@ -17,10 +17,10 @@ module Webrat
       Nokogiri::HTML(stringlike.to_s)
     end
   end
-  
+
   def self.html_nokogiri_document(stringlike) #:nodoc:
     return stringlike.dom if stringlike.respond_to?(:dom)
-    
+
     if Nokogiri::HTML::Document === stringlike
       stringlike
     elsif Nokogiri::XML::NodeSet === stringlike
@@ -33,10 +33,10 @@ module Webrat
       Nokogiri::HTML(stringlike.to_s)
     end
   end
-  
+
   def self.xml_nokogiri_document(stringlike) #:nodoc:
     return stringlike.dom if stringlike.respond_to?(:dom)
-    
+
     if Nokogiri::HTML::Document === stringlike
       stringlike
     elsif Nokogiri::XML::NodeSet === stringlike
@@ -49,20 +49,20 @@ module Webrat
       Nokogiri::XML(stringlike.to_s)
     end
   end
-  
+
   def self.define_dom_method(object, dom) #:nodoc:
     object.meta_class.send(:define_method, :dom) do
       dom
     end
   end
-  
+
 end
 
 
 module Nokogiri #:nodoc:
   module CSS #:nodoc:
     class XPathVisitor #:nodoc:
-      
+
       def visit_pseudo_class_text(node) #:nodoc:
         "@type='text'"
       end
@@ -70,7 +70,7 @@ module Nokogiri #:nodoc:
       def visit_pseudo_class_password(node) #:nodoc:
         "@type='password'"
       end
-      
+
     end
   end
-end
+end

data/lib/webrat/core/xml/rexml.rb

@@ -1,5 +1,5 @@
 module Webrat
-  
+
   def self.rexml_document(stringlike)
     stringlike = stringlike.body.to_s if stringlike.respond_to?(:body)
 
@@ -20,5 +20,5 @@ module Webrat
       end
     end
   end
-  
-end
+
+end

data/lib/webrat/core/xml.rb

@@ -4,7 +4,7 @@ require "webrat/core/xml/rexml"
 
 module Webrat #:nodoc:
   module XML #:nodoc:
-    
+
     def self.document(stringlike) #:nodoc:
       if Webrat.configuration.parse_with_nokogiri?
         Webrat.nokogiri_document(stringlike)
@@ -12,7 +12,7 @@ module Webrat #:nodoc:
         Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
       end
     end
-    
+
     def self.html_document(stringlike) #:nodoc:
       if Webrat.configuration.parse_with_nokogiri?
         Webrat.html_nokogiri_document(stringlike)
@@ -20,7 +20,7 @@ module Webrat #:nodoc:
         Webrat.rexml_document(Webrat.hpricot_document(stringlike).to_html)
       end
     end
-    
+
     def self.xml_document(stringlike) #:nodoc:
       if Webrat.configuration.parse_with_nokogiri?
         Webrat.xml_nokogiri_document(stringlike)
@@ -36,7 +36,7 @@ module Webrat #:nodoc:
         element.to_s
       end
     end
-    
+
     def self.inner_html(element)
       if Webrat.configuration.parse_with_nokogiri?
         element.inner_html
@@ -44,7 +44,7 @@ module Webrat #:nodoc:
         element.text
       end
     end
-    
+
     def self.all_inner_text(element)
       if Webrat.configuration.parse_with_nokogiri?
         element.inner_text
@@ -52,7 +52,7 @@ module Webrat #:nodoc:
         Hpricot(element.to_s).children.first.inner_text
       end
     end
-    
+
     def self.inner_text(element)
       if Webrat.configuration.parse_with_nokogiri?
         element.inner_text
@@ -64,7 +64,7 @@ module Webrat #:nodoc:
         end
       end
     end
-    
+
     def self.xpath_to(element)
       if Webrat.configuration.parse_with_nokogiri?
         element.path
@@ -72,25 +72,25 @@ module Webrat #:nodoc:
         element.xpath
       end
     end
-    
+
     def self.attribute(element, attribute_name)
       return element[attribute_name] if element.is_a?(Hash)
-      
+
       if Webrat.configuration.parse_with_nokogiri?
         element[attribute_name]
       else
         element.attributes[attribute_name]
       end
     end
-    
+
     def self.xpath_at(*args)
       xpath_search(*args).first
     end
-    
+
     def self.css_at(*args)
       css_search(*args).first
     end
-    
+
     def self.xpath_search(element, *searches)
       searches.flatten.map do |search|
         if Webrat.configuration.parse_with_nokogiri?
@@ -100,16 +100,16 @@ module Webrat #:nodoc:
         end
       end.flatten.compact
     end
-    
+
     def self.css_search(element, *searches) #:nodoc:
       xpath_search(element, css_to_xpath(*searches))
     end
-    
+
     def self.css_to_xpath(*selectors)
       selectors.map do |rule|
         Nokogiri::CSS.xpath_for(rule, :prefix => ".//")
       end.flatten.uniq
     end
-    
+
   end
-end
+end

data/lib/webrat/core_extensions/blank.rb

@@ -12,7 +12,7 @@ class Object #:nodoc:
   def blank?
     respond_to?(:empty?) ? empty? : !self
   end
-    
+
   # An object is present if it's not blank.
   def present?
     !blank?

data/lib/webrat/core_extensions/deprecate.rb

@@ -5,4 +5,4 @@ class Module #:nodoc:
       __send__(new_method_name, *args)
     end
   end
-end
+end

data/lib/webrat/core_extensions/detect_mapped.rb

@@ -1,12 +1,12 @@
 class Array #:nodoc:
-  
+
   def detect_mapped
     each do |element|
       result = yield element
       return result if result
     end
-    
+
     return nil
   end
-  
-end
+
+end

data/lib/webrat/core_extensions/meta_class.rb

@@ -3,4 +3,4 @@ class ::Object #:nodoc:
     class << self; self end
   end
 end
-    
+