aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-21 14:22:07 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-21 14:34:56 -0700
commite693f45e155a81b6c337b8766870b56716a05105 (patch)
tree176d94bdc8aa6e072666f1a1ef9383ff809a18df /actionpack/test/controller
parent386ff66e5ed4fbe1e060610d4226a4eb22dca766 (diff)
downloadrails-e693f45e155a81b6c337b8766870b56716a05105.tar.gz
rails-e693f45e155a81b6c337b8766870b56716a05105.tar.bz2
rails-e693f45e155a81b6c337b8766870b56716a05105.zip
Remove some response content type concepts from ActionView
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/content_type_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index 64b8b10d5b..d622ac1e85 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -148,12 +148,13 @@ class AcceptBasedContentTypeTest < ActionController::TestCase
def setup
super
+ @_old_accept_header = ActionController::Base.use_accept_header
ActionController::Base.use_accept_header = true
end
def teardown
super
- ActionController::Base.use_accept_header = false
+ ActionController::Base.use_accept_header = @_old_accept_header
end