Permalink
Browse files

Fixed that you can still access the flash after the flash has been re…

…set in reset_session. Closes #5584 [lmarlow@yahoo.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 3a0159d commit 04d9e94e88be0ba076b0fef980e8bde8e25061d9 @technoweenie technoweenie committed Jul 22, 2006
Showing with 21 additions and 1 deletion.
  1. +2 −0 actionpack/CHANGELOG
  2. +2 −1 actionpack/lib/action_controller/flash.rb
  3. +17 −0 actionpack/test/controller/flash_test.rb
View
@@ -1,5 +1,7 @@
*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]
<% form_for 'post[]', @post do |f| -%>
@@ -147,7 +147,8 @@ def process_cleanup_with_flash
def reset_session_with_flash
reset_session_without_flash
- @flash = nil
+ remove_instance_variable(:@flash)
+ flash(:refresh)
end
protected
@@ -35,6 +35,16 @@ def use_flash_and_keep_it
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
+
def rescue_action(e)
raise unless ActionController::MissingTemplate === e
end
@@ -82,4 +92,11 @@ def test_flash_now
assert_nil @response.template.assigns["flash_copy"]["foo"]
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

0 comments on commit 04d9e94

Please sign in to comment.