✅ Refactor OpenAPI tests, prepare for Pydantic v2 (#9503)

* ✅ Refactor OpenAPI tests, move inline, prepare for Pydantic v2 tests * ✅ Fix test module loading for conditional OpenAPI * 🐛 Fix missing pytest marker * ✅ Fix test for coverage
fastapi · May 8, 2023 · 50c1a92 · 50c1a92
1 parent 724060d
commit 50c1a92
Show file tree

Hide file tree

Showing 280 changed files with 33,874 additions and 32,946 deletions.
diff --git a/tests/test_additional_properties.py b/tests/test_additional_properties.py
@@ -19,92 +19,91 @@ def foo(items: Items):
 client = TestClient(app)
 
 
-openapi_schema = {
-    "openapi": "3.0.2",
-    "info": {"title": "FastAPI", "version": "0.1.0"},
-    "paths": {
-        "/foo": {
-            "post": {
-                "responses": {
-                    "200": {
-                        "description": "Successful Response",
-                        "content": {"application/json": {"schema": {}}},
+def test_additional_properties_post():
+    response = client.post("/foo", json={"items": {"foo": 1, "bar": 2}})
+    assert response.status_code == 200, response.text
+    assert response.json() == {"foo": 1, "bar": 2}
+
+
+def test_openapi_schema():
+    response = client.get("/openapi.json")
+    assert response.status_code == 200, response.text
+    assert response.json() == {
+        "openapi": "3.0.2",
+        "info": {"title": "FastAPI", "version": "0.1.0"},
+        "paths": {
+            "/foo": {
+                "post": {
+                    "responses": {
+                        "200": {
+                            "description": "Successful Response",
+                            "content": {"application/json": {"schema": {}}},
+                        },
+                        "422": {
+                            "description": "Validation Error",
+                            "content": {
+                                "application/json": {
+                                    "schema": {
+                                        "$ref": "#/components/schemas/HTTPValidationError"
+                                    }
+                                }
+                            },
+                        },
                     },
-                    "422": {
-                        "description": "Validation Error",
+                    "summary": "Foo",
+                    "operationId": "foo_foo_post",
+                    "requestBody": {
                         "content": {
                             "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/HTTPValidationError"
-                                }
+                                "schema": {"$ref": "#/components/schemas/Items"}
                             }
                         },
+                        "required": True,
                     },
-                },
-                "summary": "Foo",
-                "operationId": "foo_foo_post",
-                "requestBody": {
-                    "content": {
-                        "application/json": {
-                            "schema": {"$ref": "#/components/schemas/Items"}
+                }
+            }
+        },
+        "components": {
+            "schemas": {
+                "Items": {
+                    "title": "Items",
+                    "required": ["items"],
+                    "type": "object",
+                    "properties": {
+                        "items": {
+                            "title": "Items",
+                            "type": "object",
+                            "additionalProperties": {"type": "integer"},
                         }
                     },
-                    "required": True,
-                },
-            }
-        }
-    },
-    "components": {
-        "schemas": {
-            "Items": {
-                "title": "Items",
-                "required": ["items"],
-                "type": "object",
-                "properties": {
-                    "items": {
-                        "title": "Items",
-                        "type": "object",
-                        "additionalProperties": {"type": "integer"},
-                    }
                 },
-            },
-            "ValidationError": {
-                "title": "ValidationError",
-                "required": ["loc", "msg", "type"],
-                "type": "object",
-                "properties": {
-                    "loc": {
-                        "title": "Location",
-                        "type": "array",
-                        "items": {"anyOf": [{"type": "string"}, {"type": "integer"}]},
+                "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"},
                     },
-                    "msg": {"title": "Message", "type": "string"},
-                    "type": {"title": "Error Type", "type": "string"},
                 },
-            },
-            "HTTPValidationError": {
-                "title": "HTTPValidationError",
-                "type": "object",
-                "properties": {
-                    "detail": {
-                        "title": "Detail",
-                        "type": "array",
-                        "items": {"$ref": "#/components/schemas/ValidationError"},
-                    }
+                "HTTPValidationError": {
+                    "title": "HTTPValidationError",
+                    "type": "object",
+                    "properties": {
+                        "detail": {
+                            "title": "Detail",
+                            "type": "array",
+                            "items": {"$ref": "#/components/schemas/ValidationError"},
+                        }
+                    },
                 },
-            },
-        }
-    },
-}
-
-
-def test_additional_properties_schema():
-    response = client.get("/openapi.json")
-    assert response.status_code == 200, response.text
-    assert response.json() == openapi_schema
-
-
-def test_additional_properties_post():
-    response = client.post("/foo", json={"items": {"foo": 1, "bar": 2}})
-    assert response.status_code == 200, response.text
-    assert response.json() == {"foo": 1, "bar": 2}
+            }
+        },
+    }
diff --git a/tests/test_additional_response_extra.py b/tests/test_additional_response_extra.py
@@ -17,36 +17,33 @@ def read_item():
 
 app.include_router(router)
 
-
-openapi_schema = {
-    "openapi": "3.0.2",
-    "info": {"title": "FastAPI", "version": "0.1.0"},
-    "paths": {
-        "/items/": {
-            "get": {
-                "responses": {
-                    "200": {
-                        "description": "Successful Response",
-                        "content": {"application/json": {"schema": {}}},
-                    }
-                },
-                "summary": "Read Item",
-                "operationId": "read_item_items__get",
-            }
-        }
-    },
-}
-
 client = TestClient(app)
 
 
-def test_openapi_schema():
-    response = client.get("/openapi.json")
-    assert response.status_code == 200, response.text
-    assert response.json() == openapi_schema
-
-
 def test_path_operation():
     response = client.get("/items/")
     assert response.status_code == 200, response.text
     assert response.json() == {"id": "foo"}
+
+
+def test_openapi_schema():
+    response = client.get("/openapi.json")
+    assert response.status_code == 200, response.text
+    assert response.json() == {
+        "openapi": "3.0.2",
+        "info": {"title": "FastAPI", "version": "0.1.0"},
+        "paths": {
+            "/items/": {
+                "get": {
+                    "responses": {
+                        "200": {
+                            "description": "Successful Response",
+                            "content": {"application/json": {"schema": {}}},
+                        }
+                    },
+                    "summary": "Read Item",
+                    "operationId": "read_item_items__get",
+                }
+            }
+        },
+    }