Add render json to health

Author: francesco-loreti

actionpack/CHANGELOG.md

@@ -1,3 +1,7 @@
+*   Add `render json` into `HealthController`.
+
+    *Francesco Loreti*
+
 *   Allow to open source file with a crash from the browser.
 
     *Igor Kasyanchuk*

railties/lib/rails/health_controller.rb

@@ -43,11 +43,17 @@ def show
 
     private
       def render_up
-        render html: html_status(color: "green")
+        respond_to do |format|
+          format.html { render html: html_status(color: "green"), status: 200 }
+          format.json { render json: { status: 200 }, status: 200 }
+        end
       end
 
       def render_down
-        render html: html_status(color: "red"), status: 500
+        respond_to do |format|
+          format.html { render html: html_status(color: "red"), status: 500 }
+          format.json { render json: { status: 500 }, status: 500 }
+        end
       end
 
       def html_status(color:)

railties/test/rails_health_controller_test.rb

@@ -12,20 +12,37 @@ def setup
     @routes = Rails.application.routes
   end
 
-  test "health controller renders green success page" do
-    get :show
+  test "health controller renders green success page in HTML" do
+    get :show, format: :html
     assert_response :success
     assert_match(/background-color: green/, @response.body)
   end
 
-  test "health controller renders red internal server error page" do
+  test "health controller returns JSON success response" do
+    get :show, format: :json
+    assert_response :success
+    assert_equal({ "status" => 200 }, JSON.parse(@response.body))
+  end
+
+  test "health controller renders red internal server error page in HTML" do
     @controller.instance_eval do
       def render_up
         raise Exception, "some exception"
       end
     end
-    get :show
+    get :show, format: :html
     assert_response :internal_server_error
     assert_match(/background-color: red/, @response.body)
   end
+
+  test "health controller returns JSON internal server error response" do
+    @controller.instance_eval do
+      def render_up
+        raise Exception, "some exception"
+      end
+    end
+    get :show, format: :json
+    assert_response :internal_server_error
+    assert_equal({ "status" => 500 }, JSON.parse(@response.body))
+  end
 end