mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix failing CI test (broken in 2daac47
or e693f45
): make test_multipart_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>
This commit is contained in:
parent
2cb60abfec
commit
5679bf64d5
2 changed files with 6 additions and 5 deletions
|
@ -1 +1 @@
|
||||||
Have a lovely picture, from me. Enjoy!
|
Have some dots. Enjoy!
|
|
@ -6,10 +6,10 @@ class FunkyPathMailer < ActionMailer::Base
|
||||||
|
|
||||||
def multipart_with_template_path_with_dots(recipient)
|
def multipart_with_template_path_with_dots(recipient)
|
||||||
recipients recipient
|
recipients recipient
|
||||||
subject "Have a lovely picture"
|
subject "This path has dots"
|
||||||
from "Chad Fowler <chad@chadfowler.com>"
|
from "Chad Fowler <chad@chadfowler.com>"
|
||||||
attachment :content_type => "image/jpeg",
|
attachment :content_type => "text/plain",
|
||||||
:body => "not really a jpeg, we're only testing, after all"
|
:body => "dots dots dots..."
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -939,7 +939,8 @@ EOF
|
||||||
def test_multipart_with_template_path_with_dots
|
def test_multipart_with_template_path_with_dots
|
||||||
mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
|
mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
|
||||||
assert_equal 2, mail.parts.length
|
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
|
end
|
||||||
|
|
||||||
def test_custom_content_type_attributes
|
def test_custom_content_type_attributes
|
||||||
|
|
Loading…
Reference in a new issue