Changeset 4617

Timestamp:

07/22/06 02:31:21 (2 years ago)

Author:

rick

Message:

Fixed that you can still access the flash after the flash has been reset in reset_session. Closes #5584 [lmarlow@yahoo.com]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/flash.rb (modified) (1 diff)
• trunk/actionpack/test/controller/flash_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fixed that you can still access the flash after the flash has been reset in reset_session.  Closes #5584 [lmarlow@yahoo.com]
-
-* Allow form_for and fields_for to work with indexed form inputs.  [Jeremy Kemper, Matt Lyon]

trunk/actionpack/lib/action_controller/flash.rb

@@ -148 +148 @@
-      def reset_session_with_flash
-        reset_session_without_flash
-
+
+
-      end
-      

trunk/actionpack/test/controller/flash_test.rb

@@ -33 +33 @@
-      @flashy = flash["that"]
-      silence_warnings { keep_flash }
+      render :inline => "hello"
+    end
+
+    def use_flash_after_reset_session
+      flash["that"] = "hello"
+      @flashy_that = flash["that"]
+      reset_session
+      @flashy_that_reset = flash["that"]
+      flash["this"] = "good-bye"
+      @flashy_this = flash["this"]
-      render :inline => "hello"
-    end
@@ -83 +93 @@
-    assert_nil @response.template.assigns["flashy"]
-  end 
+  
+  def test_flash_after_reset_session
+    get :use_flash_after_reset_session
+    assert_equal "hello",    @response.template.assigns["flashy_that"]
+    assert_equal "good-bye", @response.template.assigns["flashy_this"]
+    assert_nil   @response.template.assigns["flashy_that_reset"]
+  end 
-end