Changeset 3956

Timestamp:

03/18/06 23:06:25 (3 years ago)

Author:

minam

Message:

Make custom headers work in subparts (closes #4034)

Files:

• trunk/actionmailer/CHANGELOG (modified) (1 diff)
• trunk/actionmailer/lib/action_mailer/part.rb (modified) (1 diff)
• trunk/actionmailer/test/mail_service_test.rb (modified) (2 diffs)

trunk/actionmailer/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make custom headers work in subparts #4034 [elan@bluemandrill.com]
-
-* Template paths with dot chars in them no longer mess up implicit template selection for multipart messages #3332 [Chad Fowler]

trunk/actionmailer/lib/action_mailer/part.rb

@@ -97 +97 @@
-        part.set_content_type(content_type, nil, { "charset" => charset }) if content_type =~ /multipart/
-      end
-
+
+
+
-      part
-    end

trunk/actionmailer/test/mail_service_test.rb

@@ -219 +219 @@
-    attachment :content_type => "application/octet-stream",:filename => "test.txt", :body => "test abcdefghijklmnopqstuvwxyz"
-  end
+  
+  def attachment_with_custom_header(recipient)
+    recipients   recipient
+    subject      "custom header in attachment"
+    from         "test@example.com"
+    content_type "multipart/related"
+    part :content_type => "text/html", :body => 'yo'
+    attachment :content_type => "image/jpeg",:filename => "test.jpeg", :body => "i am not a real picture", :headers => { 'Content-ID' => '<test@test.com>' }
+  end
-
-  def unnamed_attachment(recipient)
@@ -283 +292 @@
-    assert_equal "text/html", created.parts.first.parts[1].content_type
-    assert_equal "application/octet-stream", created.parts[1].content_type
+  end
+
+  def test_attachment_with_custom_header
+    created = nil
+    assert_nothing_raised { created = TestMailer.create_attachment_with_custom_header(@recipient)}
+    assert_equal "<test@test.com>", created.parts[1].header['content-id'].to_s
-  end
-