From e85369ed7aa809e66c5829dca5ffcfdff867fb98 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Mon, 4 Jul 2005 16:21:11 +0000
Subject: [PATCH] Added unit test to confirm that #1393 is fixed in HEAD

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1667 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionmailer/test/mail_service_test.rb | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index f4de8c1894..accb18fa25 100755
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -162,11 +162,19 @@ class TestMailer < ActionMailer::Base
     recipients   recipient
     subject      "nested multipart"
     from         "test@example.com"
-    body         "multipart/mixed"
+    content_type "multipart/mixed"
     part :content_type => "text/plain", :body => "hullo"
     attachment :content_type => "application/octet-stream", :body => "test abcdefghijklmnopqstuvwxyz"
   end
-  
+
+  def headers_with_nonalpha_chars(recipient)
+    recipients   recipient
+    subject      "nonalpha chars"
+    from         "One: Two <test@example.com>"
+    cc           "Three: Four <test@example.com>"
+    bcc          "Five: Six <test@example.com>"
+    body         "testing"
+  end
 
   class <<self
     attr_accessor :received_body
@@ -635,5 +643,15 @@ EOF
     assert_match %r{Content-Type: application/octet-stream[^;]}, result
     assert_match %r{Content-Disposition: attachment[^;]}, result
   end
+
+  def test_headers_with_nonalpha_chars
+    mail = TestMailer.create_headers_with_nonalpha_chars(@recipient)
+    assert !mail.from_addrs.empty?
+    assert !mail.cc_addrs.empty?
+    assert !mail.bcc_addrs.empty?
+    assert_match(/:/, mail.from_addrs.to_s)
+    assert_match(/:/, mail.cc_addrs.to_s)
+    assert_match(/:/, mail.bcc_addrs.to_s)
+  end
 end