diff options
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionmailer/test/mail_render_test.rb | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index a385b96a62..09ca77ac17 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that partials would be broken when using text.plain.erb as the extension #10130 [java] + * Update README to use new smtp settings configuration API. Closes #10060 [psq] * Allow ActionMailer subclasses to individually set their delivery method (so two subclasses can have different delivery methods) #10033 [zdennis] diff --git a/actionmailer/test/mail_render_test.rb b/actionmailer/test/mail_render_test.rb index d6ee21a8b9..0bd5eafd59 100644 --- a/actionmailer/test/mail_render_test.rb +++ b/actionmailer/test/mail_render_test.rb @@ -20,6 +20,12 @@ 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 initialize_defaults(method_name) super @@ -70,6 +76,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 end class FirstSecondHelperTest < Test::Unit::TestCase |