diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-21 13:05:30 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-21 13:09:12 +0100 |
| commit | 378464a2e47bb849f3351cb8c87366554b7ce74d (patch) | |
| tree | 98a0aeb321ae4005f45e9c9d4147da1fbef0f7d5 /actionmailer/test | |
| parent | dcb8b64975832ac75d92104da3c95876e56eec66 (diff) | |
| download | rails-378464a2e47bb849f3351cb8c87366554b7ce74d.tar.gz rails-378464a2e47bb849f3351cb8c87366554b7ce74d.tar.bz2 rails-378464a2e47bb849f3351cb8c87366554b7ce74d.zip | |
Default to sync instrumentation.
Diffstat (limited to 'actionmailer/test')
| -rw-r--r-- | actionmailer/test/subscriber_test.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/actionmailer/test/subscriber_test.rb b/actionmailer/test/subscriber_test.rb index 01a71f481d..aed5d2ca7e 100644 --- a/actionmailer/test/subscriber_test.rb +++ b/actionmailer/test/subscriber_test.rb @@ -2,7 +2,8 @@ require "abstract_unit" require "rails/subscriber/test_helper" require "action_mailer/railties/subscriber" -module SubscriberTest +class AMSubscriberTest < ActionMailer::TestCase + include Rails::Subscriber::TestHelper Rails::Subscriber.add(:action_mailer, ActionMailer::Railties::Subscriber.new) class TestMailer < ActionMailer::Base @@ -40,14 +41,4 @@ module SubscriberTest assert_equal 1, @logger.logged(:debug).size assert_match /Jamis/, @logger.logged(:debug).first end - - class SyncSubscriberTest < ActionMailer::TestCase - include Rails::Subscriber::SyncTestHelper - include SubscriberTest - end - - class AsyncSubscriberTest < ActionMailer::TestCase - include Rails::Subscriber::AsyncTestHelper - include SubscriberTest - end end
\ No newline at end of file |