Ticket #6743: cache_only_for_200_OK.diff

test/controller/caching_test.rb

@@ -5 +5 @@
-# Don't change '/../temp/' cavalierly or you might hoze something you don't want hozed
-FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
-ActionController::Base.perform_caching = true
+ActionController::Base.page_cache_directory = FILE_STORE_PATH
-ActionController::Base.fragment_cache_store = :file_store, FILE_STORE_PATH
-
+class PageCachingTestController < ActionController::Base
+  caches_page :index, :test404, :test302
+  
+  def index
+    render :text => "all's well"
+  end
+  
+  def test404
+    render :text => "oopsie!", :status => 404
+  end
+  
+  def test302
+    redirect_to :action => 'index'
+  end
+end
+
-class PageCachingTest < Test::Unit::TestCase
-  def setup
-    ActionController::Routing::Routes.draw do |map|
@@ -18 +35 @@
-    @request = ActionController::TestRequest.new
-    @params = {:controller => 'posts', :action => 'index', :only_path => true, :skip_relative_url_root => true}
-    @rewriter = ActionController::UrlRewriter.new(@request, @params)
-
-
+
+
+
+
+
+
+
+
+
-  def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
-    @params[:format] = 'rss'
-    assert_equal '/posts.rss', @rewriter.rewrite(@params)
-    @params[:format] = nil
-    assert_equal '/', @rewriter.rewrite(@params)
-  end
+  
+  def test_page_caching_only_for_200_OK
+    reset!
+    get :index
+    assert_equal 200, @response.headers['Status'].to_i
+    assert File.exists?(File.join(FILE_STORE_PATH, 'page_caching_test.html'))
+    
+    reset!
+    get :test404
+    assert_equal 404, @response.headers['Status'].to_i
+    assert !File.exists?(File.join(FILE_STORE_PATH, 'page_caching_test', 'test404.html'))
+    
+    reset!
+    get :test302
+    assert_equal 302, @response.headers['Status'].to_i
+    assert !File.exists?(File.join(FILE_STORE_PATH, 'page_caching_test', 'test302.html'))
+  end
+  
+  private
+  
+  def reset!
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @controller = PageCachingTestController.new
+    @request.host = 'hostname.com'
+  end
-end
-
-class ActionCachingTestController < ActionController::Base

lib/action_controller/caching.rb

@@ -135 +135 @@
-
-      private
-        def caching_allowed
-< 4
+== 2
-        end
-    end
-