diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-05-13 19:46:33 +1000 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-05-14 09:27:47 +0200 |
| commit | 4a8a62058a81ba9c0ec12adc772adbdca4c900a5 (patch) | |
| tree | 7dbd52fafb9a910e034851b2170a934917e3c216 /actionmailer | |
| parent | 92160219a8bf17bd435252304319c094e56e5849 (diff) | |
| download | rails-4a8a62058a81ba9c0ec12adc772adbdca4c900a5.tar.gz rails-4a8a62058a81ba9c0ec12adc772adbdca4c900a5.tar.bz2 rails-4a8a62058a81ba9c0ec12adc772adbdca4c900a5.zip | |
Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 4 | ||||
| -rw-r--r-- | actionmailer/actionmailer.gemspec | 2 | ||||
| -rw-r--r-- | actionmailer/test/old_base/mail_service_test.rb | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 383ad2105d..208299cfd1 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,3 +1,7 @@ +* Changed encoding behaviour of mail, so updated tests in actionmailer and bumped mail version to 2.2.1 [ML] + +* Added ability to pass Proc objects to the defaults hash [ML] + *Rails 3.0.0 [beta 3] (April 13th, 2010)* * Removed all quoting.rb type files from ActionMailer and put Mail 2.2.0 in instead [ML] diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 01a886c5ee..280771e4db 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -20,6 +20,6 @@ Gem::Specification.new do |s| s.has_rdoc = true s.add_dependency('actionpack', version) - s.add_dependency('mail', '~> 2.2.0') + s.add_dependency('mail', '~> 2.2.1') s.add_dependency('text-format', '~> 1.0.0') end diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb index 9da9132fe1..f91e7f893c 100644 --- a/actionmailer/test/old_base/mail_service_test.rb +++ b/actionmailer/test/old_base/mail_service_test.rb @@ -674,7 +674,7 @@ The body EOF mail = Mail.new(msg) assert_equal "testing testing \326\244", mail.subject - assert_equal "Subject: testing testing =?UTF-8?Q?_=D6=A4=?=\r\n", mail[:subject].encoded + assert_equal "Subject: =?UTF-8?Q?testing_testing_=D6=A4?=\r\n", mail[:subject].encoded end def test_unquote_7bit_subject @@ -863,7 +863,7 @@ EOF def test_multipart_with_utf8_subject mail = TestMailer.multipart_with_utf8_subject(@recipient) - regex = Regexp.escape('Subject: Foo =?UTF-8?Q?=C3=A1=C3=AB=C3=B4=?= =?UTF-8?Q?_=C3=AE=C3=BC=?=') + regex = Regexp.escape('Subject: =?UTF-8?Q?Foo_=C3=A1=C3=AB=C3=B4_=C3=AE=C3=BC?=') assert_match(/#{regex}/, mail.encoded) string = "Foo áëô îü" assert_match(string, mail.subject) @@ -871,7 +871,7 @@ EOF def test_implicitly_multipart_with_utf8 mail = TestMailer.implicitly_multipart_with_utf8 - regex = Regexp.escape('Subject: Foo =?UTF-8?Q?=C3=A1=C3=AB=C3=B4=?= =?UTF-8?Q?_=C3=AE=C3=BC=?=') + regex = Regexp.escape('Subject: =?UTF-8?Q?Foo_=C3=A1=C3=AB=C3=B4_=C3=AE=C3=BC?=') assert_match(/#{regex}/, mail.encoded) string = "Foo áëô îü" assert_match(string, mail.subject) |