1 files changed, 45 insertions, 20 deletions

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index e306697f4b..bc4f8bb9ce 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -1,6 +1,7 @@
 require 'rack/session/abstract/id'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/class/attribute'
 
 module ActionController
   module TemplateAssertions
@@ -40,6 +41,13 @@ module ActionController
       ActiveSupport::Notifications.unsubscribe("!render_template.action_view")
     end
 
+    def process(*args)
+      @partials = Hash.new(0)
+      @templates = Hash.new(0)
+      @layouts = Hash.new(0)
+      super
+    end
+
     # Asserts that the request was rendered with the appropriate template file or partials.
     #
     # ==== Examples
@@ -127,7 +135,7 @@ module ActionController
     class Result < ::Array #:nodoc:
       def to_s() join '/' end
       def self.new_escaped(strings)
-        new strings.collect {|str| URI.unescape str}
+        new strings.collect {|str| uri_parser.unescape str}
       end
     end
 
@@ -164,9 +172,14 @@ module ActionController
     end
 
     def recycle!
+      write_cookies!
+      @env.delete('HTTP_COOKIE') if @cookies.blank?
+      @env.delete('action_dispatch.cookies')
+      @cookies = nil
       @formats = nil
       @env.delete_if { |k, v| k =~ /^(action_dispatch|rack)\.request/ }
       @env.delete_if { |k, v| k =~ /^action_dispatch\.rescue/ }
+      @symbolized_path_params = nil
       @method = @request_method = nil
       @fullpath = @ip = @remote_ip = nil
       @env['action_dispatch.request.query_parameters'] = {}
@@ -186,20 +199,23 @@ module ActionController
     end
   end
 
-  class TestSession < ActionDispatch::Session::AbstractStore::SessionHash #:nodoc:
-    DEFAULT_OPTIONS = ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS
+  class TestSession < Rack::Session::Abstract::SessionHash #:nodoc:
+    DEFAULT_OPTIONS = Rack::Session::Abstract::ID::DEFAULT_OPTIONS
 
     def initialize(session = {})
+      @env, @by = nil, nil
       replace(session.stringify_keys)
       @loaded = true
     end
 
-    def exists?; true; end
+    def exists?
+      true
+    end
   end
 
   # Superclass for ActionController functional tests. Functional tests allow you to
   # test a single controller action per test method. This should not be confused with
-  # integration tests (see ActionController::IntegrationTest), which are more like
+  # integration tests (see ActionDispatch::IntegrationTest), which are more like
   # "stories" that can involve multiple controllers and multiple actions (i.e. multiple
   # different HTTP requests).
   #
@@ -244,7 +260,7 @@ module ActionController
   #      after calling +post+. If the various assert methods are not sufficient, then you
   #      may use this object to inspect the HTTP response in detail.
   #
-  # (Earlier versions of Rails required each functional test to subclass
+  # (Earlier versions of \Rails required each functional test to subclass
   # Test::Unit::TestCase and define @controller, @request, @response in +setup+.)
   #
   # == Controller is automatically inferred
@@ -257,7 +273,7 @@ module ActionController
   #     tests WidgetController
   #   end
   #
-  # == Testing controller internals
+  # == \Testing controller internals
   #
   # In addition to these specific assertions, you also have easy access to various collections that the regular test/unit assertions
   # can be used against. These collections are:
@@ -265,7 +281,7 @@ module ActionController
   # * assigns: Instance variables assigned in the action that are available for the view.
   # * session: Objects being saved in the session.
   # * flash: The flash objects currently in the session.
-  # * cookies: Cookies being sent to the user on this request.
+  # * cookies: \Cookies being sent to the user on this request.
   #
   # These collections can be used just like any other hash:
   #
@@ -289,9 +305,13 @@ module ActionController
   # and cookies, though. For sessions, you just do:
   #
   #   @request.session[:key] = "value"
-  #   @request.cookies["key"] = "value"
+  #   @request.cookies[:key] = "value"
+  #
+  # To clear the cookies for a test just clear the request's cookies hash:
+  #
+  #   @request.cookies.clear
   #
-  # == Testing named routes
+  # == \Testing named routes
   #
   # If you're using named routes, they can be easily tested using the original named routes' methods straight in the test case.
   # Example:
@@ -311,14 +331,14 @@ module ActionController
         def tests(controller_class)
           self.controller_class = controller_class
         end
-        
+
         def controller_class=(new_class)
           prepare_controller_class(new_class) if new_class
-          write_inheritable_attribute(:controller_class, new_class)
+          self._controller_class = new_class
         end
 
         def controller_class
-          if current_controller_class = read_inheritable_attribute(:controller_class)
+          if current_controller_class = self._controller_class
             current_controller_class
           else
             self.controller_class = determine_default_controller_class(name)
@@ -393,16 +413,18 @@ module ActionController
         parameters ||= {}
         @request.assign_parameters(@routes, @controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters)
 
-        @request.session = ActionController::TestSession.new(session) unless session.nil?
+        @request.session = ActionController::TestSession.new(session) if session
         @request.session["flash"] = @request.flash.update(flash || {})
         @request.session["flash"].sweep
 
         @controller.request = @request
         @controller.params.merge!(parameters)
         build_request_uri(action, parameters)
-        Base.class_eval { include Testing }
+        @controller.class.class_eval { include Testing }
         @controller.process_with_new_base_test(@request, @response)
+        @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {}
         @request.session.delete('flash') if @request.session['flash'].blank?
+        @request.cookies.merge!(@response.cookies)
         @response
       end
 
@@ -416,7 +438,7 @@ module ActionController
 
         @request.env.delete('PATH_INFO')
 
-        if @controller
+        if defined?(@controller) && @controller
           @controller.request = @request
           @controller.params = {}
         end
@@ -430,6 +452,7 @@ module ActionController
       included do
         include ActionController::TemplateAssertions
         include ActionDispatch::Assertions
+        class_attribute :_controller_class
         setup :setup_controller_request_and_response
       end
 
@@ -437,7 +460,7 @@ module ActionController
 
       def build_request_uri(action, parameters)
         unless @request.env["PATH_INFO"]
-          options = @controller.__send__(:url_options).merge(parameters)
+          options = @controller.respond_to?(:url_options) ? @controller.__send__(:url_options).merge(parameters) : parameters
           options.update(
             :only_path => true,
             :action => action,
@@ -461,9 +484,11 @@ module ActionController
     # The exception is stored in the exception accessor for further inspection.
     module RaiseActionExceptions
       def self.included(base)
-        base.class_eval do
-          attr_accessor :exception
-          protected :exception, :exception=
+        unless base.method_defined?(:exception) && base.method_defined?(:exception=)
+          base.class_eval do
+            attr_accessor :exception
+            protected :exception, :exception=
+          end
         end
       end