Only add Rack::Cache to the middleware stack if config.action_controller.perform_caching is set.

1 files changed, 15 insertions, 1 deletions

diff --git a/railties/test/application/middleware/cache_test.rb b/railties/test/application/middleware/cache_test.rb
index 655f9bcd55..5675cebfd9 100644
--- a/railties/test/application/middleware/cache_test.rb
+++ b/railties/test/application/middleware/cache_test.rb
@@ -24,7 +24,7 @@ module ApplicationTests
     end
 
     def simple_controller
-      controller :foo, <<-RUBY
+      controller :expires, <<-RUBY
         class ExpiresController < ApplicationController
           def expires_header
             expires_in 10, :public => !params[:private]
@@ -55,6 +55,20 @@ module ApplicationTests
       RUBY
     end
 
+    def test_cache_is_disabled_in_dev_mode
+      simple_controller
+      app("development")
+
+      get "/expires/expires_header"
+      assert_nil last_response.headers['X-Rack-Cache']
+
+      body = last_response.body
+
+      get "/expires/expires_header"
+      assert_nil last_response.headers['X-Rack-Cache']
+      assert_not_equal body, last_response.body
+    end
+
     def test_cache_works_with_expires
       simple_controller