Permalink
Browse files

Allowing string as url argument for expire_action

  • Loading branch information...
1 parent 81fec5d commit 0da31a1839d03e597f8ce0ae853b3a75519f325a Thomas von Deyen committed Dec 6, 2011
Showing with 22 additions and 3 deletions.
  1. +2 −3 actionpack/lib/action_controller/caching/actions.rb
  2. +20 −0 actionpack/test/controller/caching_test.rb
@@ -116,9 +116,8 @@ def _save_fragment(name, options)
def expire_action(options = {})
return unless cache_configured?
- actions = options[:action]
- if actions.is_a?(Array)
- actions.each {|action| expire_action(options.merge(:action => action)) }
+ if options.is_a?(Hash) && options[:action].is_a?(Array)
+ options[:action].each {|action| expire_action(options.merge(:action => action)) }
else
expire_fragment(ActionCachePath.new(self, options, false).path)
end
@@ -251,6 +251,11 @@ def expire_xml
expire_action :controller => 'action_caching_test', :action => 'index', :format => 'xml'
render :nothing => true
end
+
+ def expire_with_url_string
+ expire_action url_for(:controller => 'action_caching_test', :action => 'index')
+ render :nothing => true
+ end
end
class MockTime < Time
@@ -445,6 +450,21 @@ def test_cache_expiration_isnt_affected_by_request_format
assert_not_equal cached_time, @response.body
end
+ def test_cache_expiration_with_url_string
+ get :index
+ cached_time = content_to_cache
+ reset!
+
+ @request.request_uri = "/action_caching_test/expire_with_url_string"
+ get :expire_with_url_string
+ assert_response :success
+ reset!
+
+ get :index
+ assert_response :success
+ assert_not_equal cached_time, @response.body
+ end
+
def test_cache_is_scoped_by_subdomain
@request.host = 'jamis.hostname.com'
get :index

0 comments on commit 0da31a1

Please sign in to comment.