From 98849c71acb8623546a22898497baa4d9b435b12 Mon Sep 17 00:00:00 2001 From: kennyj Date: Fri, 17 May 2013 00:56:31 +0900 Subject: Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong. --- actionmailer/CHANGELOG.md | 5 ++++- actionmailer/test/mailers/base_mailer.rb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 9e9d07b386..41436de526 100644 --- a/actionmailer/CHANGELOG.md +++ b/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. diff --git a/actionmailer/test/mailers/base_mailer.rb b/actionmailer/test/mailers/base_mailer.rb index 20b6671283..6584bf5195 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