From ad98219599db964e6663ce9948ddaf5b6cc52249 Mon Sep 17 00:00:00 2001
From: Andreas Neuhaus <zargony@zargony.com>
Date: Sat, 10 May 2008 17:54:09 +0200
Subject: [PATCH] Fixed flash.now not being accessible in tests. Flash sweeping is now done before action processing instead after

---
 actionpack/lib/action_controller/flash.rb |    7 +------
 actionpack/test/controller/test_test.rb   |   10 ++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/actionpack/lib/action_controller/flash.rb b/actionpack/lib/action_controller/flash.rb
index 692168f..0148fb5 100644
--- a/actionpack/lib/action_controller/flash.rb
+++ b/actionpack/lib/action_controller/flash.rb
@@ -28,7 +28,6 @@ module ActionController #:nodoc:
       base.class_eval do
         include InstanceMethods
         alias_method_chain :assign_shortcuts, :flash
-        alias_method_chain :process_cleanup,  :flash
         alias_method_chain :reset_session,    :flash
       end
     end
@@ -166,11 +165,7 @@ module ActionController #:nodoc:
         def assign_shortcuts_with_flash(request, response) #:nodoc:
           assign_shortcuts_without_flash(request, response)
           flash(:refresh)
-        end
-    
-        def process_cleanup_with_flash
-          flash.sweep if @_session
-          process_cleanup_without_flash
+          flash.sweep if @_session && !component_request?
         end
     end
   end
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 04cc2a2..ba6c7f4 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -12,6 +12,11 @@ class TestTest < Test::Unit::TestCase
       render :text => 'ignore me'
     end
 
+    def set_flash_now
+      flash.now["test_now"] = ">#{flash["test_now"]}<"
+      render :text => 'ignore me'
+    end
+
     def set_session
       session['string'] = 'A wonder'
       session[:symbol] = 'it works'
@@ -145,6 +150,11 @@ XML
     assert_equal '>value<', flash['test']
   end
 
+  def test_process_with_flash_now
+    process :set_flash_now, nil, nil, { "test_now" => "value_now" }
+    assert_equal '>value_now<', flash['test_now']
+  end
+
   def test_process_with_session
     process :set_session
     assert_equal 'A wonder', session['string'], "A value stored in the session should be available by string key"
-- 
1.5.4.3