From 5c54db290f4e7cdd69b461d4c0b020a9cd364537 Mon Sep 17 00:00:00 2001 From: Marcus Ilgner Date: Tue, 8 Dec 2015 12:28:00 +0100 Subject: ActionMailer: support overriding template name in multipart Implicit rendering in multipart blocks now also uses the template name from the options hash instead of always using the action name. So you can now write mail(template_name: template_name) do |format| format.text format.html end --- actionmailer/test/mailers/base_mailer.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'actionmailer/test/mailers') diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb index 8c2225ce60..f75bd48a9e 100644 --- a/actionmailer/test/mailers/base_mailer.rb +++ b/actionmailer/test/mailers/base_mailer.rb @@ -104,6 +104,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}" } -- cgit v1.2.3