diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-09 21:54:59 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-09 21:54:59 +0000 |
| commit | 6b0a6472365a7b9c3883d2de3ae19b49e77c847f (patch) | |
| tree | 62f851b659add70bbfaeb30b15da64c198b488ed /actionpack/test/controller | |
| parent | b7c565dc626dda5cdd8ef041edc27fec08ac541b (diff) | |
| download | rails-6b0a6472365a7b9c3883d2de3ae19b49e77c847f.tar.gz rails-6b0a6472365a7b9c3883d2de3ae19b49e77c847f.tar.bz2 rails-6b0a6472365a7b9c3883d2de3ae19b49e77c847f.zip | |
Removed ActionController::Base#keep_flash (use flash.keep instead)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7428 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/flash_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb index 496af2b47a..35ab1b9d3c 100644 --- a/actionpack/test/controller/flash_test.rb +++ b/actionpack/test/controller/flash_test.rb @@ -31,7 +31,7 @@ class FlashTest < Test::Unit::TestCase def use_flash_and_keep_it @flash_copy = {}.update flash @flashy = flash["that"] - silence_warnings { keep_flash } + flash.keep render :inline => "hello" end @@ -94,7 +94,7 @@ class FlashTest < Test::Unit::TestCase def test_keep_flash get :set_flash - assert_deprecated(/keep_flash/) { get :use_flash_and_keep_it } + get :use_flash_and_keep_it assert_equal "hello", @response.template.assigns["flash_copy"]["that"] assert_equal "hello", @response.template.assigns["flashy"] |