brynary-webrat 0.3.2.2 → 0.4.0

data/lib/webrat/core/matchers/have_tag.rb

@@ -52,6 +52,20 @@ module Webrat
     end
     
     alias_method :match_tag, :have_tag
+    
+    # Asserts that the body of the response contains
+    # the supplied tag with the associated selectors
+    def assert_have_tag(name, attributes = {})
+      ht = HaveTag.new([name, attributes])
+      assert ht.matches?(response_body), ht.failure_message
+    end
+    
+    # Asserts that the body of the response
+    # does not contain the supplied string or regepx
+    def assert_have_no_tag(name, attributes = {})
+      ht = HaveTag.new([name, attributes])
+      assert !ht.matches?(response_body), ht.negative_failure_message
+    end
 
   end
 end

data/lib/webrat/core/matchers/have_xpath.rb

@@ -79,5 +79,15 @@ module Webrat
     end
     alias_method :match_xpath, :have_xpath
     
+    def assert_have_xpath(expected, &block)
+      hs = HaveXpath.new(expected, &block)
+      assert hs.matches?(response_body), hs.failure_message
+    end
+    
+    def assert_have_no_xpath(expected, &block)
+      hs = HaveXpath.new(expected, &block)
+      assert !hs.matches?(response_body), hs.negative_failure_message
+    end
+    
   end
 end

data/lib/webrat/core/methods.rb

@@ -47,6 +47,7 @@ module Webrat
       :select_option,
       :set_hidden_field, :submit_form,
       :request_page, :current_dom,
+      :response_body, 
       :selects_date, :selects_time, :selects_datetime,
       :select_date, :select_time, :select_datetime,
       :field_by_xpath,

data/lib/webrat/core/scope.rb

@@ -30,6 +30,10 @@ module Webrat
     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
@@ -50,6 +54,11 @@ module Webrat
 
     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.
+    #
+    # Example:
+    #   set_hidden_field 'user_id', :to => 1
     def set_hidden_field(field_locator, options = {})
       field = locate_field(field_locator, HiddenField)
       field.set(options[:to])
@@ -207,7 +216,16 @@ module Webrat
     end
 
     webrat_deprecate :attaches_file, :attach_file
-    
+
+    # Issues a request for the URL pointed to by an <tt>area</tt> tag
+    # on the current page, follows any redirects, and verifies the
+    # final page load was successful.
+    #
+    # The area used is the first area whose title or id contains the
+    # given +area_name+ (case is ignored).
+    #
+    # Example:
+    #   click_area 'Australia'
     def click_area(area_name)
       find_area(area_name).click
     end
@@ -258,7 +276,15 @@ module Webrat
     end
 
     webrat_deprecate :clicks_button, :click_button
-    
+
+    # Submit the form with the given id.
+    #
+    # Note that +click_button+ is usually preferrable for simulating
+    # form submissions, as you may specify part of the button text
+    # rather than the form id.
+    #
+    # Example:
+    #   submit_form 'login'
     def submit_form(id)
       FormLocator.new(@session, dom, id).locate.submit
     end
@@ -290,14 +316,8 @@ module Webrat
       return dom
     end
     
-    def scoped_dom #:nodoc:
-      source = Webrat::XML.to_html(Webrat::XML.css_search(@scope.dom, @selector).first)
-      
-      if @session.xml_content_type?
-        Webrat::XML.xml_document(source)
-      else
-        Webrat::XML.html_document(source)
-      end
+    def scoped_dom
+      Webrat::XML.css_at(@scope.dom, @selector)
     end
     
     def locate_field(field_locator, *field_types) #:nodoc:

data/lib/webrat/core/session.rb

@@ -8,7 +8,7 @@ module Webrat
   # A page load or form submission returned an unsuccessful response code (500-599)
   class PageLoadError < WebratError
   end
-  
+
   def self.session_class
     case Webrat.configuration.mode
     when :rails
@@ -24,32 +24,44 @@ module Webrat
     when :mechanize
       MechanizeSession
     else
-      raise WebratError.new("Unknown Webrat mode: #{Webrat.configuration.mode.inspect}")
+      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|
+    config.mode = :rails
+  end
+      STR
     end
   end
