aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-17 14:23:00 -0700
committerCarlhuda <carlhuda@engineyard.com>2010-03-17 14:29:18 -0700
commit6416a35f4b3290a93145d40045147fc01d36e756 (patch)
tree00b4a7775a9446a1051e8d985a195fea7305e652 /actionpack/test
parent947f86c699b33bd44703b3554db58e4cfca37c86 (diff)
downloadrails-6416a35f4b3290a93145d40045147fc01d36e756.tar.gz
rails-6416a35f4b3290a93145d40045147fc01d36e756.tar.bz2
rails-6416a35f4b3290a93145d40045147fc01d36e756.zip
Remove unneeded AV::Base and AV::Template monkey-patches
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/action_pack_assertions_test.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 26e0d6d844..b6810b0c27 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -365,11 +365,10 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
# check if we were rendered by a file-based template?
def test_rendered_action
process :nothing
- assert_nil @controller.template.rendered[:template]
+ assert_template nil
process :hello_world
- assert @controller.template.rendered[:template]
- assert 'hello_world', @controller.template.rendered[:template].to_s
+ assert_template 'hello_world'
end
# check the redirection location