1 files changed, 25 insertions, 0 deletions
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb
index 13ab19ed8f..351b9c4cfa 100644
--- a/actionpack/test/controller/show_exceptions_test.rb
+++ b/actionpack/test/controller/show_exceptions_test.rb
@@ -68,4 +68,29 @@ module ShowExceptions
       assert_match(/boom/, body)
     end
   end
+
+  class ShowExceptionsFormatsTest < ActionDispatch::IntegrationTest
+    def test_render_json_exception
+      @app = ShowExceptionsOverridenController.action(:boom)
+      get "/", {}, 'HTTP_ACCEPT' => 'application/json'
+      assert_response :internal_server_error
+      assert_equal 'application/json', response.content_type.to_s
+      assert_equal({ :status => '500', :error => 'boom!' }.to_json, response.body)
+    end
+
+    def test_render_xml_exception
+      @app = ShowExceptionsOverridenController.action(:boom)
+      get "/", {}, 'HTTP_ACCEPT' => 'application/xml'
+      assert_response :internal_server_error
+      assert_equal 'application/xml', response.content_type.to_s
+      assert_equal({ :status => '500', :error => 'boom!' }.to_xml, response.body)
+    end
+
+    def test_render_fallback_exception
+      @app = ShowExceptionsOverridenController.action(:boom)
+      get "/", {}, 'HTTP_ACCEPT' => 'text/csv'
+      assert_response :internal_server_error
+      assert_equal 'text/html', response.content_type.to_s
+    end
+  end
 end