From 9b72c36783516f5ef8f2fac5f6f342a6a48d8d78 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Mon, 10 Dec 2012 17:00:41 +0100 Subject: Backport #8450, the return value from mailer methods is not relevant. Conflicts: actionmailer/CHANGELOG.md actionmailer/lib/action_mailer/base.rb --- actionmailer/test/mailers/base_mailer.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'actionmailer/test/mailers/base_mailer.rb') diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb index 8c4430b046..50438ead2a 100644 --- a/actionmailer/test/mailers/base_mailer.rb +++ b/actionmailer/test/mailers/base_mailer.rb @@ -118,4 +118,9 @@ class BaseMailer < ActionMailer::Base def without_mail_call end + + def with_nil_as_return_value(hash = {}) + mail(:template_name => "welcome") + nil + end end -- cgit v1.2.3