From 3cd4f272784318865875e0fe6d4753111621cfb8 Mon Sep 17 00:00:00 2001
From: Lukas Rajala <lukas.rajala@klarna.com>
Date: Thu, 24 Jul 2025 15:54:49 +0200
Subject: [PATCH] Adding tests from similiar pr,

Co-authored-by: dlax <denis@laxalde.org>
---
 tests/test_custom_schema_fields.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/test_custom_schema_fields.py b/tests/test_custom_schema_fields.py
index ee51fc7ff..d890291b1 100644
--- a/tests/test_custom_schema_fields.py
+++ b/tests/test_custom_schema_fields.py
@@ -1,7 +1,13 @@
+from typing import Optional
+
 from fastapi import FastAPI
 from fastapi._compat import PYDANTIC_V2
 from fastapi.testclient import TestClient
 from pydantic import BaseModel
+from typing_extensions import Annotated
+
+if PYDANTIC_V2:
+    from pydantic import WithJsonSchema
 
 app = FastAPI()
 
@@ -10,12 +16,17 @@ class Item(BaseModel):
     name: str
 
     if PYDANTIC_V2:
+        description: Annotated[
+            Optional[str], WithJsonSchema({"type": ["string", "null"]})
+        ] = None
+
         model_config = {
             "json_schema_extra": {
                 "x-something-internal": {"level": 4},
             }
         }
     else:
+        description: Optional[str] = None  # type: ignore[no-redef]
 
         class Config:
             schema_extra = {
@@ -42,7 +53,11 @@ item_schema = {
         "name": {
             "title": "Name",
             "type": "string",
-        }
+        },
+        "description": {
+            "title": "Description",
+            "type": ["string", "null"] if PYDANTIC_V2 else "string",
+        },
     },
 }
 
@@ -57,4 +72,4 @@ def test_response():
     # For coverage
     response = client.get("/foo")
     assert response.status_code == 200, response.text
-    assert response.json() == {"name": "Foo item"}
+    assert response.json() == {"name": "Foo item", "description": None}