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/activerecord/controller_runtime_test.rb | |
parent | dcb8b64975832ac75d92104da3c95876e56eec66 (diff) | |
download | rails-378464a2e47bb849f3351cb8c87366554b7ce74d.tar.gz rails-378464a2e47bb849f3351cb8c87366554b7ce74d.tar.bz2 rails-378464a2e47bb849f3351cb8c87366554b7ce74d.zip |
Default to sync instrumentation.
Diffstat (limited to 'actionpack/test/activerecord/controller_runtime_test.rb')
-rw-r--r-- | actionpack/test/activerecord/controller_runtime_test.rb | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb index 37c7738301..ed8e324938 100644 --- a/actionpack/test/activerecord/controller_runtime_test.rb +++ b/actionpack/test/activerecord/controller_runtime_test.rb @@ -6,16 +6,15 @@ require 'action_controller/railties/subscriber' ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime -module ControllerRuntimeSubscriberTest +class ControllerRuntimeSubscriberTest < ActionController::TestCase class SubscriberController < ActionController::Base def show render :inline => "<%= Project.all %>" end end - - def self.included(base) - base.tests SubscriberController - end + + include Rails::Subscriber::TestHelper + tests SubscriberController def setup @old_logger = ActionController::Base.logger @@ -40,14 +39,4 @@ module ControllerRuntimeSubscriberTest assert_equal 2, @logger.logged(:info).size assert_match /\(Views: [\d\.]+ms | ActiveRecord: [\d\.]+ms\)/, @logger.logged(:info)[1] end - - class SyncSubscriberTest < ActionController::TestCase - include Rails::Subscriber::SyncTestHelper - include ControllerRuntimeSubscriberTest - end - - class AsyncSubscriberTest < ActionController::TestCase - include Rails::Subscriber::AsyncTestHelper - include ControllerRuntimeSubscriberTest - end end
\ No newline at end of file |