Permalink
Browse files

Merge pull request #10646 from kennyj/fix_am_20130517

Fix ActionMailer testcase break with mail 2.5.4.
Conflicts:
	actionmailer/CHANGELOG.md
  • Loading branch information...
1 parent cac988a commit 6cf4c75dcb6f0ac29432f708f2e05e5fa48d1f31 @rafaelfranca rafaelfranca committed May 20, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionmailer/test/mailers/base_mailer.rb
@@ -38,7 +38,7 @@ def attachment_with_content(hash = {})
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

0 comments on commit 6cf4c75

Please sign in to comment.