From 0b4fe10c8fed59de02100612a6168a9aefaf3659 Mon Sep 17 00:00:00 2001
From: Thomas Meckel <14177833+tmeckel@users.noreply.github.com>
Date: Thu, 8 Sep 2022 17:02:59 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20empty=20reponse=20body=20w?=
 =?UTF-8?q?hen=20default=20`status=5Fcode`=20is=20empty=20but=20the=20a=20?=
 =?UTF-8?q?`Response`=20parameter=20with=20`response.status=5Fcode`=20is?=
 =?UTF-8?q?=20set=20(#5360)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Thomas Meckel <tmeckel@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Sebastián Ramírez <tiangolo@gmail.com>
---
 fastapi/routing.py                           |  2 +-
 tests/test_reponse_set_reponse_code_empty.py | 97 ++++++++++++++++++++
 2 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 tests/test_reponse_set_reponse_code_empty.py

diff --git a/fastapi/routing.py b/fastapi/routing.py
index 233f79fcbf126..710cb97346127 100644
--- a/fastapi/routing.py
+++ b/fastapi/routing.py
@@ -258,7 +258,7 @@ async def app(request: Request) -> Response:
                 is_coroutine=is_coroutine,
             )
             response = actual_response_class(content, **response_args)
-            if not is_body_allowed_for_status_code(status_code):
+            if not is_body_allowed_for_status_code(response.status_code):
                 response.body = b""
             response.headers.raw.extend(sub_response.headers.raw)
             return response
diff --git a/tests/test_reponse_set_reponse_code_empty.py b/tests/test_reponse_set_reponse_code_empty.py
new file mode 100644
index 0000000000000..094d54a84b60c
--- /dev/null
+++ b/tests/test_reponse_set_reponse_code_empty.py
@@ -0,0 +1,97 @@
+from typing import Any
+
+from fastapi import FastAPI, Response
+from fastapi.testclient import TestClient
+
+app = FastAPI()
+
+
+@app.delete(
+    "/{id}",
+    status_code=204,
+)
+async def delete_deployment(
+    id: int,
+    response: Response,
+) -> Any:
+    response.status_code = 400
+    return {"msg": "Status overwritten", "id": id}
+
+
+client = TestClient(app)
+
+
+openapi_schema = {
+    "openapi": "3.0.2",
+    "info": {"title": "FastAPI", "version": "0.1.0"},
+    "paths": {
+        "/{id}": {
+            "delete": {
+                "summary": "Delete Deployment",
+                "operationId": "delete_deployment__id__delete",
+                "parameters": [
+                    {
+                        "required": True,
+                        "schema": {"title": "Id", "type": "integer"},
+                        "name": "id",
+                        "in": "path",
+                    }
+                ],
+                "responses": {
+                    "204": {"description": "Successful Response"},
+                    "422": {
+                        "description": "Validation Error",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/HTTPValidationError"
+                                }
+                            }
+                        },
+                    },
+                },
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "HTTPValidationError": {
+                "title": "HTTPValidationError",
+                "type": "object",
+                "properties": {
+                    "detail": {
+                        "title": "Detail",
+                        "type": "array",
+                        "items": {"$ref": "#/components/schemas/ValidationError"},
+                    }
+                },
+            },
+            "ValidationError": {
+                "title": "ValidationError",
+                "required": ["loc", "msg", "type"],
+                "type": "object",
+                "properties": {
+                    "loc": {
+                        "title": "Location",
+                        "type": "array",
+                        "items": {"anyOf": [{"type": "string"}, {"type": "integer"}]},
+                    },
+                    "msg": {"title": "Message", "type": "string"},
+                    "type": {"title": "Error Type", "type": "string"},
+                },
+            },
+        }
+    },
+}
+
+
+def test_openapi_schema():
+    response = client.get("/openapi.json")
+    assert response.status_code == 200, response.text
+    assert response.json() == openapi_schema
+
+
+def test_dependency_set_status_code():
+    response = client.delete("/1")
+    assert response.status_code == 400 and response.content
+    assert response.json() == {"msg": "Status overwritten", "id": 1}