-  
+
   class Session
     extend Forwardable
     include Logging
     include SaveAndOpenPage
-    
     attr_reader :current_url
     attr_reader :elements
-    
+
     def initialize(context = nil) #:nodoc:
       @http_method     = :get
       @data            = {}
       @default_headers = {}
       @custom_headers  = {}
       @context         = context
-      
+
       reset
     end
-    
+
     def current_dom #:nodoc:
       current_scope.dom
     end
-    
+
     # For backwards compatibility -- removing in 1.0
     def current_page #:nodoc:
       page = OpenStruct.new
@@ -58,7 +70,7 @@ module Webrat
       page.data = @data
       page
     end
-    
+
     def doc_root #:nodoc:
       nil
     end
@@ -70,7 +82,7 @@ module Webrat
     def http_accept(mime_type)
       header('Accept', Webrat::MIME.mime_type(mime_type))
     end
-    
+
     def basic_auth(user, pass)
       encoded_login = ["#{user}:#{pass}"].pack("m*")
       header('HTTP_AUTHORIZATION', "Basic #{encoded_login}")
@@ -93,28 +105,38 @@ module Webrat
 
       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?
-      
+
       reset
-      
+
       @current_url  = url
       @http_method  = http_method
       @data         = data
-      
+
+      request_page(response_location, :get, data) if internal_redirect?
+
       return response
     end
-    
+
     def success_code? #:nodoc:
       (200..499).include?(response_code)
     end
-    
+
+    def redirect? #:nodoc:
+      response_code / 100 == 3
+    end
+
+    def internal_redirect? #:nodoc:
+      redirect? && current_host == response_location_host
+    end
+
     def exception_caught? #:nodoc:
       response_body =~ /Exception caught/
     end
-    
+
     def current_scope #:nodoc:
       scopes.last || page_scope
     end
-    
+
     # Reloads the last page requested. Note that this will resubmit forms
     # and their data.
     def reloads
@@ -122,10 +144,10 @@ module Webrat
     end
 
     webrat_deprecate :reload, :reloads
-      
-    
+
+
     # Works like click_link, but only looks for the link text within a given selector
-    # 
+    #
     # Example:
     #   click_link_within "#user_12", "Vote"
     def click_link_within(selector, link_text)
@@ -135,14 +157,14 @@ module Webrat
     end
 
     webrat_deprecate :clicks_link_within, :click_link_within
-    
+
     def within(selector)
       scopes.push(Scope.from_scope(self, current_scope, selector))
       ret = yield(current_scope)
       scopes.pop
       return ret
     end
-    
+
     # Issues a GET request for a page, follows any redirects, and verifies the final page
     # load was successful.
     #
@@ -151,7 +173,7 @@ module Webrat
     def visit(url = nil, http_method = :get, data = {})
       request_page(url, http_method, data)
     end
-    
+
     webrat_deprecate :visits, :visit
 
     # Subclasses can override this to show error messages without html
@@ -166,25 +188,25 @@ module Webrat
     def page_scope #:nodoc:
       @_page_scope ||= Scope.from_page(self, response, response_body)
     end
-    
+
     def dom
       page_scope.dom
     end
-    
+
     def xml_content_type?
       false
     end
-    
+
     def simulate
       return if Webrat.configuration.mode == :selenium
       yield
     end
-    
+
     def automate
       return unless Webrat.configuration.mode == :selenium
       yield
     end
-    
+
     def_delegators :current_scope, :fill_in,            :fills_in
     def_delegators :current_scope, :set_hidden_field
     def_delegators :current_scope, :submit_form
@@ -199,15 +221,25 @@ module Webrat
     def_delegators :current_scope, :click_area,         :clicks_area
     def_delegators :current_scope, :click_link,         :clicks_link
     def_delegators :current_scope, :click_button,       :clicks_button
-    def_delegators :current_scope, :should_see
-    def_delegators :current_scope, :should_not_see
     def_delegators :current_scope, :field_labeled
     def_delegators :current_scope, :field_by_xpath
     def_delegators :current_scope, :field_with_id
     def_delegators :current_scope, :select_option
