From 5f3265c4714efd697cb71015489a9c59d1129440 Mon Sep 17 00:00:00 2001
From: thoefer <mail@tomhoefer.de>
Date: Mon, 1 Aug 2011 11:28:31 +0200
Subject: Fix the issue where default_url_options is being cached on test
 cases. Closes #1872. Closes #2031.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 actionpack/lib/action_controller/metal/testing.rb | 5 +++++
 actionpack/lib/action_controller/test_case.rb     | 1 +
 2 files changed, 6 insertions(+)

(limited to 'actionpack/lib/action_controller')

diff --git a/actionpack/lib/action_controller/metal/testing.rb b/actionpack/lib/action_controller/metal/testing.rb
index f4efeb33ba..d1813ee745 100644
--- a/actionpack/lib/action_controller/metal/testing.rb
+++ b/actionpack/lib/action_controller/metal/testing.rb
@@ -4,6 +4,11 @@ module ActionController
 
     include RackDelegation
 
+    def recycle!
+      @_url_options = nil
+    end
+
+
     # TODO: Clean this up
     def process_with_new_base_test(request, response)
       @_request = request
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 45bb641aee..c8cf04bb69 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -450,6 +450,7 @@ module ActionController
         @controller.params.merge!(parameters)
         build_request_uri(action, parameters)
         @controller.class.class_eval { include Testing }
+        @controller.recycle! 
         @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?
-- 
cgit v1.2.3


From aa0d3cece80f6181bbd664596c46fc0f65b4abbe Mon Sep 17 00:00:00 2001
From: Oge Nnadi <ogechi.nnadi@digitalscientists.com>
Date: Fri, 12 Aug 2011 12:00:32 -0300
Subject: Typo fix

---
 actionpack/lib/action_controller/caching/actions.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_controller')

diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index 667ba15cc9..0031d2701f 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -38,7 +38,7 @@ module ActionController #:nodoc:
     # <tt>:action => 'lists'</tt> is not the same as
     # <tt>:action => 'list', :format => :xml</tt>.
     #
-    # You can set modify the default action cache path by passing a
+    # You can modify the default action cache path by passing a
     # <tt>:cache_path</tt> option. This will be passed directly to
     # <tt>ActionCachePath.path_for</tt>. This is handy for actions with
     # multiple possible routes that should be cached differently. If a
-- 
cgit v1.2.3