diff options
author | José Valim <jose.valim@gmail.com> | 2009-12-22 20:17:27 +0100 |
---|---|---|
committer | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-12-22 11:29:06 -0800 |
commit | 4964d3b02cd5c87d821ab7d41d243154c727185d (patch) | |
tree | e3818132241dd91d62ac1483219df16f973cf679 /actionmailer/test/mail_service_test.rb | |
parent | 8e48a5ef0ca488b2264acd2b38bdae14970c011f (diff) | |
download | rails-4964d3b02cd5c87d821ab7d41d243154c727185d.tar.gz rails-4964d3b02cd5c87d821ab7d41d243154c727185d.tar.bz2 rails-4964d3b02cd5c87d821ab7d41d243154c727185d.zip |
Make ActionMailer::Base inherit from AbstractController::Base
Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
Diffstat (limited to 'actionmailer/test/mail_service_test.rb')
-rw-r--r-- | actionmailer/test/mail_service_test.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 697265b8ec..1cd3bc77c4 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -34,13 +34,13 @@ class TestMailer < ActionMailer::Base def from_with_name from "System <system@loudthinking.com>" recipients "root@loudthinking.com" - body "Nothing to see here." + render :text => "Nothing to see here." end def from_without_name from "system@loudthinking.com" recipients "root@loudthinking.com" - body "Nothing to see here." + render :text => "Nothing to see here." end def cc_bcc(recipient) @@ -301,6 +301,7 @@ class TestMailer < ActionMailer::Base render :text => "testing" end + # This tests body calls accepeting a hash, which is deprecated. def body_ivar(recipient) recipients recipient subject "Body as a local variable" @@ -1043,7 +1044,8 @@ EOF end def test_body_is_stored_as_an_ivar - mail = TestMailer.create_body_ivar(@recipient) + mail = nil + ActiveSupport::Deprecation.silence { mail = TestMailer.create_body_ivar(@recipient) } assert_equal "body: foo\nbar: baz", mail.body end |