From 34df9be0e5bfcae1c84d1598bbcc3679314eca28 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Sun, 29 Jan 2006 02:25:15 +0000 Subject: Template paths with dot chars in them no longer mess up implicit template selection for multipart messages (closes #3332) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3495 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../multipart_with_template_path_with_dots.rhtml | 1 + actionmailer/test/mail_service_test.rb | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml (limited to 'actionmailer/test') diff --git a/actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml b/actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml new file mode 100644 index 0000000000..897a5065cf --- /dev/null +++ b/actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml @@ -0,0 +1 @@ +Have a lovely picture, from me. Enjoy! \ No newline at end of file diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 4d569da31f..838c49b7c3 100755 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -23,6 +23,20 @@ class Net::SMTP end end +class FunkyPathMailer < ActionMailer::Base + def multipart_with_template_path_with_dots(recipient) + recipients recipient + subject "Have a lovely picture" + from "Chad Fowler " + attachment :content_type => "image/jpeg", + :body => "not really a jpeg, we're only testing, after all" + end + + def template_path + "#{File.dirname(__FILE__)}/fixtures/path.with.dots" + end +end + class TestMailer < ActionMailer::Base def signed_up(recipient) @@ -748,9 +762,14 @@ EOF end def test_deliver_with_mail_object - mail = TestMailer::create_headers_with_nonalpha_chars(@recipient) + mail = TestMailer.create_headers_with_nonalpha_chars(@recipient) assert_nothing_raised { TestMailer.deliver(mail) } assert_equal 1, TestMailer.deliveries.length end + + def test_multipart_with_template_path_with_dots + mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient) + assert_equal 2, mail.parts.length + end end -- cgit v1.2.3