Merge pull request #244 from python-ellar/pydantic_schema_fix

eadwinCode · web-flow · commit 7e5c7fd5b4a9 · 2024-09-10T00:45:18.000+01:00
fix: allOf for latest Pydantic version
diff --git a/tests/test_openapi/test_open_api_route_documentation.py b/tests/test_openapi/test_open_api_route_documentation.py
@@ -461,9 +461,8 @@ def test_open_api_route__get_openapi_path_object_works_for_routes_with_multiple_
                 "content": {
                     "application/json": {
                         "schema": {
-                            "allOf": [{"$ref": "#/$defs/CreateCarSchema"}],
+                            "$ref": "#/$defs/CreateCarSchema",
                             "default": None,
-                            "title": "Car",
                         }
                     }
                 }
@@ -497,9 +496,8 @@ def test_open_api_route__get_openapi_path_object_works_for_routes_with_multiple_
                 "content": {
                     "application/json": {
                         "schema": {
-                            "allOf": [{"$ref": "#/$defs/CreateCarSchema"}],
+                            "$ref": "#/$defs/CreateCarSchema",
                             "default": None,
-                            "title": "Car",
                         }
                     }
                 }
diff --git a/tests/test_routing/document_results.py b/tests/test_routing/document_results.py
@@ -118,12 +118,7 @@
                     "content": {
                         "multipart/form-data": {
                             "schema": {
-                                "allOf": [
-                                    {
-                                        "$ref": "#/components/schemas/body_form_upload_multiple_case_2_mixed_optional_post"
-                                    }
-                                ],
-                                "title": "Body",
+                                "$ref": "#/components/schemas/body_form_upload_multiple_case_2_mixed_optional_post"
                             }
                         }
                     }
@@ -236,7 +231,7 @@
                         "repr": True,
                     },
                     "range": {
-                        "allOf": [{"$ref": "#/components/schemas/Range"}],
+                        "$ref": "#/components/schemas/Range",
                         "default": 20,
                         "repr": True,
                     },
diff --git a/tests/test_routing/test_body_union_schema.py b/tests/test_routing/test_body_union_schema.py
@@ -131,12 +131,7 @@ def alias_qty(
                     "content": {
                         "application/json": {
                             "schema": {
-                                "allOf": [
-                                    {
-                                        "$ref": "#/components/schemas/body_embed_qty_items_embed_post"
-                                    }
-                                ],
-                                "title": "Body",
+                                "$ref": "#/components/schemas/body_embed_qty_items_embed_post",
                             }
                         }
                     }
diff --git a/tests/test_routing/test_cookie_schema.py b/tests/test_routing/test_cookie_schema.py
@@ -154,8 +154,7 @@ def test_cookie_schema():
         {
             "required": False,
             "schema": {
-                "allOf": [{"$ref": "#/components/schemas/Range"}],
-                "title": "Range",
+                "$ref": "#/components/schemas/Range",
                 "default": 20,
                 "repr": True,
             },
diff --git a/tests/test_routing/test_extra_args.py b/tests/test_routing/test_extra_args.py
@@ -125,8 +125,7 @@ def query_params_extra(
                     {
                         "required": False,
                         "schema": {
-                            "allOf": [{"$ref": "#/components/schemas/Range"}],
-                            "title": "Range",
+                            "$ref": "#/components/schemas/Range",
                             "default": 20,
                             "repr": True,
                         },
diff --git a/tests/test_routing/test_form_schema.py b/tests/test_routing/test_form_schema.py
@@ -147,7 +147,7 @@ def test_schema():
                 "repr": True,
             },
             "range": {
-                "allOf": [{"$ref": "#/components/schemas/Range"}],
+                "$ref": "#/components/schemas/Range",
                 "default": 20,
                 "repr": True,
             },
diff --git a/tests/test_routing/test_header_schema.py b/tests/test_routing/test_header_schema.py
@@ -154,8 +154,7 @@ def test_header_schema():
         {
             "required": False,
             "schema": {
-                "allOf": [{"$ref": "#/components/schemas/Range"}],
-                "title": "Range",
+                "$ref": "#/components/schemas/Range",
                 "default": 20,
                 "repr": True,
             },
diff --git a/tests/test_routing/test_path_with_schema.py b/tests/test_routing/test_path_with_schema.py
@@ -70,8 +70,7 @@ def test_schema():
         {
             "required": False,
             "schema": {
-                "allOf": [{"$ref": "#/components/schemas/Range"}],
-                "title": "Range",
+                "$ref": "#/components/schemas/Range",
                 "default": 20,
                 "repr": True,
             },
diff --git a/tests/test_routing/test_query_schema.py b/tests/test_routing/test_query_schema.py
@@ -156,8 +156,7 @@ def test_schema():
         {
             "required": False,
             "schema": {
-                "allOf": [{"$ref": "#/components/schemas/Range"}],
-                "title": "Range",
+                "$ref": "#/components/schemas/Range",
                 "default": 20,
                 "repr": True,
             },

Original file line number	Diff line number	Diff line change
`@@ -461,9 +461,8 @@ def test_open_api_route__get_openapi_path_object_works_for_routes_with_multiple_`
`461`	`461`	`"content": {`
`462`	`462`	`"application/json": {`
`463`	`463`	`"schema": {`
`464`		`- "allOf": [{"$ref": "#/$defs/CreateCarSchema"}],`
	`464`	`+ "$ref": "#/$defs/CreateCarSchema",`
`465`	`465`	`"default": None,`
`466`		`- "title": "Car",`
`467`	`466`	`}`
`468`	`467`	`}`
`469`	`468`	`}`
`@@ -497,9 +496,8 @@ def test_open_api_route__get_openapi_path_object_works_for_routes_with_multiple_`
`497`	`496`	`"content": {`
`498`	`497`	`"application/json": {`
`499`	`498`	`"schema": {`
`500`		`- "allOf": [{"$ref": "#/$defs/CreateCarSchema"}],`
	`499`	`+ "$ref": "#/$defs/CreateCarSchema",`
`501`	`500`	`"default": None,`
`502`		`- "title": "Car",`
`503`	`501`	`}`
`504`	`502`	`}`
`505`	`503`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,12 +131,7 @@ def alias_qty(`
`131`	`131`	`"content": {`
`132`	`132`	`"application/json": {`
`133`	`133`	`"schema": {`
`134`		`- "allOf": [`
`135`		`- {`
`136`		`- "$ref": "#/components/schemas/body_embed_qty_items_embed_post"`
`137`		`- }`
`138`		`- ],`
`139`		`- "title": "Body",`
	`134`	`+ "$ref": "#/components/schemas/body_embed_qty_items_embed_post",`
`140`	`135`	`}`
`141`	`136`	`}`
`142`	`137`	`}`