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 15:50:36 -0300 |
| commit | b0f96d4436619b25b8024cc70a71c77bcfc12bf6 (patch) | |
| tree | 3704daa4e64e3d820064741d05e82cbbd63022fa /actionmailer | |
| parent | 0d8dbd131b551051ce35379093832fa12fb0cf10 (diff) | |
| download | rails-b0f96d4436619b25b8024cc70a71c77bcfc12bf6.tar.gz rails-b0f96d4436619b25b8024cc70a71c77bcfc12bf6.tar.bz2 rails-b0f96d4436619b25b8024cc70a71c77bcfc12bf6.zip | |
Merge pull request #10646 from kennyj/fix_am_20130517
Fix ActionMailer testcase break with mail 2.5.4.
Conflicts:
actionmailer/CHANGELOG.md
actionmailer/test/mailers/base_mailer.rb
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/mailers/base_mailer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb index 50438ead2a..bd3f193fda 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 |