aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2013-07-26 03:00:19 +0900
committerArun Agrawal <arunagw@gmail.com>2013-09-10 19:47:04 +0200
commitb1116bdcc39c075aa11aab115042278f98cde326 (patch)
tree136f968a68239eaaed578fa14d552d64bef760ef /actionpack
parent6018b83c177e52ff785b882a381db14eb6f46223 (diff)
downloadrails-b1116bdcc39c075aa11aab115042278f98cde326.tar.gz
rails-b1116bdcc39c075aa11aab115042278f98cde326.tar.bz2
rails-b1116bdcc39c075aa11aab115042278f98cde326.zip
Reset ActionView::Base.logger instead of AC::Base.logger
see: 9b0ac0bc74569db460f87ea6888b3847be0ff5be
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/new_base/render_streaming_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index f4bdd3e1d4..2b36a399bb 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -92,7 +92,7 @@ module RenderStreaming
io.rewind
assert_match "(undefined method `invalid!' for nil:NilClass)", io.read
ensure
- ActionController::Base.logger = _old
+ ActionView::Base.logger = _old
end
end