Skip to content
Browse files

Fix failing CI test (broken in 2daac47 or e693f45): make test_multipa…

…rt_with_template_path_with_dots only test path with dots, and stop failing on unrelated mimetype assertion. The image/jpeg multipart content type is already tested in test_explicitly_multipart_messages.

Signed-off-by: Yehuda Katz <wycats@yehuda-katzs-macbookpro41.local>
  • Loading branch information...
1 parent 2cb60ab commit 5679bf64d515e3c0d343c3562db09e9c7ff422fc @thewoolleyman thewoolleyman committed with Yehuda Katz May 27, 2009
View
2 ...test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb
@@ -1 +1 @@
-Have a lovely picture, from me. Enjoy!
+Have some dots. Enjoy!
View
9 actionmailer/test/mail_service_test.rb
@@ -6,10 +6,10 @@ class FunkyPathMailer < ActionMailer::Base
def multipart_with_template_path_with_dots(recipient)
recipients recipient
- subject "Have a lovely picture"
+ subject "This path has dots"
from "Chad Fowler <chad@chadfowler.com>"
- attachment :content_type => "image/jpeg",
- :body => "not really a jpeg, we're only testing, after all"
+ attachment :content_type => "text/plain",
+ :body => "dots dots dots..."
end
end
@@ -939,7 +939,8 @@ def test_deliver_with_mail_object
def test_multipart_with_template_path_with_dots
mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
assert_equal 2, mail.parts.length
- assert mail.parts.any? {|part| part.content_type == "text/plain" && part.charset == "utf-8"}
+ assert "text/plain", mail.parts[1].content_type
+ assert "utf-8", mail.parts[1].charset
end
def test_custom_content_type_attributes

0 comments on commit 5679bf6

Please sign in to comment.
Something went wrong with that request. Please try again.