Permalink
Browse files

Allow specific "multipart/xxx" content-type to be set on multipart me…

…ssages #1412 [Flurin Egger]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1493 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 0d8455c commit 3b4eb7aece771cb0cce131e55dbdc8137a118512 @jamis jamis committed Jun 24, 2005
Showing with 25 additions and 6 deletions.
  1. +2 −0 actionmailer/CHANGELOG
  2. +2 −0 actionmailer/lib/action_mailer/base.rb
  3. +21 −6 actionmailer/test/mail_service_test.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Allow specific "multipart/xxx" content-type to be set on multipart messages #1412 [Flurin Egger]
+
* Unquoted @ characters in headers are now accepted in spite of RFC 822 #1206
* Helper support (borrowed from ActionPack)
@@ -278,6 +278,8 @@ def create_mail
part = (TMail::Mail === p ? p : p.to_mail(self))
m.parts << part
end
+
+ m.set_content_type(content_type, nil, { "charset" => charset }) if content_type =~ /multipart/
end
@mail = m
@@ -94,12 +94,13 @@ def utf8_body(recipient)
@charset = "utf-8"
end
- def explicitly_multipart_example(recipient)
- @recipients = recipient
- @subject = "multipart example"
- @from = "test@example.com"
- @sent_on = Time.local 2004, 12, 12
- @body = "plain text default"
+ def explicitly_multipart_example(recipient, ct=nil)
+ recipients recipient
+ subject "multipart example"
+ from "test@example.com"
+ sent_on Time.local(2004, 12, 12)
+ body "plain text default"
+ content_type ct if ct
part "text/html" do |p|
p.charset = "iso-8859-1"
@@ -462,6 +463,7 @@ def test_decode_message_with_incorrect_charset
def test_explicitly_multipart_messages
mail = TestMailer.create_explicitly_multipart_example(@recipient)
assert_equal 3, mail.parts.length
+ assert_nil mail.content_type
assert_equal "text/plain", mail.parts[0].content_type
assert_equal "text/html", mail.parts[1].content_type
@@ -475,6 +477,19 @@ def test_explicitly_multipart_messages
assert_nil mail.parts[2].sub_header("content-type", "charset")
end
+ def test_explicitly_multipart_with_content_type
+ mail = TestMailer.create_explicitly_multipart_example(@recipient,
+ "multipart/alternative")
+ assert_equal 3, mail.parts.length
+ assert_equal "multipart/alternative", mail.content_type
+ end
+
+ def test_explicitly_multipart_with_invalid_content_type
+ mail = TestMailer.create_explicitly_multipart_example(@recipient, "text/xml")
+ assert_equal 3, mail.parts.length
+ assert_nil mail.content_type
+ end
+
def test_implicitly_multipart_messages
mail = TestMailer.create_implicitly_multipart_example(@recipient)
assert_equal 2, mail.parts.length

0 comments on commit 3b4eb7a

Please sign in to comment.