Skip to content
Browse files

Merge pull request #10646 from kennyj/fix_am_20130517

Fix ActionMailer testcase break with mail 2.5.4.
  • Loading branch information...
2 parents 6c2fc9a + 98849c7 commit 364d6374f6aae87703a5292904e567b972e2d6d1 @rafaelfranca rafaelfranca committed May 20, 2013
Showing with 5 additions and 2 deletions.
  1. +4 −1 actionmailer/CHANGELOG.md
  2. +1 −1 actionmailer/test/mailers/base_mailer.rb
View
5 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.
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 364d637

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