From 03dd8f79171fb593d14c43be8ddf520d76b1f62f Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Thu, 8 Apr 2010 21:12:45 +1000 Subject: Mail::Part now no longer has nil as a default charset, it is always set to something, and defaults to UTF-8 --- actionmailer/CHANGELOG | 2 ++ actionmailer/test/old_base/mail_service_test.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'actionmailer') diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 8a064829c7..dbda0d87b2 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -5,6 +5,8 @@ ActionMailer::Base.register_interceptor calls Mail.register_interceptor ActionMailer::Base.register_observer calls Mail.register_observer +* Mail::Part now no longer has nil as a default charset, it is always set to something, and defaults to UTF-8 + * Added explict setting of charset in set_fields! method to make sure Mail has the user defined default * Removed quoting.rb and refactored for Mail to take responsibility of all quoting and auto encoding requirements for the header. diff --git a/actionmailer/test/old_base/mail_service_test.rb b/actionmailer/test/old_base/mail_service_test.rb index 9cf01854c5..b68e7fcbac 100644 --- a/actionmailer/test/old_base/mail_service_test.rb +++ b/actionmailer/test/old_base/mail_service_test.rb @@ -355,7 +355,7 @@ class ActionMailerTest < Test::Unit::TestCase assert_equal "multipart/mixed", created.mime_type assert_equal "multipart/alternative", created.parts[0].mime_type assert_equal "bar", created.parts[0].header['foo'].to_s - assert_nil created.parts[0].charset + assert_not_nil created.parts[0].charset assert_equal "text/plain", created.parts[0].parts[0].mime_type assert_equal "text/html", created.parts[0].parts[1].mime_type assert_equal "application/octet-stream", created.parts[1].mime_type -- cgit v1.2.3