aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-11 11:51:35 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-11 11:51:35 -0500
commit04a87af5b7abd00e74b96c5b1bb789d4484da6d9 (patch)
treed516fa6d3da2f46b46a6f0912ab09473c7cfe88c /actionpack
parentd106f2d08aad517c0bfa3a11e3eb87e14231e8ce (diff)
downloadrails-04a87af5b7abd00e74b96c5b1bb789d4484da6d9.tar.gz
rails-04a87af5b7abd00e74b96c5b1bb789d4484da6d9.tar.bz2
rails-04a87af5b7abd00e74b96c5b1bb789d4484da6d9.zip
Ensure use_accept_header is enabled for test_action_cache_conditional_options
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/caching_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 71b53893b8..15db70e474 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -285,11 +285,12 @@ class ActionCacheTest < Test::Unit::TestCase
end
def test_action_cache_conditional_options
+ old_use_accept_header = ActionController::Base.use_accept_header
ActionController::Base.use_accept_header = true
@request.env['HTTP_ACCEPT'] = 'application/json'
get :index
assert !fragment_exist?('hostname.com/action_caching_test')
- ActionController::Base.use_accept_header = false
+ ActionController::Base.use_accept_header = old_use_accept_header
end
def test_action_cache_with_store_options