aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/mime
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-03-11 10:29:10 -0700
committerSean Griffin <sean@seantheprogrammer.com>2016-03-11 10:29:10 -0700
commit3bfda09fa069caf9b28df78a19bb63c23c60169b (patch)
treedc5d1b31bf7b71a71a439cf3e0acbc33f032ca91 /actionpack/test/controller/mime
parente56b594d323e9c17398e65caa0fad20500868135 (diff)
parent48f140cf7459c963a54637c897448b959dbbfd26 (diff)
downloadrails-3bfda09fa069caf9b28df78a19bb63c23c60169b.tar.gz
rails-3bfda09fa069caf9b28df78a19bb63c23c60169b.tar.bz2
rails-3bfda09fa069caf9b28df78a19bb63c23c60169b.zip
Merge pull request #22854 from jcoyne/missing_template
Default rendering behavior if respond_to collector doesn't have a block.
Diffstat (limited to 'actionpack/test/controller/mime')
-rw-r--r--actionpack/test/controller/mime/respond_to_test.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/actionpack/test/controller/mime/respond_to_test.rb b/actionpack/test/controller/mime/respond_to_test.rb
index d0c7b2e06a..993f4001de 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 }