Fix bug where action caching sets the content type to the ActionCachePath object. Closes #9282 [mindforge]

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

actionpack/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Fix bug where action caching sets the content type to the ActionCachePath object.  Closes #9282 [mindforge]
+
 * Find layouts even if they're not in the first view_paths directory.  Closes #9258 [caio]
 
 * Major improvement to the documentation for the options / select form helpers. Closes #9038 [kampers, jardeon, wesg]

actionpack/lib/action_controller/caching.rb

@@ -231,7 +231,7 @@ module ActionController #:nodoc:
           cache_path = ActionCachePath.new(controller, path_options_for(controller, @options))
           if cache = controller.read_fragment(cache_path.path)
             controller.rendered_action_cache = true
-            set_content_type!(controller, cache_path)
+            set_content_type!(controller, cache_path.extension)
             controller.send(:render_text, cache)
             false
           else

actionpack/test/controller/caching_test.rb

@@ -279,6 +279,11 @@ class ActionCacheTest < Test::Unit::TestCase
     assert_equal 'xml', path_object.extension
     assert_equal 'example.org/posts/index.xml', path_object.path
   end
+  
+  def test_correct_content_type_is_returned_for_cache_hit
+    get :index, :id => 'content-type.xml'
+    assert_equal 'application/xml', @response.content_type
+  end
 
   def test_empty_path_is_normalized
     @mock_controller.mock_url_for = 'http://example.org/'