Make ActionController::Flash work with new_base

1 files changed, 25 insertions, 24 deletions

diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index ef60cae0ff..84e27d7779 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -60,6 +60,7 @@ class FlashTest < ActionController::TestCase
 
     def std_action
       @flash_copy = {}.update(flash)
+      render :nothing => true
     end
 
     def filter_halting_action
@@ -79,64 +80,64 @@ class FlashTest < ActionController::TestCase
     get :set_flash
 
     get :use_flash
-    assert_equal "hello", @controller.template.assigns["flash_copy"]["that"]
-    assert_equal "hello", @controller.template.assigns["flashy"]
+    assert_equal "hello", assigns["flash_copy"]["that"]
+    assert_equal "hello", assigns["flashy"]
 
     get :use_flash
-    assert_nil @controller.template.assigns["flash_copy"]["that"], "On second flash"
+    assert_nil assigns["flash_copy"]["that"], "On second flash"
   end
 
   def test_keep_flash
     get :set_flash
     
     get :use_flash_and_keep_it
-    assert_equal "hello", @controller.template.assigns["flash_copy"]["that"]
-    assert_equal "hello", @controller.template.assigns["flashy"]
+    assert_equal "hello", assigns["flash_copy"]["that"]
+    assert_equal "hello", assigns["flashy"]
 
     get :use_flash
-    assert_equal "hello", @controller.template.assigns["flash_copy"]["that"], "On second flash"
+    assert_equal "hello", assigns["flash_copy"]["that"], "On second flash"
 
     get :use_flash
-    assert_nil @controller.template.assigns["flash_copy"]["that"], "On third flash"
+    assert_nil assigns["flash_copy"]["that"], "On third flash"
   end
   
   def test_flash_now
     get :set_flash_now
-    assert_equal "hello", @controller.template.assigns["flash_copy"]["that"]
-    assert_equal "bar"  , @controller.template.assigns["flash_copy"]["foo"]
-    assert_equal "hello", @controller.template.assigns["flashy"]
+    assert_equal "hello", assigns["flash_copy"]["that"]
+    assert_equal "bar"  , assigns["flash_copy"]["foo"]
+    assert_equal "hello", assigns["flashy"]
 
     get :attempt_to_use_flash_now
-    assert_nil @controller.template.assigns["flash_copy"]["that"]
-    assert_nil @controller.template.assigns["flash_copy"]["foo"]
-    assert_nil @controller.template.assigns["flashy"]
+    assert_nil assigns["flash_copy"]["that"]
+    assert_nil assigns["flash_copy"]["foo"]
+    assert_nil assigns["flashy"]
   end 
   
   def test_update_flash
     get :set_flash
     get :use_flash_and_update_it
-    assert_equal "hello",       @controller.template.assigns["flash_copy"]["that"]
-    assert_equal "hello again", @controller.template.assigns["flash_copy"]["this"]
+    assert_equal "hello",       assigns["flash_copy"]["that"]
+    assert_equal "hello again", assigns["flash_copy"]["this"]
     get :use_flash
-    assert_nil                  @controller.template.assigns["flash_copy"]["that"], "On second flash"
-    assert_equal "hello again", @controller.template.assigns["flash_copy"]["this"], "On second flash"
+    assert_nil                  assigns["flash_copy"]["that"], "On second flash"
+    assert_equal "hello again", assigns["flash_copy"]["this"], "On second flash"
   end
   
   def test_flash_after_reset_session
     get :use_flash_after_reset_session
-    assert_equal "hello",    @controller.template.assigns["flashy_that"]
-    assert_equal "good-bye", @controller.template.assigns["flashy_this"]
-    assert_nil   @controller.template.assigns["flashy_that_reset"]
+    assert_equal "hello",    assigns["flashy_that"]
+    assert_equal "good-bye", assigns["flashy_this"]
+    assert_nil   assigns["flashy_that_reset"]
   end 
 
   def test_sweep_after_halted_filter_chain
     get :std_action
-    assert_nil @controller.template.assigns["flash_copy"]["foo"]
+    assert_nil assigns["flash_copy"]["foo"]
     get :filter_halting_action
-    assert_equal "bar", @controller.template.assigns["flash_copy"]["foo"]
+    assert_equal "bar", assigns["flash_copy"]["foo"]
     get :std_action # follow redirection
-    assert_equal "bar", @controller.template.assigns["flash_copy"]["foo"]
+    assert_equal "bar", assigns["flash_copy"]["foo"]
     get :std_action
-    assert_nil @controller.template.assigns["flash_copy"]["foo"]
+    assert_nil assigns["flash_copy"]["foo"]
   end
 end