test/mail_service_test.rb in actionmailer-0.6.1 vs test/mail_service_test.rb in actionmailer-0.7.0

@@ -29,28 +29,62 @@
     @cc         = "[e-mail]"
     @bcc        = "[e-mail]"
     @body       = "Nothing to see here."
   end
 
+  def iso_charset(recipient)
+    @recipients = recipient
+    @subject    = "testing iso charsets"
+    @from       = "[e-mail]"
+    @sent_on    = Time.local 2004, 12, 12
+    @cc         = "[e-mail]"
+    @bcc        = "[e-mail]"
+    @body       = "Nothing to see here."
+    @charset    = "iso-8859-1"
+  end
+
+  def unencoded_subject(recipient)
+    @recipients = recipient
+    @subject    = "testing unencoded subject"
+    @from       = "[e-mail]"
+    @sent_on    = Time.local 2004, 12, 12
+    @cc         = "[e-mail]"
+    @bcc        = "[e-mail]"
+    @body       = "Nothing to see here."
+    @encode_subject = false
+  end
+
 end
 
 TestMailer.template_root = File.dirname(__FILE__) + "/fixtures"
 
 class ActionMailerTest < Test::Unit::TestCase
 
+  def encode( text, charset="utf-8" )
+    ActionMailer::Base.quoted_printable( text, charset )
+  end
+
+  def new_mail( charset="utf-8" )
+    mail = TMail::Mail.new
+    if charset
+      mail.set_content_type "text", "plain", { "charset" => charset }
+    end
+    mail
+  end
+
   def setup
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
 
     @recipient = 'test@localhost'
   end
 
   def test_signed_up
-    expected = TMail::Mail.new
+    expected = new_mail
     expected.to      = @recipient
-    expected.subject = "[Signed up] Welcome #{@recipient}"
+    expected.subject = encode "[Signed up] Welcome #{@recipient}"
     expected.body    = "Hello there, \n\nMr. #{@recipient}"
     expected.from    = "[e-mail]"
     expected.date    = Time.local(2004, 12, 12)
 
     created = nil
@@ -62,13 +96,13 @@
     assert_not_nil ActionMailer::Base.deliveries.first
     assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
   end
   
   def test_cancelled_account
-    expected = TMail::Mail.new
+    expected = new_mail
     expected.to      = @recipient
-    expected.subject = "[Cancelled] Goodbye #{@recipient}"
+    expected.subject = encode "[Cancelled] Goodbye #{@recipient}"
     expected.body    = "Goodbye, Mr. #{@recipient}"
     expected.from    = "[e-mail]"
     expected.date    = Time.local(2004, 12, 12)
 
     created = nil
@@ -80,13 +114,13 @@
     assert_not_nil ActionMailer::Base.deliveries.first
     assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
   end
   
   def test_cc_bcc
-    expected = TMail::Mail.new
+    expected = new_mail
     expected.to      = @recipient
-    expected.subject = "testing bcc/cc"
+    expected.subject = encode "testing bcc/cc"
     expected.body    = "Nothing to see here."
     expected.from    = "[e-mail]"
     expected.cc      = "[e-mail]"
     expected.bcc     = "[e-mail]"
     expected.date    = Time.local 2004, 12, 12
@@ -98,9 +132,59 @@
     assert_not_nil created
     assert_equal expected.encoded, created.encoded
 
     assert_nothing_raised do
       TestMailer.deliver_cc_bcc @recipient
+    end
+
+    assert_not_nil ActionMailer::Base.deliveries.first
+    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+  end
+
+  def test_iso_charset
+    expected = new_mail( "iso-8859-1" )
+    expected.to      = @recipient
+    expected.subject = encode "testing iso charsets", "iso-8859-1"
+    expected.body    = "Nothing to see here."
+    expected.from    = "[e-mail]"
+    expected.cc      = "[e-mail]"
+    expected.bcc     = "[e-mail]"
+    expected.date    = Time.local 2004, 12, 12
+
+    created = nil
+    assert_nothing_raised do
+      created = TestMailer.create_iso_charset @recipient
+    end
+    assert_not_nil created
+    assert_equal expected.encoded, created.encoded
+
+    assert_nothing_raised do
+      TestMailer.deliver_iso_charset @recipient
+    end
+
+    assert_not_nil ActionMailer::Base.deliveries.first
+    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+  end
+
+  def test_unencoded_subject
+    expected = new_mail
+    expected.to      = @recipient
+    expected.subject = "testing unencoded subject"
+    expected.body    = "Nothing to see here."
+    expected.from    = "[e-mail]"
+    expected.cc      = "[e-mail]"
+    expected.bcc     = "[e-mail]"
+    expected.date    = Time.local 2004, 12, 12
+
+    created = nil
+    assert_nothing_raised do
+      created = TestMailer.create_unencoded_subject @recipient
+    end
+    assert_not_nil created
+    assert_equal expected.encoded, created.encoded
+
+    assert_nothing_raised do
+      TestMailer.deliver_unencoded_subject @recipient
     end
 
     assert_not_nil ActionMailer::Base.deliveries.first
     assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
   end