diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-04-28 16:24:44 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-04-28 16:24:44 +0200 |
| commit | 9e84c0096f2c8ec27cf354ac2817cc49cbbcb783 (patch) | |
| tree | a733adc3ac35b76fd84fc4cccc291bdeda2c424a /actionmailer | |
| parent | 6ccf3bfa6e951fabf75352656a707f3a501b1cc2 (diff) | |
| parent | 767d60156b89382326ce42f3ddca0cb860d38149 (diff) | |
| download | rails-9e84c0096f2c8ec27cf354ac2817cc49cbbcb783.tar.gz rails-9e84c0096f2c8ec27cf354ac2817cc49cbbcb783.tar.bz2 rails-9e84c0096f2c8ec27cf354ac2817cc49cbbcb783.zip | |
Merge pull request #19917 from senny/preview_null_mail
Previews when `mail` wasn't called (NullMail instances).
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG.md | 11 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 86ecb3ee88..0d47ce855a 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,14 @@ +* Mailer previews no longer crash when the `mail` method wasn't called + (`NullMail`). + + Fixes #19849. + + *Yves Senn* + +* Make sure labels and values line up in mailer previews. + + *Yves Senn* + * Add `assert_enqueued_emails` and `assert_no_enqueued_emails`. Example: diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 754f698e48..218b7a735a 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -596,6 +596,7 @@ module ActionMailer class NullMail #:nodoc: def body; '' end + def header; {} end def respond_to?(string, include_all=false) true |