diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-02 13:40:16 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-02 13:40:16 -0700 |
| commit | b656134450d5d49d79ae288a537df64795e9d34d (patch) | |
| tree | d73cdec459220277570f09a991674044fab4b88a /actionpack/test | |
| parent | 2914b92048e0cee970d019b333f6e47bf42a4270 (diff) | |
| parent | 9a41edf0d9bdd757963aed9885cd4bfce324d613 (diff) | |
| download | rails-b656134450d5d49d79ae288a537df64795e9d34d.tar.gz rails-b656134450d5d49d79ae288a537df64795e9d34d.tar.bz2 rails-b656134450d5d49d79ae288a537df64795e9d34d.zip | |
Merge pull request #6125 from ncri/master
Adding proc evaluation for action caching layout parameter
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/caching_test.rb | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb index e8546cb154..9efe328d62 100644 --- a/actionpack/test/controller/caching_test.rb +++ b/actionpack/test/controller/caching_test.rb @@ -236,6 +236,7 @@ class ActionCachingTestController < CachingController caches_action :with_layout caches_action :with_format_and_http_param, :cache_path => Proc.new { |c| { :key => 'value' } } caches_action :layout_false, :layout => false + caches_action :with_layout_proc_param, :layout => Proc.new { |c| c.params[:layout] } caches_action :record_not_found, :four_oh_four, :simple_runtime_error caches_action :streaming @@ -282,6 +283,7 @@ class ActionCachingTestController < CachingController alias_method :edit, :index alias_method :destroy, :index alias_method :layout_false, :with_layout + alias_method :with_layout_proc_param, :with_layout def expire expire_action :controller => 'action_caching_test', :action => 'index' @@ -403,11 +405,40 @@ class ActionCacheTest < ActionController::TestCase get :layout_false assert_response :success assert_not_equal cached_time, @response.body - body = body_to_string(read_fragment('hostname.com/action_caching_test/layout_false')) assert_equal cached_time, body end + def test_action_cache_with_layout_and_layout_cache_false_via_proc + get :with_layout_proc_param, :layout => false + assert_response :success + cached_time = content_to_cache + assert_not_equal cached_time, @response.body + assert fragment_exist?('hostname.com/action_caching_test/with_layout_proc_param') + reset! + + get :with_layout_proc_param, :layout => false + assert_response :success + assert_not_equal cached_time, @response.body + body = body_to_string(read_fragment('hostname.com/action_caching_test/with_layout_proc_param')) + assert_equal cached_time, body + end + + def test_action_cache_with_layout_and_layout_cache_true_via_proc + get :with_layout_proc_param, :layout => true + assert_response :success + cached_time = content_to_cache + assert_not_equal cached_time, @response.body + assert fragment_exist?('hostname.com/action_caching_test/with_layout_proc_param') + reset! + + get :with_layout_proc_param, :layout => true + assert_response :success + assert_not_equal cached_time, @response.body + body = body_to_string(read_fragment('hostname.com/action_caching_test/with_layout_proc_param')) + assert_equal @response.body, body + end + def test_action_cache_conditional_options @request.env['HTTP_ACCEPT'] = 'application/json' get :index |