Set the response content type to that of found template if not explicitly set elsewhere [#444 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>

2 files changed, 12 insertions, 5 deletions

diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 041c54c7fd..76832f5713 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -197,11 +197,11 @@ class TestController < ActionController::Base
 
   def render_alternate_default
     # For this test, the method "default_render" is overridden:
-    @alternate_default_render = lambda {
-	render :update do |page|
-	  page.replace :foo, :partial => 'partial'
-	end
-      }
+    @alternate_default_render = lambda do
+      render :update do |page|
+        page.replace :foo, :partial => 'partial'
+      end
+    end
   end
 
   def rescue_action(e) raise end
@@ -467,6 +467,11 @@ class RenderTest < Test::Unit::TestCase
     get :render_xml_with_custom_content_type
     assert_equal "application/atomsvc+xml", @response.content_type
   end
+
+  def test_should_use_implicit_content_type
+    get :implicit_content_type, :format => 'atom'
+    assert_equal Mime::ATOM, @response.content_type
+  end
 end
 
 class EtagRenderTest < Test::Unit::TestCase
diff --git a/actionpack/test/fixtures/test/implicit_content_type.atom.builder b/actionpack/test/fixtures/test/implicit_content_type.atom.builder
new file mode 100644
index 0000000000..2fcb32d247
--- /dev/null
+++ b/actionpack/test/fixtures/test/implicit_content_type.atom.builder
@@ -0,0 +1,2 @@
+xml.atom do
+end