aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-11 11:49:22 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-11 11:49:22 -0500
commitd106f2d08aad517c0bfa3a11e3eb87e14231e8ce (patch)
tree1264d752fd79cda7725503e7a911fe3f9a26d399 /actionpack
parent15b21754268e6e9fd90e866096ebd60ee6fd972b (diff)
downloadrails-d106f2d08aad517c0bfa3a11e3eb87e14231e8ce.tar.gz
rails-d106f2d08aad517c0bfa3a11e3eb87e14231e8ce.tar.bz2
rails-d106f2d08aad517c0bfa3a11e3eb87e14231e8ce.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.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 7aa4e0cd93..71b53893b8 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -285,9 +285,11 @@ class ActionCacheTest < Test::Unit::TestCase
end
def test_action_cache_conditional_options
+ 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
end
def test_action_cache_with_store_options