aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/action_pack_assertions_test.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-13 13:26:48 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-13 13:26:48 -0500
commite0fef66149092dd3d2988fff64f0ce8765735687 (patch)
tree76b20ee8e265f74610eb2836be5bc27c300da2a4 /actionpack/test/controller/action_pack_assertions_test.rb
parent99cc85bc099a757cdd44e4f5f1be4972ab124e0d (diff)
downloadrails-e0fef66149092dd3d2988fff64f0ce8765735687.tar.gz
rails-e0fef66149092dd3d2988fff64f0ce8765735687.tar.bz2
rails-e0fef66149092dd3d2988fff64f0ce8765735687.zip
Made ActionView::Base#first_render a little more private. And added _last_render to track the most recent render. Will fix #609 as a side effect. [#609 state:resolved]
Diffstat (limited to 'actionpack/test/controller/action_pack_assertions_test.rb')
-rw-r--r--actionpack/test/controller/action_pack_assertions_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 610e196362..56ba36cee5 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -328,11 +328,11 @@ class ActionPackAssertionsControllerTest < Test::Unit::TestCase
# check if we were rendered by a file-based template?
def test_rendered_action
process :nothing
- assert !@response.rendered_with_file?
+ assert_nil @response.rendered_template
process :hello_world
- assert @response.rendered_with_file?
- assert 'hello_world', @response.rendered_file
+ assert @response.rendered_template
+ assert 'hello_world', @response.rendered_template.to_s
end
# check the redirection location