Permalink
Browse files

Fixed flash.now not being accessible in tests. Flash sweeping is now …

…done before action processing instead after

Signed-off-by: Michael Koziarski <michael@koziarski.com>

[#10 state:resolved]
  • Loading branch information...
1 parent a7ea06b commit 74eed6290e63111d1aad2b181692a84f4f040aea @zargony zargony committed with NZKoz May 10, 2008
Showing with 11 additions and 6 deletions.
  1. +1 −6 actionpack/lib/action_controller/flash.rb
  2. +10 −0 actionpack/test/controller/test_test.rb
@@ -28,7 +28,6 @@ def self.included(base)
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 @@ def flash(refresh = false) #:doc:
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
@@ -12,6 +12,11 @@ def set_flash
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 @@ def test_process_with_flash
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"

0 comments on commit 74eed62

Please sign in to comment.