diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-18 09:53:14 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-18 09:53:14 -0800 |
commit | b70236cfcb569c4560330b46f5c5ce76593e3225 (patch) | |
tree | 1d0d45a226ec2001edf7966435adcd48872d6cf0 /actionpack/test/template | |
parent | e1540897101b710f4cf06cbe971ba04e59c4fb71 (diff) | |
parent | 5a6ea535145270751bdf712a6e5c489650765ca7 (diff) | |
download | rails-b70236cfcb569c4560330b46f5c5ce76593e3225.tar.gz rails-b70236cfcb569c4560330b46f5c5ce76593e3225.tar.bz2 rails-b70236cfcb569c4560330b46f5c5ce76593e3225.zip |
Merge pull request #4523 from rafaelfranca/av-logger
Add ActionView own logger
Diffstat (limited to 'actionpack/test/template')
-rw-r--r-- | actionpack/test/template/log_subscriber_test.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/test/template/log_subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb index 752b0f23a8..1713ce935c 100644 --- a/actionpack/test/template/log_subscriber_test.rb +++ b/actionpack/test/template/log_subscriber_test.rb @@ -8,7 +8,6 @@ class AVLogSubscriberTest < ActiveSupport::TestCase def setup super - @old_logger = ActionController::Base.logger @controller = Object.new @controller.stubs(:_prefixes).returns(%w(test)) @view = ActionView::Base.new(ActionController::Base.view_paths, {}, @controller) @@ -19,11 +18,10 @@ class AVLogSubscriberTest < ActiveSupport::TestCase def teardown super ActiveSupport::LogSubscriber.log_subscribers.clear - ActionController::Base.logger = @old_logger end def set_logger(logger) - ActionController::Base.logger = logger + ActionView::Base.logger = logger end def test_render_file_template |