diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-04 03:24:39 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-04 03:24:39 +0530 |
| commit | cda36a0731f14b33a920bf7e32255661e06f890a (patch) | |
| tree | 79ccba37953f9fe3055503be42b1610faa6d64ad /actionmailer/lib/action_mailer/test_case.rb | |
| parent | bd4a3cce4ecd8e648179a91e26506e3622ac2162 (diff) | |
| parent | a115b5d79a850bb56cd3c9db9a05d6da35e3d7be (diff) | |
| download | rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.gz rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.bz2 rails-cda36a0731f14b33a920bf7e32255661e06f890a.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionmailer/lib/action_mailer/test_case.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/test_case.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb index 8035db6f03..e8632d4559 100644 --- a/actionmailer/lib/action_mailer/test_case.rb +++ b/actionmailer/lib/action_mailer/test_case.rb @@ -1,4 +1,5 @@ require 'active_support/test_case' +require 'action_mailer/base' module ActionMailer class NonInferrableMailerError < ::StandardError @@ -43,8 +44,8 @@ module ActionMailer end def set_expected_mail - @expected = TMail::Mail.new - @expected.set_content_type "text", "plain", { "charset" => charset } + @expected = Mail.new + @expected.content_type ["text", "plain", { "charset" => charset }] @expected.mime_version = '1.0' end |