diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-03 19:10:42 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-03 19:10:42 -0800 |
| commit | 8ef46f0d61c5e4a2b92708585a5157dac96a6817 (patch) | |
| tree | a828e6cc95e3f3ab8a055304e3fcff90f3df889c /actionmailer/test | |
| parent | cb534524389bb4f407fc268a0bb7a7cffb6785a9 (diff) | |
| parent | ce56c5daa81d61a745b88220014a846a0eea46a4 (diff) | |
| download | rails-8ef46f0d61c5e4a2b92708585a5157dac96a6817.tar.gz rails-8ef46f0d61c5e4a2b92708585a5157dac96a6817.tar.bz2 rails-8ef46f0d61c5e4a2b92708585a5157dac96a6817.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/mail_service_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index 1e04531753..26ba652f2a 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -330,6 +330,7 @@ class ActionMailerTest < Test::Unit::TestCase assert_equal "multipart/mixed", created.content_type assert_equal "multipart/alternative", created.parts.first.content_type assert_equal "bar", created.parts.first.header['foo'].to_s + assert_nil created.parts.first.charset assert_equal "text/plain", created.parts.first.parts.first.content_type assert_equal "text/html", created.parts.first.parts[1].content_type assert_equal "application/octet-stream", created.parts[1].content_type |