diff options
| author | wycats <wycats@gmail.com> | 2010-04-11 19:20:39 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-11 19:20:39 -0700 |
| commit | 59c6082d9867572352e2ac2070d5aa9590132ef8 (patch) | |
| tree | e9211dd3d0699452e623309a612a3be5efba0f0e /actionmailer/test/test_helper_test.rb | |
| parent | ecf039fc05ac32b7a8cbd005dd4723d7eadc61c0 (diff) | |
| parent | dd02090d762bfbb8fdada60142e35247797f32c7 (diff) | |
| download | rails-59c6082d9867572352e2ac2070d5aa9590132ef8.tar.gz rails-59c6082d9867572352e2ac2070d5aa9590132ef8.tar.bz2 rails-59c6082d9867572352e2ac2070d5aa9590132ef8.zip | |
Merge remote branch 'mikel/master'
Diffstat (limited to 'actionmailer/test/test_helper_test.rb')
| -rw-r--r-- | actionmailer/test/test_helper_test.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionmailer/test/test_helper_test.rb b/actionmailer/test/test_helper_test.rb index 3a38a91c28..440fb868c8 100644 --- a/actionmailer/test/test_helper_test.rb +++ b/actionmailer/test/test_helper_test.rb @@ -34,11 +34,7 @@ class TestHelperMailerTest < ActionMailer::TestCase end def test_charset_is_utf_8 - assert_equal "utf-8", charset - end - - def test_encode - assert_equal "=?utf-8?Q?=0Aasdf=0A?=", encode("\nasdf\n") + assert_equal "UTF-8", charset end def test_assert_emails |