aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2007-02-22 19:02:14 +0000
committerJamis Buck <jamis@37signals.com>2007-02-22 19:02:14 +0000
commitb6923c2b29b4eb6358c46ae086bd0a866f4e43c7 (patch)
tree37a53a958dd08d4b47e2692e5d1a37752a466a9b /actionmailer/test
parentf2fb7111524835946913d8335acc7a6930991c9a (diff)
downloadrails-b6923c2b29b4eb6358c46ae086bd0a866f4e43c7.tar.gz
rails-b6923c2b29b4eb6358c46ae086bd0a866f4e43c7.tar.bz2
rails-b6923c2b29b4eb6358c46ae086bd0a866f4e43c7.zip
Fix broken tests
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6206 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/test')
-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 aa68cb466f..6e0d727abd 100755
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -686,23 +686,23 @@ EOF
def test_implicitly_multipart_messages
mail = TestMailer.create_implicitly_multipart_example(@recipient)
- assert_equal 3, mail.parts.length
+ assert_equal 6, 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[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 "text/plain", 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 3, mail.parts.length
+ assert_equal 6, mail.parts.length
assert_equal "text/html", mail.parts[0].content_type
- assert_equal "text/plain", mail.parts[1].content_type
- assert_equal "text/yaml", mail.parts[2].content_type
+ assert_equal "text/plain", mail.parts[2].content_type
+ assert_equal "text/yaml", mail.parts[4].content_type
end
def test_implicitly_multipart_messages_with_charset