diff options
| author | eileencodes <eileencodes@gmail.com> | 2015-04-06 09:03:13 -0400 |
|---|---|---|
| committer | eileencodes <eileencodes@gmail.com> | 2015-04-06 09:03:13 -0400 |
| commit | 188934cdac42491dffa63619cc0f9a5b25e0181f (patch) | |
| tree | 86da78e03dab666635c41bed1d82791e9a202c92 /actionpack/test/controller/mime/respond_to_test.rb | |
| parent | 6b98fbacf7274f903c894b9c7ddab13089f9cf1d (diff) | |
| download | rails-188934cdac42491dffa63619cc0f9a5b25e0181f.tar.gz rails-188934cdac42491dffa63619cc0f9a5b25e0181f.tar.bz2 rails-188934cdac42491dffa63619cc0f9a5b25e0181f.zip | |
Fix ActionPack tests after changes to missing template logger
After merging #19377 ActionPack tests were missing a require for
`ActiveSupport::LogSubscriber::TestHelper` and change didn't take
into account that logger could be nil. Added the require and only log to
info if logger exists.
This wasn't caught earlier because these tests only run after a merge.
Diffstat (limited to 'actionpack/test/controller/mime/respond_to_test.rb')
| -rw-r--r-- | actionpack/test/controller/mime/respond_to_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/mime/respond_to_test.rb b/actionpack/test/controller/mime/respond_to_test.rb index 21407f3966..7aef8a50ce 100644 --- a/actionpack/test/controller/mime/respond_to_test.rb +++ b/actionpack/test/controller/mime/respond_to_test.rb @@ -1,4 +1,5 @@ require 'abstract_unit' +require "active_support/log_subscriber/test_helper" class RespondToController < ActionController::Base layout :set_layout |