diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-26 01:56:52 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-26 01:56:52 +0100 |
| commit | abad097016bf5243e9812f6a031f421a986b09f7 (patch) | |
| tree | f526a520a87db9c68ddd3436ce4bdb6f8c3182d1 /actionmailer/lib/action_mailer/test_case.rb | |
| parent | 8974dac92e05dcab8ee552a5f40108c6ac25dc36 (diff) | |
| parent | c02391f8f97182e818d22a0f0ec4a5589d2fff15 (diff) | |
| download | rails-abad097016bf5243e9812f6a031f421a986b09f7.tar.gz rails-abad097016bf5243e9812f6a031f421a986b09f7.tar.bz2 rails-abad097016bf5243e9812f6a031f421a986b09f7.zip | |
Merge remote branch 'mikel/master'
Diffstat (limited to 'actionmailer/lib/action_mailer/test_case.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/test_case.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb index 0ca4f5494e..7c4033a125 100644 --- a/actionmailer/lib/action_mailer/test_case.rb +++ b/actionmailer/lib/action_mailer/test_case.rb @@ -37,7 +37,7 @@ module ActionMailer def initialize_test_deliveries ActionMailer::Base.delivery_method = :test ActionMailer::Base.perform_deliveries = true - ActionMailer::Base.deliveries = [] + ActionMailer::Base.deliveries.clear end def set_expected_mail |