Browse files

Mail::Part now no longer has nil as a default charset, it is always s…

…et to something, and defaults to UTF-8
  • Loading branch information...
1 parent e157a3d commit 03dd8f79171fb593d14c43be8ddf520d76b1f62f @mikel mikel committed Apr 8, 2010
Showing with 3 additions and 1 deletion.
  1. +2 −0 actionmailer/CHANGELOG
  2. +1 −1 actionmailer/test/old_base/mail_service_test.rb
View
2 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.
View
2 actionmailer/test/old_base/mail_service_test.rb
@@ -355,7 +355,7 @@ def test_nested_parts
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

0 comments on commit 03dd8f7

Please sign in to comment.