diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2018-11-19 19:23:44 -0500 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2018-11-19 19:23:44 -0500 |
commit | 72062c8c9d32237d1eb7d3eb3318f65042383408 (patch) | |
tree | 7168d4225215f2a2df61e31b45e92258fc11f8db /actionmailer/test | |
parent | 4aad2e2228b2127680e6b5aaba5c0cf0e09b1467 (diff) | |
parent | 5c54db290f4e7cdd69b461d4c0b020a9cd364537 (diff) | |
download | rails-72062c8c9d32237d1eb7d3eb3318f65042383408.tar.gz rails-72062c8c9d32237d1eb7d3eb3318f65042383408.tar.bz2 rails-72062c8c9d32237d1eb7d3eb3318f65042383408.zip |
Merge pull request #22534 from evopark/master
ActionMailer: support overriding template name in multipart
Diffstat (limited to 'actionmailer/test')
-rw-r--r-- | actionmailer/test/base_test.rb | 6 | ||||
-rw-r--r-- | actionmailer/test/mailers/base_mailer.rb | 7 |
2 files changed, 13 insertions, 0 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index cbbee9fae8..86c0172772 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -544,6 +544,12 @@ class BaseTest < ActiveSupport::TestCase assert_equal("TEXT Implicit Multipart", mail.text_part.body.decoded) end + test "you can specify a different template for multipart render" do + mail = BaseMailer.implicit_different_template_with_block("explicit_multipart_templates").deliver + assert_equal("HTML Explicit Multipart Templates", mail.html_part.body.decoded) + assert_equal("TEXT Explicit Multipart Templates", mail.text_part.body.decoded) + end + test "should raise if missing template in implicit render" do assert_raises ActionView::MissingTemplate do BaseMailer.implicit_different_template("missing_template").deliver_now diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb index a3101207dc..c1bb48cc96 100644 --- a/actionmailer/test/mailers/base_mailer.rb +++ b/actionmailer/test/mailers/base_mailer.rb @@ -111,6 +111,13 @@ class BaseMailer < ActionMailer::Base mail(template_name: template_name) end + def implicit_different_template_with_block(template_name = "") + mail(template_name: template_name) do |format| + format.text + format.html + end + end + def explicit_different_template(template_name = "") mail do |format| format.text { render template: "#{mailer_name}/#{template_name}" } |