Ticket #3335: action_caching_for_non_success_status_codes.2.diff

actionpack/test/controller/caching_test.rb

@@ -121 +121 @@
-
-
-class ActionCachingTestController < ActionController::Base
-
+, :redirected, :forbidden
-  caches_action :show, :cache_path => 'http://test.host/custom/show'
-  caches_action :edit, :cache_path => Proc.new { |c| c.params[:id] ? "http://test.host/#{c.params[:id]};edit" : "http://test.host/edit" }
-
@@ -129 +129 @@
-    @cache_this = Time.now.to_f.to_s
-    render :text => @cache_this
-  end
-
+
+
+
+
+
+
+
+
+
+
-  alias_method :show, :index
-  alias_method :edit, :index
-
@@ -245 +254 @@
-    assert_equal david_cache, @response.body
-  end
-
+  def test_redirect_is_not_cached
+    get :redirected
+    assert_response :redirect
+    reset!
+
+    get :redirected
+    assert_response :redirect
+  end
+
+  def test_forbidden_is_not_cached
+    get :forbidden
+    assert_response :forbidden
+    reset!
+
+    get :forbidden
+    assert_response :forbidden
+  end
+
-  def test_xml_version_of_resource_is_treated_as_different_cache
-    @mock_controller.mock_url_for = 'http://example.org/posts/'
-    @mock_controller.mock_path    = '/posts/index.xml'

actionpack/lib/action_controller/caching.rb

@@ -240 +240 @@
-        end
-
-        def after(controller)
-
+ || !caching_allowed(controller)
-          controller.write_fragment(controller.action_cache_path.path, controller.response.body)
-        end
-
+
-        private
-          
-          def set_content_type!(controller, extension)
-            controller.response.content_type = Mime::EXTENSION_LOOKUP[extension].to_s if extension
-          end
-
+
-          def path_options_for(controller, options)
-            ((path_options = options[:cache_path]).respond_to?(:call) ? path_options.call(controller) : path_options) || {}
-          end
-
+
+
+
+
-      end
-      
-      class ActionCachePath