aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-16 22:57:02 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-16 22:57:02 -0800
commit3346de600f3c83b0a1deb737c24831856a2e58b8 (patch)
tree19636b6259c8b44b19f203c90d9645bc5e0f7f7e
parent4f35d5a18b1192f03c36b23b2f6a8b3b2d2c0347 (diff)
parent23334be5b88a2607a35cfc970f3250ec7ae5ca9e (diff)
downloadrails-3346de600f3c83b0a1deb737c24831856a2e58b8.tar.gz
rails-3346de600f3c83b0a1deb737c24831856a2e58b8.tar.bz2
rails-3346de600f3c83b0a1deb737c24831856a2e58b8.zip
Merge pull request #4008 from arunagw/warning_variable_for_layout
warning removed "warning: instance variable @variable_for_layout not ini...
-rw-r--r--actionpack/test/controller/action_pack_assertions_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index b414327d08..5252e43c25 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -72,6 +72,7 @@ class ActionPackAssertionsController < ActionController::Base
end
def render_with_layout
+ @variable_for_layout = nil
render "test/hello_world", :layout => "layouts/standard"
end