aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/mailers/base_mailer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer/test/mailers/base_mailer.rb')
-rw-r--r--actionmailer/test/mailers/base_mailer.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb
index 6584bf5195..8c2225ce60 100644
--- a/actionmailer/test/mailers/base_mailer.rb
+++ b/actionmailer/test/mailers/base_mailer.rb
@@ -80,6 +80,12 @@ class BaseMailer < ActionMailer::Base
end
end
+ def explicit_without_specifying_format_with_any(hash = {})
+ mail(hash) do |format|
+ format.any
+ end
+ end
+
def explicit_multipart_with_options(include_html = false)
mail do |format|
format.text(content_transfer_encoding: "base64"){ render "welcome" }
@@ -120,7 +126,7 @@ class BaseMailer < ActionMailer::Base
end
def with_nil_as_return_value
- mail(:template_name => "welcome")
+ mail(template_name: "welcome")
nil
end