From b0f96d4436619b25b8024cc70a71c77bcfc12bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 20 May 2013 11:15:46 -0700 Subject: 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 --- actionmailer/test/mailers/base_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 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 -- cgit v1.2.3