diff options
author | Paul Horsfall <horsfallp@gmail.com> | 2008-04-19 16:19:47 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-04-19 16:21:34 -0500 |
commit | 14a40804a29a57ad05ca6bffbe1e5334089593a9 (patch) | |
tree | 80e2d5f38334327a70a368cc2e57fc8c2e8f7c1c /actionpack/test | |
parent | 3f8d3cd04ff0bd7cbf70c11d49a3dc009dfa98a0 (diff) | |
download | rails-14a40804a29a57ad05ca6bffbe1e5334089593a9.tar.gz rails-14a40804a29a57ad05ca6bffbe1e5334089593a9.tar.bz2 rails-14a40804a29a57ad05ca6bffbe1e5334089593a9.zip |
Add conditional options to caches_page method [#25 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/controller/caching_test.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index 7bd64e2870..ddc1c68383 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -8,7 +8,8 @@ ActionController::Base.page_cache_directory = FILE_STORE_PATH ActionController::Base.cache_store = :file_store, FILE_STORE_PATH class PageCachingTestController < ActionController::Base - caches_page :ok, :no_content, :found, :not_found + caches_page :ok, :no_content, :if => Proc.new { |c| !c.request.format.json? } + caches_page :found, :not_found def ok head :ok @@ -127,6 +128,12 @@ class PageCachingTest < Test::Unit::TestCase end end end + + def test_page_caching_conditional_options + @request.env['HTTP_ACCEPT'] = 'application/json' + get :ok + assert_page_not_cached :ok + end private def assert_page_cached(action, message = "#{action} should have been cached") |