Skip to content
Browse files

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
  • Loading branch information...
1 parent 0d8dbd1 commit b0f96d4436619b25b8024cc70a71c77bcfc12bf6 @rafaelfranca rafaelfranca committed May 20, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionmailer/test/mailers/base_mailer.rb
View
2 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 b0f96d4

Please sign in to comment.
Something went wrong with that request. Please try again.