diff options
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/test_case.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb index cc75b39280..7829baa799 100644 --- a/actionmailer/lib/action_mailer/test_case.rb +++ b/actionmailer/lib/action_mailer/test_case.rb @@ -33,7 +33,7 @@ module ActionMailer end end - def setup + def setup_with_mailer ActionMailer::Base.delivery_method = :test ActionMailer::Base.perform_deliveries = true ActionMailer::Base.deliveries = [] @@ -42,6 +42,19 @@ module ActionMailer @expected.set_content_type "text", "plain", { "charset" => charset } @expected.mime_version = '1.0' end + alias_method :setup, :setup_with_mailer + + def self.method_added(method) + if method.to_s == 'setup' + unless method_defined?(:setup_without_mailer) + alias_method :setup_without_mailer, :setup + define_method(:setup) do + setup_with_mailer + setup_without_mailer + end + end + end + end private def charset |