aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/flash_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-10-26 13:14:10 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-10-26 13:14:10 +0000
commit07c494ae24b897bfa1d46f741b9ac14d3b480bc2 (patch)
tree82631d2a8dd051662c3c4fbb523414d48009aee5 /actionpack/test/controller/flash_test.rb
parent0d52abfd0ea42ba8f9bac996378087be42b93917 (diff)
downloadrails-07c494ae24b897bfa1d46f741b9ac14d3b480bc2.tar.gz
rails-07c494ae24b897bfa1d46f741b9ac14d3b480bc2.tar.bz2
rails-07c494ae24b897bfa1d46f741b9ac14d3b480bc2.zip
Added a reader for flash.now, so it's possible to do stuff like flash.now[:alert] ||= 'New if not set' (closes #2422) [Caio Chassot]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2747 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/flash_test.rb')
-rw-r--r--actionpack/test/controller/flash_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index 54a1444f97..2a14d6d625 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -9,6 +9,9 @@ class FlashTest < Test::Unit::TestCase
def set_flash_now
flash.now["that"] = "hello"
+ flash.now["foo"] ||= "bar"
+ flash.now["foo"] ||= "err"
+ @flashy = flash.now["that"]
@flash_copy = {}.update flash
render :inline => "hello"
end
@@ -75,10 +78,13 @@ class FlashTest < Test::Unit::TestCase
@request.action = "set_flash_now"
response = process_request
assert_equal "hello", response.template.assigns["flash_copy"]["that"]
+ assert_equal "bar" , response.template.assigns["flash_copy"]["foo"]
+ assert_equal "hello", response.template.assigns["flashy"]
@request.action = "attempt_to_use_flash_now"
first_response = process_request
assert_nil first_response.template.assigns["flash_copy"]["that"]
+ assert_nil first_response.template.assigns["flash_copy"]["foo"]
assert_nil first_response.template.assigns["flashy"]
end