Added test for template to layout variable transfer

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1904 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 11 insertions, 0 deletions

diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 105e5ec06d..8af594e94a 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -119,6 +119,10 @@ class NewRenderTestController < ActionController::Base
     render :action => "potential_conflicts"
   end
 
+  def action_talk_to_layout
+    # Action template sets variable that's picked up by layout
+  end
+
   def rescue_action(e) raise end
     
   private
@@ -133,6 +137,8 @@ class NewRenderTestController < ActionController::Base
           "layouts/standard"
         when "builder_layout_test"
           "layouts/builder"
+        when "action_talk_to_layout"
+          "layouts/talk_from_action"
       end
     end
 end
@@ -293,6 +299,11 @@ class NewRenderTest < Test::Unit::TestCase
     assert_equal("First: David\nSecond: Stephan\nThird: David\nFourth: David\nFifth: ", @response.body)
   end
 
+  def test_action_talk_to_layout
+    get :action_talk_to_layout
+    assert_equal "<title>Talking to the layout</title>\nAction was here!", @response.body
+  end
+
   # def test_partials_list
   #   get :partials_list
   #   assert_equal "goodbyeHello: davidHello: marygoodbye\n", @response.body