diff options
Diffstat (limited to 'actionpack/test/controller/content_type_test.rb')
| -rw-r--r-- | actionpack/test/controller/content_type_test.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb index 32c1757ef9..7377546631 100644 --- a/actionpack/test/controller/content_type_test.rb +++ b/actionpack/test/controller/content_type_test.rb @@ -54,6 +54,7 @@ class ContentTypeTest < ActionController::TestCase tests ContentTypeController def setup + super # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get # a more accurate simulation of what happens in "real life". @controller.logger = Logger.new(nil) @@ -136,10 +137,12 @@ class AcceptBasedContentTypeTest < ActionController::TestCase tests ContentTypeController def setup + super ActionController::Base.use_accept_header = true end def teardown + super ActionController::Base.use_accept_header = false end |