@@ -89,20 +89,25 @@ module CacheTest end # assert that the given action is being cached - def assert_cache_action + def assert_cache_action(*actions) fragment_cache_store.clear yield - - assert_block("#{@controller.params.inspect} is not cached after executing block. Expected: #{@controller.fragment_cache_key(@controller.params)}") do - path = @controller.fragment_cache_key(@controller.params) - path << 'index' if path.last == '/' - path << ".#{@controller.params[:format]}" if @controller.params[:format] && @controller.params[:format] != 'html' - fragment_cache_store.written?(path) + + actions.each do |action| + action = { :action => action } unless action.is_a?(Hash) + assert_block("#{@controller.params.inspect} is not cached after executing block. Expected: #{@controller.fragment_cache_key(@controller.params)}") do + path = @controller.fragment_cache_key(@controller.params) + path << 'index' if path.last == '/' + path << ".#{@controller.params[:format]}" if @controller.params[:format] && @controller.params[:format] != 'html' + fragment_cache_store.written?(path) + end end fragment_cache_store.clear end + + alias :assert_cache_actions :assert_cache_action # assert that the given actions are not being cached def assert_not_cache_actions(*actions) lib/cache_test/fragment_cache_test.rb a606f513252b8b5588f11070a647ce68823bd94c Fernando Blat Peris ferblape@gmail.com http://github.com/ferblape/cache_test/commit/3a12642378af00c9599baf392750ea3199b826f6 3a12642378af00c9599baf392750ea3199b826f6 2009-02-08T22:47:05-08:00 2009-02-08T22:47:05-08:00 Aliased action with params 32d361e660f27f9e07c5ab5eef60ecf2a58dd207 Fernando Blat Peris ferblape@gmail.com