diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-10 11:07:41 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-10 11:07:41 -0700 |
commit | d68419a88e424e588c2d8decc69874bd00588766 (patch) | |
tree | cc3a3276b79681050424be1a2a0b3fc0a4df3de1 /actionpack/test | |
parent | 05f88b7b0499781f87e9e79cbec4d01193db2352 (diff) | |
parent | 5374960a04d7333ced9b6c4ca36b708af498b1ca (diff) | |
download | rails-d68419a88e424e588c2d8decc69874bd00588766.tar.gz rails-d68419a88e424e588c2d8decc69874bd00588766.tar.bz2 rails-d68419a88e424e588c2d8decc69874bd00588766.zip |
Merge pull request #12193 from arunagw/revert-revert
Revert fixes
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/controller/new_base/render_streaming_test.rb | 2 |
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 |