From 48f140cf7459c963a54637c897448b959dbbfd26 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Wed, 30 Dec 2015 12:59:23 -0600
Subject: [PATCH] Render default template if block doesn't render

When a `respond_to` collector doesn't have a response, then a
`:no_content` response should be rendered. This brings the default
rendering behavior introduced by
https://github.com/rails/rails/issues/19036 to controller methods
employing `respond_to`
---
 actionpack/CHANGELOG.md                           |  7 +++++++
 .../lib/action_controller/metal/mime_responds.rb  |  2 +-
 .../test/controller/mime/respond_to_test.rb       | 15 +++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 5b762a8f17e..e0882b43902 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   When a `respond_to` collector with a block doesn't have a response, then
+    a `:no_content` response should be rendered.  This brings the default
+    rendering behavior introduced by https://github.com/rails/rails/issues/19036
+    to controller methods employing `respond_to`
+
+    *Justin Coyne*
+
 *   Update default rendering policies when the controller action did
     not explicitly indicate a response.
 
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 173a14a1d29..2e89af1a5e0 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -198,7 +198,7 @@ module ActionController #:nodoc:
         _process_format(format)
         _set_rendered_content_type format
         response = collector.response
-        response ? response.call : render({})
+        response.call if response
       else
         raise ActionController::UnknownFormat
       end
diff --git a/actionpack/test/controller/mime/respond_to_test.rb b/actionpack/test/controller/mime/respond_to_test.rb
index d0c7b2e06a4..993f4001de9 100644
--- a/actionpack/test/controller/mime/respond_to_test.rb
+++ b/actionpack/test/controller/mime/respond_to_test.rb
@@ -74,6 +74,14 @@ class RespondToController < ActionController::Base
     end
   end
 
+  def missing_templates
+    respond_to do |type|
+      # This test requires a block that is empty
+      type.json { }
+      type.xml
+    end
+  end
+
   def using_defaults_with_type_list
     respond_to(:html, :xml)
   end
@@ -624,6 +632,13 @@ class RespondToControllerTest < ActionController::TestCase
     end
   end
 
+  def test_missing_templates
+    get :missing_templates, format: :json
+    assert_response :no_content
+    get :missing_templates, format: :xml
+    assert_response :no_content
+  end
+
   def test_invalid_variant
     assert_raises(ActionController::UnknownFormat) do
       get :variant_with_implicit_template_rendering, params: { v: :invalid }