aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test/mail_service_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-02-07 23:10:01 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-02-07 23:10:01 +0000
commit218417b8a93f3c13c9328669db2a1baa60c53562 (patch)
tree1d9ffc8eb1c967b884eebb33efcd70708da13bcb /actionmailer/test/mail_service_test.rb
parent56d0e33037c602e51c30a6184e64a62def6177e0 (diff)
downloadrails-218417b8a93f3c13c9328669db2a1baa60c53562.tar.gz
rails-218417b8a93f3c13c9328669db2a1baa60c53562.tar.bz2
rails-218417b8a93f3c13c9328669db2a1baa60c53562.zip
Remove empty .rhtml templates
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8820 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/test/mail_service_test.rb')
-rwxr-xr-xactionmailer/test/mail_service_test.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index 91161e9ddb..0755f51045 100755
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -767,23 +767,23 @@ EOF
def test_implicitly_multipart_messages
mail = TestMailer.create_implicitly_multipart_example(@recipient)
- assert_equal 6, mail.parts.length
+ assert_equal 3, mail.parts.length
assert_equal "1.0", mail.mime_version
assert_equal "multipart/alternative", mail.content_type
assert_equal "text/yaml", mail.parts[0].content_type
assert_equal "utf-8", mail.parts[0].sub_header("content-type", "charset")
- assert_equal "text/plain", mail.parts[2].content_type
+ assert_equal "text/plain", mail.parts[1].content_type
+ assert_equal "utf-8", mail.parts[1].sub_header("content-type", "charset")
+ assert_equal "text/html", mail.parts[2].content_type
assert_equal "utf-8", mail.parts[2].sub_header("content-type", "charset")
- assert_equal "text/html", mail.parts[4].content_type
- assert_equal "utf-8", mail.parts[4].sub_header("content-type", "charset")
end
def test_implicitly_multipart_messages_with_custom_order
mail = TestMailer.create_implicitly_multipart_example(@recipient, nil, ["text/yaml", "text/plain"])
- assert_equal 6, mail.parts.length
+ assert_equal 3, mail.parts.length
assert_equal "text/html", mail.parts[0].content_type
- assert_equal "text/plain", mail.parts[2].content_type
- assert_equal "text/yaml", mail.parts[4].content_type
+ assert_equal "text/plain", mail.parts[1].content_type
+ assert_equal "text/yaml", mail.parts[2].content_type
end
def test_implicitly_multipart_messages_with_charset