Refactor content type setting, added tests to ensure boundary exists on multipart and fixed typo

1 files changed, 14 insertions, 9 deletions

diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 0705f22df8..14feef5a00 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -200,7 +200,7 @@ class BaseTest < ActiveSupport::TestCase
   test "implicit multipart" do
     email = BaseMailer.implicit_multipart.deliver
     assert_equal(2, email.parts.size)
-    assert_equal("multipart/alternate", email.mime_type)
+    assert_equal("multipart/alternative", email.mime_type)
     assert_equal("text/plain", email.parts[0].mime_type)
     assert_equal("TEXT Implicit Multipart", email.parts[0].body.encoded)
     assert_equal("text/html", email.parts[1].mime_type)
@@ -223,7 +223,7 @@ class BaseTest < ActiveSupport::TestCase
   test "implicit multipart with attachments creates nested parts" do
     email = BaseMailer.implicit_multipart(:attachments => true).deliver
     assert_equal("application/pdf", email.parts[0].mime_type)
-    assert_equal("multipart/alternate", email.parts[1].mime_type)
+    assert_equal("multipart/alternative", email.parts[1].mime_type)
     assert_equal("text/plain", email.parts[1].parts[0].mime_type)
     assert_equal("TEXT Implicit Multipart", email.parts[1].parts[0].body.encoded)
     assert_equal("text/html", email.parts[1].parts[1].mime_type)
@@ -235,7 +235,7 @@ class BaseTest < ActiveSupport::TestCase
     swap BaseMailer, :default_implicit_parts_order => order do
       email = BaseMailer.implicit_multipart(:attachments => true).deliver
       assert_equal("application/pdf", email.parts[0].mime_type)
-      assert_equal("multipart/alternate", email.parts[1].mime_type)
+      assert_equal("multipart/alternative", email.parts[1].mime_type)
       assert_equal("text/plain", email.parts[1].parts[1].mime_type)
       assert_equal("text/html", email.parts[1].parts[0].mime_type)
     end
@@ -244,7 +244,7 @@ class BaseTest < ActiveSupport::TestCase
   test "implicit multipart with default locale" do
     email = BaseMailer.implicit_with_locale.deliver
     assert_equal(2, email.parts.size)
-    assert_equal("multipart/alternate", email.mime_type)
+    assert_equal("multipart/alternative", email.mime_type)
     assert_equal("text/plain", email.parts[0].mime_type)
     assert_equal("Implicit with locale TEXT", email.parts[0].body.encoded)
     assert_equal("text/html", email.parts[1].mime_type)
@@ -255,7 +255,7 @@ class BaseTest < ActiveSupport::TestCase
     swap I18n, :locale => :pl do
       email = BaseMailer.implicit_with_locale.deliver
       assert_equal(2, email.parts.size)
-      assert_equal("multipart/alternate", email.mime_type)
+      assert_equal("multipart/alternative", email.mime_type)
       assert_equal("text/plain", email.parts[0].mime_type)
       assert_equal("Implicit with locale PL TEXT", email.parts[0].body.encoded)
       assert_equal("text/html", email.parts[1].mime_type)
@@ -287,7 +287,7 @@ class BaseTest < ActiveSupport::TestCase
   test "explicit multipart" do
     email = BaseMailer.explicit_multipart.deliver
     assert_equal(2, email.parts.size)
-    assert_equal("multipart/alternate", email.mime_type)
+    assert_equal("multipart/alternative", email.mime_type)
     assert_equal("text/plain", email.parts[0].mime_type)
     assert_equal("TEXT Explicit Multipart", email.parts[0].body.encoded)
     assert_equal("text/html", email.parts[1].mime_type)
@@ -310,7 +310,7 @@ class BaseTest < ActiveSupport::TestCase
   test "explicit multipart with attachments creates nested parts" do
     email = BaseMailer.explicit_multipart(:attachments => true).deliver
     assert_equal("application/pdf", email.parts[0].mime_type)
-    assert_equal("multipart/alternate", email.parts[1].mime_type)
+    assert_equal("multipart/alternative", email.parts[1].mime_type)
     assert_equal("text/plain", email.parts[1].parts[0].mime_type)
     assert_equal("TEXT Explicit Multipart", email.parts[1].parts[0].body.encoded)
     assert_equal("text/html", email.parts[1].parts[1].mime_type)
@@ -320,7 +320,7 @@ class BaseTest < ActiveSupport::TestCase
   test "explicit multipart with templates" do
     email = BaseMailer.explicit_multipart_templates.deliver
     assert_equal(2, email.parts.size)
-    assert_equal("multipart/alternate", email.mime_type)
+    assert_equal("multipart/alternative", email.mime_type)
     assert_equal("text/html", email.parts[0].mime_type)
     assert_equal("HTML Explicit Multipart Templates", email.parts[0].body.encoded)
     assert_equal("text/plain", email.parts[1].mime_type)
@@ -330,7 +330,7 @@ class BaseTest < ActiveSupport::TestCase
   test "explicit multipart with any" do
     email = BaseMailer.explicit_multipart_with_any.deliver
     assert_equal(2, email.parts.size)
-    assert_equal("multipart/alternate", email.mime_type)
+    assert_equal("multipart/alternative", email.mime_type)
     assert_equal("text/plain", email.parts[0].mime_type)
     assert_equal("Format with any!", email.parts[0].body.encoded)
     assert_equal("text/html", email.parts[1].mime_type)
@@ -370,6 +370,11 @@ class BaseTest < ActiveSupport::TestCase
     BaseMailer.expects(:welcome).returns(mail)
     BaseMailer.welcome.deliver
   end
+  
+  test "explicit multipart should be multipart" do
+    mail = BaseMailer.explicit_multipart
+    assert_not_nil(mail.content_type_parameters[:boundary])
+  end
 
   protected