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 /actionpack/test/controller | |
| parent | dcb8b64975832ac75d92104da3c95876e56eec66 (diff) | |
| download | rails-378464a2e47bb849f3351cb8c87366554b7ce74d.tar.gz rails-378464a2e47bb849f3351cb8c87366554b7ce74d.tar.bz2 rails-378464a2e47bb849f3351cb8c87366554b7ce74d.zip | |
Default to sync instrumentation.
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/subscriber_test.rb | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/actionpack/test/controller/subscriber_test.rb b/actionpack/test/controller/subscriber_test.rb index 52434426f7..bd0c83413c 100644 --- a/actionpack/test/controller/subscriber_test.rb +++ b/actionpack/test/controller/subscriber_test.rb @@ -35,11 +35,9 @@ module Another end end -module ActionControllerSubscriberTest - - def self.included(base) - base.tests Another::SubscribersController - end +class ACSubscriberTest < ActionController::TestCase + tests Another::SubscribersController + include Rails::Subscriber::TestHelper def setup @old_logger = ActionController::Base.logger @@ -174,14 +172,4 @@ module ActionControllerSubscriberTest def logs @logs ||= @logger.logged(:info) end - - class SyncSubscriberTest < ActionController::TestCase - include Rails::Subscriber::SyncTestHelper - include ActionControllerSubscriberTest - end - - class AsyncSubscriberTest < ActionController::TestCase - include Rails::Subscriber::AsyncTestHelper - include ActionControllerSubscriberTest - end end |