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/old_base/url_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/old_base/url_test.rb')
| -rw-r--r-- | actionmailer/test/old_base/url_test.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionmailer/test/old_base/url_test.rb b/actionmailer/test/old_base/url_test.rb index 17b383cc2a..6895fb230e 100644 --- a/actionmailer/test/old_base/url_test.rb +++ b/actionmailer/test/old_base/url_test.rb @@ -29,13 +29,12 @@ class UrlTestMailer < ActionMailer::Base end class ActionMailerUrlTest < Test::Unit::TestCase - include ActionMailer::Quoting - def encode( text, charset="utf-8" ) + def encode( text, charset="UTF-8" ) quoted_printable( text, charset ) end - def new_mail( charset="utf-8" ) + def new_mail( charset="UTF-8" ) mail = Mail.new mail.mime_version = "1.0" if charset |