diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-12-17 12:23:08 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-12-17 12:23:08 +1100 |
| commit | 63b124b043dec036403f9a88aeafdf99669064e0 (patch) | |
| tree | 6eae80842608d223f0eebae957dab1b8822555c8 /actionmailer/test | |
| parent | 418639b4cfe477d7309fa53e8b8e2472b44bda80 (diff) | |
| download | rails-63b124b043dec036403f9a88aeafdf99669064e0.tar.gz rails-63b124b043dec036403f9a88aeafdf99669064e0.tar.bz2 rails-63b124b043dec036403f9a88aeafdf99669064e0.zip | |
Merged in latest changes from rails/master
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/mail_helper_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb index d04215171d..2d3565d159 100644 --- a/actionmailer/test/mail_helper_test.rb +++ b/actionmailer/test/mail_helper_test.rb @@ -56,7 +56,7 @@ end class MailerHelperTest < Test::Unit::TestCase def new_mail( charset="utf-8" ) mail = Mail.new - mail.content_type(["text", "plain", { "charset" => charset }]) + mail.set_content_type "text", "plain", { "charset" => charset } if charset mail end |