Added custom path cache_page/expire_page parameters in addition to the options hashes [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6868 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 26 insertions, 0 deletions

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 3c576f3d20..2d7b5f2af6 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -9,6 +9,8 @@ require 'action_controller'
 require 'action_controller/cgi_ext'
 require 'action_controller/test_process'
 
+require 'ruby-debug'
+
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
 
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index dcbe27622d..0dc73472cf 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -25,6 +25,16 @@ class PageCachingTestController < ActionController::Base
   def not_found
     head :not_found
   end
+  
+  def custom_path
+    render :text => "Super soaker"
+    cache_page("Super soaker", "/index.html")
+  end
+  
+  def expire_custom_path
+    expire_page("/index.html")
+    head :ok
+  end
 end
 
 class PageCachingTest < Test::Unit::TestCase
@@ -69,6 +79,19 @@ class PageCachingTest < Test::Unit::TestCase
     assert_page_cached :ok, "get with ok status should have been cached"
   end
 
+  def test_should_cache_with_custom_path
+    get :custom_path
+    assert File.exist?("#{FILE_STORE_PATH}/index.html")
+  end
+
+  def test_should_expire_cache_with_custom_path
+    get :custom_path
+    assert File.exist?("#{FILE_STORE_PATH}/index.html")
+
+    get :expire_custom_path
+    assert !File.exist?("#{FILE_STORE_PATH}/index.html")
+  end
+
   [:ok, :no_content, :found, :not_found].each do |status|
     [:get, :post, :put, :delete].each do |method|
       unless method == :get and status == :ok
@@ -96,6 +119,7 @@ class PageCachingTest < Test::Unit::TestCase
     end
 end
 
+
 class ActionCachingTestController < ActionController::Base
   caches_action :index
   caches_action :show, :cache_path => 'http://test.host/custom/show'