diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-22 13:01:53 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-22 13:01:53 -0700 |
commit | 9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0 (patch) | |
tree | 24dcf69c35ba59e499d4e6e07b4618719599aaf8 /actionmailer/test | |
parent | a6e05b18d65d07a157ee09d54167c81f3d1440f8 (diff) | |
parent | c0dd0cee46ac2d0864dc8bbdac1fe526f9cec346 (diff) | |
download | rails-9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0.tar.gz rails-9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0.tar.bz2 rails-9dac5547ad65e82a6fbb6a6243ab5c95d9c44db0.zip |
Merge branch 'master' into i18n
Diffstat (limited to 'actionmailer/test')
-rw-r--r-- | actionmailer/test/mail_render_test.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/mail_render_test.rb index fbcd1887e4..45811612eb 100644 --- a/actionmailer/test/mail_render_test.rb +++ b/actionmailer/test/mail_render_test.rb @@ -20,13 +20,13 @@ class RenderMailer < ActionMailer::Base subject "rendering rxml template" from "tester@example.com" end - + def included_subtemplate(recipient) recipients recipient subject "Including another template in the one being rendered" from "tester@example.com" end - + def included_old_subtemplate(recipient) recipients recipient subject "Including another template in the one being rendered" @@ -83,17 +83,11 @@ class RenderHelperTest < Test::Unit::TestCase mail = RenderMailer.deliver_rxml_template(@recipient) assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<test/>", mail.body.strip end - + def test_included_subtemplate mail = RenderMailer.deliver_included_subtemplate(@recipient) assert_equal "Hey Ho, let's go!", mail.body.strip end - - def test_deprecated_old_subtemplate - assert_raises ActionView::ActionViewError do - RenderMailer.deliver_included_old_subtemplate(@recipient) - end - end end class FirstSecondHelperTest < Test::Unit::TestCase |