aslakhellesoy-webrat 0.3.2.2 → 0.4.4.1

data/lib/webrat/core/session.rb

@@ -9,6 +9,9 @@ module Webrat
   class PageLoadError < WebratError
   end
 
+  class InfiniteRedirectError < WebratError
+  end
+
   def self.session_class
     case Webrat.configuration.mode
     when :rails
@@ -17,18 +20,19 @@ module Webrat
       MerbSession
     when :selenium
       SeleniumSession
-    when :rack
-      RackSession
-    when :sinatra
-      SinatraSession
     when :mechanize
       MechanizeSession
+    when :rack, :sinatra
+      RackSession
     else
       raise WebratError.new(<<-STR)
 Unknown Webrat mode: #{Webrat.configuration.mode.inspect}
 
 Please ensure you have a Webrat configuration block that specifies a mode
 in your test_helper.rb, spec_helper.rb, or env.rb (for Cucumber).
+
+This configure block supercedes the need to require "webrat/<framework>".
+
 For example:
 
   Webrat.configure do |config|
@@ -45,12 +49,16 @@ For example:
     attr_reader :current_url
     attr_reader :elements
 
-    def initialize(context = nil) #:nodoc:
+    def_delegators :@adapter, :response, :request,
+      :response_code, :response_body, :response_body=, :response_code=,
+      :get, :post, :put, :delete
+
+    def initialize(adapter=nil)
       @http_method     = :get
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
-      @context         = context
+      @adapter         = adapter
 
       reset
     end
@@ -61,6 +69,7 @@ For example:
 
     # For backwards compatibility -- removing in 1.0
     def current_page #:nodoc:
+      warn "current_page is deprecated and will be going away in the next release. Use current_url instead."
       page = OpenStruct.new
       page.url = @current_url
       page.http_method = @http_method
@@ -71,7 +80,7 @@ For example:
     def doc_root #:nodoc:
       nil
     end
-    
+
     def header(key, value)
       @custom_headers[key] = value
     end
@@ -94,11 +103,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?
@@ -109,11 +115,30 @@ For example:
       @http_method  = http_method
       @data         = data
 
-      request_page(response_location, :get, data) if internal_redirect?
+      if internal_redirect?
+        check_for_infinite_redirects
+        request_page(response_location, :get, {})
+      end
 
       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
+    end
+
+    def infinite_redirect_limit_exceeded?
+       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
@@ -122,8 +147,17 @@ For example:
       response_code / 100 == 3
     end
 
-    def internal_redirect? #:nodoc:
-      redirect? && current_host == response_location_host
+    def internal_redirect?
+      return false unless redirect?
+      #should keep internal_redirects if the subdomain changes
+      current_host_domain = current_host.split('.')[-2..-1].join('.') rescue current_host
+      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
     end
 
     def exception_caught? #:nodoc:
@@ -136,11 +170,11 @@ For example:
 
     # Reloads the last page requested. Note that this will resubmit forms
     # and their data.
-    def reloads
+    def reload
       request_page(@current_url, @http_method, @data)
     end
 
-    webrat_deprecate :reload, :reloads
+    webrat_deprecate :reloads, :reload
 
 
     # Works like click_link, but only looks for the link text within a given selector
@@ -222,9 +256,18 @@ For example:
     def_delegators :current_scope, :field_by_xpath
     def_delegators :current_scope, :field_with_id
     def_delegators :current_scope, :select_option
+    def_delegators :current_scope, :field_named
 
   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
@@ -242,6 +285,6 @@ For example:
       @_scopes      = nil
       @_page_scope  = nil
     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/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,26 +1,26 @@
 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
       stringlike
     elsif StringIO === stringlike
-      Nokogiri.parse(stringlike.string)
+      Nokogiri::HTML(stringlike.string)
     elsif stringlike.respond_to?(:body)
-      Nokogiri.parse(stringlike.body.to_s)
+      Nokogiri::HTML(stringlike.body.to_s)
     else
-      Nokogiri.parse(stringlike.to_s)
+      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_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
-    
+

data/lib/webrat/core_extensions/tcp_socket.rb

@@ -0,0 +1,27 @@
+class TCPSocket
+
+  def self.wait_for_service_with_timeout(options)
+    start_time = Time.now
+
+    until listening_service?(options)
+      verbose_wait
+
+      if options[:timeout] && (Time.now > start_time + options[:timeout])
+        raise SocketError.new("Socket did not open within #{options[:timeout]} seconds")
+      end
+    end
+  end
+
+  def self.wait_for_service_termination_with_timeout(options)
+    start_time = Time.now
+
+    while listening_service?(options)
+      verbose_wait
+
+      if options[:timeout] && (Time.now > start_time + options[:timeout])
+        raise SocketError.new("Socket did not terminate within #{options[:timeout]} seconds")
+      end
+    end
+  end
+
+end