diff options
author | José Valim <jose.valim@gmail.com> | 2010-06-24 13:23:43 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-06-24 13:23:43 +0200 |
commit | 6788db824ab732b13493a9d702dd8fb89fa153c8 (patch) | |
tree | ad9314fdd10b55ebb035959a71be0de921cb0d02 /actionpack/test/activerecord | |
parent | 5441e082f9478ddb3c676c681b09786f1391483c (diff) | |
download | rails-6788db824ab732b13493a9d702dd8fb89fa153c8.tar.gz rails-6788db824ab732b13493a9d702dd8fb89fa153c8.tar.bz2 rails-6788db824ab732b13493a9d702dd8fb89fa153c8.zip |
Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved]
Diffstat (limited to 'actionpack/test/activerecord')
-rw-r--r-- | actionpack/test/activerecord/controller_runtime_test.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/activerecord/controller_runtime_test.rb b/actionpack/test/activerecord/controller_runtime_test.rb index 331f861d8f..cfd86d704d 100644 --- a/actionpack/test/activerecord/controller_runtime_test.rb +++ b/actionpack/test/activerecord/controller_runtime_test.rb @@ -1,8 +1,8 @@ require 'active_record_unit' require 'active_record/railties/controller_runtime' require 'fixtures/project' -require 'rails/log_subscriber/test_helper' -require 'action_controller/railties/log_subscriber' +require 'active_support/log_subscriber/test_helper' +require 'action_controller/log_subscriber' ActionController::Base.send :include, ActiveRecord::Railties::ControllerRuntime @@ -13,18 +13,18 @@ class ControllerRuntimeLogSubscriberTest < ActionController::TestCase end end - include Rails::LogSubscriber::TestHelper + include ActiveSupport::LogSubscriber::TestHelper tests LogSubscriberController def setup super @old_logger = ActionController::Base.logger - Rails::LogSubscriber.add(:action_controller, ActionController::Railties::LogSubscriber.new) + ActionController::LogSubscriber.attach_to :action_controller end def teardown super - Rails::LogSubscriber.log_subscribers.clear + ActiveSupport::LogSubscriber.log_subscribers.clear ActionController::Base.logger = @old_logger end |