2 files changed, 29 insertions, 3 deletions
diff --git a/actionpack/test/controller/new_base/render_partial_test.rb b/actionpack/test/controller/new_base/render_partial_test.rb
index 5c7e66dba2..d800ea264d 100644
--- a/actionpack/test/controller/new_base/render_partial_test.rb
+++ b/actionpack/test/controller/new_base/render_partial_test.rb
@@ -5,10 +5,17 @@ module RenderPartial
   class BasicController < ActionController::Base
 
     self.view_paths = [ActionView::FixtureResolver.new(
-      "render_partial/basic/_basic.html.erb"    => "BasicPartial!",
-      "render_partial/basic/basic.html.erb"      => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'basic' %><%= @test_unchanged %>"
+      "render_partial/basic/_basic.html.erb"     => "BasicPartial!",
+      "render_partial/basic/basic.html.erb"      => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'basic' %><%= @test_unchanged %>",
+      "render_partial/basic/with_json.html.erb"  => "<%= render 'with_json.json' %>",
+      "render_partial/basic/_with_json.json.erb" => "<%= render 'final' %>",
+      "render_partial/basic/_final.json.erb"     => "{ final: json }"
     )]
 
+    def html_with_json_inside_json
+      render :action => "with_json"
+    end
+
     def changing
       @test_unchanged = 'hello'
       render :action => "basic"
@@ -22,6 +29,12 @@ module RenderPartial
       get :changing
       assert_response("goodbyeBasicPartial!goodbye")
     end
+
+    test "rendering a template with renders another partial with other format that renders other partial in the same format" do
+      get :html_with_json_inside_json
+      assert_content_type "text/html; charset=utf-8"
+      assert_response "{ final: json }"
+    end
   end
 
 end
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index fea98d6bbd..8f5f51d70b 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -8,13 +8,20 @@ module RenderTemplate
       "shared.html.erb"          => "Elastica",
       "locals.html.erb"          => "The secret is <%= secret %>",
       "xml_template.xml.builder" => "xml.html do\n  xml.p 'Hello'\nend",
-      "with_raw.html.erb"        => "Hello <%=raw '<strong>this is raw</strong>' %>"
+      "with_raw.html.erb"        => "Hello <%=raw '<strong>this is raw</strong>' %>",
+      "test/with_json.html.erb"  => "<%= render :template => 'test/with_json.json' %>",
+      "test/with_json.json.erb"  => "<%= render :template => 'test/final' %>",
+      "test/final.json.erb"      => "{ final: json }"
     )]
 
     def index
       render :template => "test/basic"
     end
 
+    def html_with_json_inside_json
+      render :template => "test/with_json"
+    end
+
     def index_without_key
       render "test/basic"
     end
@@ -88,6 +95,12 @@ module RenderTemplate
       assert_body "Hello <strong>this is raw</strong>"
       assert_status 200
     end
+
+    test "rendering a template with renders another template with other format that renders other template in the same format" do
+      get :html_with_json_inside_json
+      assert_content_type "text/html; charset=utf-8"
+      assert_response "{ final: json }"
+    end
   end
 
   class WithLayoutController < ::ApplicationController