aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-03-28 16:24:54 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2010-03-28 16:24:54 +1100
commitb91c57d16cc1b7b686e5ecc208dfe08648360803 (patch)
tree0690de8bf1f47e838c229140fbb2ee559bb3e059 /actionmailer
parenta41d1b1fb168ee248749444590050f120378afe1 (diff)
downloadrails-b91c57d16cc1b7b686e5ecc208dfe08648360803.tar.gz
rails-b91c57d16cc1b7b686e5ecc208dfe08648360803.tar.bz2
rails-b91c57d16cc1b7b686e5ecc208dfe08648360803.zip
Mail now correctly bundles up the charset into the content type field
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/base_test.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index 6f274c11df..aa28c5aa8b 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -135,13 +135,13 @@ class BaseTest < ActiveSupport::TestCase
:mime_version => '2.0',
:reply_to => 'reply-to@test.lindsaar.net',
:date => @time)
- assert_equal(['bcc@test.lindsaar.net'], email.bcc)
- assert_equal(['cc@test.lindsaar.net'], email.cc)
- assert_equal('multipart/mixed', email.content_type)
- assert_equal('iso-8559-1', email.charset)
- assert_equal('2.0', email.mime_version)
- assert_equal(['reply-to@test.lindsaar.net'], email.reply_to)
- assert_equal(@time, email.date)
+ assert_equal(['bcc@test.lindsaar.net'], email.bcc)
+ assert_equal(['cc@test.lindsaar.net'], email.cc)
+ assert_equal('multipart/mixed; charset=iso-8559-1', email.content_type)
+ assert_equal('iso-8559-1', email.charset)
+ assert_equal('2.0', email.mime_version)
+ assert_equal(['reply-to@test.lindsaar.net'], email.reply_to)
+ assert_equal(@time, email.date)
end
test "mail() renders the template using the method being processed" do