-    
+
   private
-    
+
+    def response_location
+      response.headers["Location"]
+    end
+
+    def current_host
+      URI.parse(current_url).host || "www.example.com"
+    end
+
+    def response_location_host
+      URI.parse(response_location).host || "www.example.com"
+    end
+
     def reset
       @elements     = {}
       @_scopes      = nil

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

@@ -10,11 +10,11 @@ module Webrat
     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
   

data/lib/webrat/mechanize.rb

@@ -6,6 +6,10 @@ module Webrat #:nodoc:
     attr_accessor :response
     alias :page :response
     
+    def request_page(url, http_method, data) #:nodoc:
+      super(absolute_url(url), http_method, data)
+    end
+    
     def get(url, data, headers_argument_not_used = nil)
       @response = mechanize.get(url, data)
     end
@@ -36,8 +40,35 @@ module Webrat #:nodoc:
     end
 
     def_delegators :mechanize, :basic_auth
+    
+    def absolute_url(url) #:nodoc:
+      current_host, current_path = split_current_url
+      if url =~ Regexp.new('^https?://')
+        url
+      elsif url =~ Regexp.new('^/')
+        current_host + url
+      elsif url =~ Regexp.new('^\.')
+        current_host + absolute_path(current_path, url)
+      else
+        url
+      end
+    end
+    
+    private
+      def split_current_url
+        current_url =~ Regexp.new('^(https?://[^/]+)(/.*)?')
+        [Regexp.last_match(1), Regexp.last_match(2)]
+      end
       
+      def absolute_path(current_path, url)
+        levels_up = url.split('/').find_all { |x| x == '..' }.size
+        ancestor = if current_path.nil?
+          ""
+        else
+          current_path.split("/")[0..(-1 - levels_up)].join("/")
+        end
+        descendent = url.split("/")[levels_up..-1]
+        "#{ancestor}/#{descendent}"
+      end
   end
 end
-
-Webrat.configuration.mode = :mechanize

data/lib/webrat/merb.rb

@@ -1,77 +1,9 @@
 require "webrat"
 
-require "cgi"
-gem "extlib"
-require "extlib"
-require "merb-core"
-
-HashWithIndifferentAccess = Mash
-
-module Webrat
-  class MerbSession < Session #:nodoc:
-    include Merb::Test::MakeRequest
-    
-    attr_accessor :response
-    
-    def get(url, data, headers = nil)
-      do_request(url, data, headers, "GET")
-    end
-  
-    def post(url, data, headers = nil)
-      do_request(url, data, headers, "POST")
-    end
-  
-    def put(url, data, headers = nil)
-      do_request(url, data, headers, "PUT")
-    end
-  
-    def delete(url, data, headers = nil)
-      do_request(url, data, headers, "DELETE")
-    end
-    
-    def response_body
-      @response.body.to_s
-    end
-    
-    def response_code
-      @response.status
-    end
-    
-    def do_request(url, data, headers, method)
-      @response = request(url, 
-        :params => (data && data.any?) ? data : nil, 
-        :headers => headers,
-        :method => method)
-      follow_redirect
-    end
-    
-    def follow_redirect
-      self.get(@response.headers['Location'], nil, @response.headers) if @response.status == 302
-    end
-
-  end
-end
-
-module Merb #:nodoc:
-  module Test #:nodoc:
-    module RequestHelper #:nodoc:
-      def request(uri, env = {})
-        @_webrat_session ||= Webrat::MerbSession.new
-        @_webrat_session.response = @_webrat_session.request(uri, env)
-      end
-  
-      def follow_redirect
-        @_webrat_session.follow_redirect
-      end
-    end
-  end
-end
-
-class Merb::Test::RspecStory #:nodoc:
-  def browser
-    @browser ||= Webrat::MerbSession.new
-  end
-end
-
-Webrat.configuration.mode = :merb
+# This is a temporary hack to support backwards compatibility
+# with Merb 1.0.8 until it's updated to use the new Webrat.configure
+# syntax
 
+Webrat.configure do |config|
+  config.mode = :merb
+end