diff options
Diffstat (limited to 'actionmailer')
16 files changed, 7 insertions, 7 deletions
diff --git a/actionmailer/test/fixtures/first_mailer/share.rhtml b/actionmailer/test/fixtures/first_mailer/share.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/first_mailer/share.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml b/actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/helper_mailer/use_example_helper.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/helper_mailer/use_helper.rhtml b/actionmailer/test/fixtures/helper_mailer/use_helper.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/helper_mailer/use_helper.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/helper_mailer/use_helper_method.rhtml b/actionmailer/test/fixtures/helper_mailer/use_helper_method.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/helper_mailer/use_helper_method.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/helper_mailer/use_mail_helper.rhtml b/actionmailer/test/fixtures/helper_mailer/use_mail_helper.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/helper_mailer/use_mail_helper.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml b/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/path.with.dots/funky_path_mailer/multipart_with_template_path_with_dots.rhtml +++ /dev/null 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 deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/second_mailer/share.rhtml b/actionmailer/test/fixtures/second_mailer/share.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/second_mailer/share.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/templates/signed_up.rhtml b/actionmailer/test/fixtures/templates/signed_up.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/templates/signed_up.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml b/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/test_mailer/signed_up.rhtml b/actionmailer/test/fixtures/test_mailer/signed_up.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/test_mailer/signed_up.rhtml +++ /dev/null diff --git a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.rhtml b/actionmailer/test/fixtures/test_mailer/signed_up_with_url.rhtml deleted file mode 100644 index e69de29bb2..0000000000 --- a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.rhtml +++ /dev/null diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 91161e9ddb..0755f51045 100755 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -767,23 +767,23 @@ EOF def test_implicitly_multipart_messages mail = TestMailer.create_implicitly_multipart_example(@recipient) - assert_equal 6, mail.parts.length + assert_equal 3, 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[2].content_type + 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 "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 6, mail.parts.length + assert_equal 3, mail.parts.length assert_equal "text/html", mail.parts[0].content_type - assert_equal "text/plain", mail.parts[2].content_type - assert_equal "text/yaml", mail.parts[4].content_type + assert_equal "text/plain", mail.parts[1].content_type + assert_equal "text/yaml", mail.parts[2].content_type end def test_implicitly_multipart_messages_with_charset |