diff options
| -rw-r--r-- | actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb | 2 | ||||
| -rw-r--r-- | actionmailer/test/mail_service_test.rb | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb b/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb index 897a5065cf..2d0cd5c124 100644 --- a/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb +++ b/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.erb @@ -1 +1 @@ -Have a lovely picture, from me. Enjoy!
\ No newline at end of file +Have some dots. Enjoy!
\ No newline at end of file diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 919ab5de94..30d1b836c4 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/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 @@ EOF 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 |