diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-26 18:39:53 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-26 18:39:53 +0100 |
commit | bdc39fad3629f89f552e40d13b7612db15ffa552 (patch) | |
tree | fe0a6fd607eaf742d58e861c9bd00c5d560e58d1 /actionmailer/test/old_base/mail_layout_test.rb | |
parent | e274eb1df1dcf526febb7c3a1a8dc2c02325d68c (diff) | |
parent | 31b538df6457ba723668afc62e85056e3bca9413 (diff) | |
download | rails-bdc39fad3629f89f552e40d13b7612db15ffa552.tar.gz rails-bdc39fad3629f89f552e40d13b7612db15ffa552.tar.bz2 rails-bdc39fad3629f89f552e40d13b7612db15ffa552.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionmailer/test/old_base/mail_layout_test.rb')
-rw-r--r-- | actionmailer/test/old_base/mail_layout_test.rb | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/actionmailer/test/old_base/mail_layout_test.rb b/actionmailer/test/old_base/mail_layout_test.rb index 4038fbf339..2abd3ece92 100644 --- a/actionmailer/test/old_base/mail_layout_test.rb +++ b/actionmailer/test/old_base/mail_layout_test.rb @@ -1,7 +1,7 @@ require 'abstract_unit' class AutoLayoutMailer < ActionMailer::Base - + def hello recipients 'test@localhost' subject "You have a mail" @@ -51,6 +51,16 @@ class ExplicitLayoutMailer < ActionMailer::Base end end +class NestedLayoutMailer < ActionMailer::Base + layout 'nested/layouts/spam' + + def signup + recipients 'test@localhost' + subject "You have a mail" + from "tester@example.com" + end +end + class LayoutMailerTest < Test::Unit::TestCase def setup set_delivery_method :test @@ -77,7 +87,7 @@ class LayoutMailerTest < Test::Unit::TestCase # CHANGED: content_type returns an object # assert_equal 'text/plain', mail.parts.first.content_type assert_equal 'text/plain', mail.parts.first.mime_type - + # CHANGED: body returns an object # assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body assert_equal "text/plain layout - text/plain multipart", mail.parts.first.body.to_s @@ -145,4 +155,9 @@ class LayoutMailerTest < Test::Unit::TestCase mail = ExplicitLayoutMailer.logout assert_equal "You logged out", mail.body.to_s.strip end + + def test_nested_class_layout + mail = NestedLayoutMailer.signup + assert_equal "Nested Spammer layout We do not spam", mail.body.to_s.strip + end end |