diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-20 11:15:46 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-20 11:15:46 -0700 |
| commit | 364d6374f6aae87703a5292904e567b972e2d6d1 (patch) | |
| tree | 4e816d5b6eb21e3aab7dad3d08b6a28a5f9cc95b /actionmailer | |
| parent | 6c2fc9a5c76befba3e90f3ce4c7e8c75bfc71e57 (diff) | |
| parent | 98849c71acb8623546a22898497baa4d9b435b12 (diff) | |
| download | rails-364d6374f6aae87703a5292904e567b972e2d6d1.tar.gz rails-364d6374f6aae87703a5292904e567b972e2d6d1.tar.bz2 rails-364d6374f6aae87703a5292904e567b972e2d6d1.zip | |
Merge pull request #10646 from kennyj/fix_am_20130517
Fix ActionMailer testcase break with mail 2.5.4.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | actionmailer/test/mailers/base_mailer.rb | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 9e9d07b386..41436de526 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,6 @@ -* No changes. +* Fix ActionMailer testcase break with mail 2.5.4. + ActionMailer's testcase was wrong, because :transfer_encoding option was ignored in mail 2.5.3. + + *kennyj* Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/actionmailer/CHANGELOG.md) for previous changes. diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb index 20b6671283..6584bf5195 100644 --- a/actionmailer/test/mailers/base_mailer.rb +++ b/actionmailer/test/mailers/base_mailer.rb @@ -38,7 +38,7 @@ class BaseMailer < ActionMailer::Base end def attachment_with_hash - attachments['invoice.jpg'] = { data: "\312\213\254\232)b", + attachments['invoice.jpg'] = { data: ::Base64.encode64("\312\213\254\232)b"), mime_type: "image/x-jpg", transfer_encoding: "base64" } mail |