aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_process.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-10-28 17:10:52 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-10-28 17:10:52 +0100
commit1df157cd38c9246a87f0643f78be7f8fdb5bb474 (patch)
tree8b3d41f021a743c0697ea790e8f9b70cf26c793c /actionpack/lib/action_controller/test_process.rb
parent3e54a9a689915c28bc806498e5d1d1af91255fb0 (diff)
parentac50ee0edfa0df90ae7a8dd09f4a41ecbd1c7a94 (diff)
downloadrails-1df157cd38c9246a87f0643f78be7f8fdb5bb474.tar.gz
rails-1df157cd38c9246a87f0643f78be7f8fdb5bb474.tar.bz2
rails-1df157cd38c9246a87f0643f78be7f8fdb5bb474.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
-rw-r--r--actionpack/lib/action_controller/test_process.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index f84c48f102..7a31f0e8d5 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -218,7 +218,7 @@ module ActionController #:nodoc:
# Returns the template of the file which was used to
# render this response (or nil)
def rendered_template
- template.send(:_first_render)
+ template.instance_variable_get(:@_first_render)
end
# A shortcut to the flash. Returns an empty hash if no session flash exists.