aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-11-15 11:05:44 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-11-15 16:44:47 +0100
commite6b33a83376462619832fc51fb18929d4fc131db (patch)
treece0576786f3ae819a61b693261250afed7f99563 /actionmailer/test
parent44c3b865ac52a7c9a6312982ba0f6c20d7ad41e1 (diff)
downloadrails-e6b33a83376462619832fc51fb18929d4fc131db.tar.gz
rails-e6b33a83376462619832fc51fb18929d4fc131db.tar.bz2
rails-e6b33a83376462619832fc51fb18929d4fc131db.zip
Added lambda merging to OptionMerger (especially useful with named_scope and with_options) [#740 state:commited] (Paweł Kondzior)
Diffstat (limited to 'actionmailer/test')
-rw-r--r--actionmailer/test/mail_service_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb
index b88beb3314..c49049cc6a 100644
--- a/actionmailer/test/mail_service_test.rb
+++ b/actionmailer/test/mail_service_test.rb
@@ -915,6 +915,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_equal 'text/plain', mail.parts[0].content_type
+ assert_equal 'utf-8', mail.parts[0].charset
end
def test_custom_content_type_attributes