✅ Simplify tests for cookie_params (#13176)

diff --git a/tests/test_tutorial/test_cookie_params/test_tutorial001.py b/tests/test_tutorial/test_cookie_params/test_tutorial001.py
index 7d0e669abafd125daf8c0881abcfb07554ef5b5f..90e8dfd37c8cf57d75b4e30e8fc3790c7e68416b 100644 (file)
--- a/tests/test_tutorial/test_cookie_params/test_tutorial001.py
+++ b/tests/test_tutorial/test_cookie_params/test_tutorial001.py
@@ -1,8 +1,27 @@
+import importlib
+from types import ModuleType
+
 import pytest
 from dirty_equals import IsDict
 from fastapi.testclient import TestClient
 
-from docs_src.cookie_params.tutorial001 import app
+from ...utils import needs_py39, needs_py310
+
+
+@pytest.fixture(
+    name="mod",
+    params=[
+        "tutorial001",
+        pytest.param("tutorial001_py310", marks=needs_py310),
+        "tutorial001_an",
+        pytest.param("tutorial001_an_py39", marks=needs_py39),
+        pytest.param("tutorial001_an_py310", marks=needs_py310),
+    ],
+)
+def get_mod(request: pytest.FixtureRequest):
+    mod = importlib.import_module(f"docs_src.cookie_params.{request.param}")
+
+    return mod
 
 
 @pytest.mark.parametrize(
@@ -19,15 +38,15 @@ from docs_src.cookie_params.tutorial001 import app
         ("/items", {"session": "cookiesession"}, 200, {"ads_id": None}),
     ],
 )
-def test(path, cookies, expected_status, expected_response):
-    client = TestClient(app, cookies=cookies)
+def test(path, cookies, expected_status, expected_response, mod: ModuleType):
+    client = TestClient(mod.app, cookies=cookies)
     response = client.get(path)
     assert response.status_code == expected_status
     assert response.json() == expected_response
 
 
-def test_openapi_schema():
-    client = TestClient(app)
+def test_openapi_schema(mod: ModuleType):
+    client = TestClient(mod.app)
     response = client.get("/openapi.json")
     assert response.status_code == 200
     assert response.json() == {

diff --git a/tests/test_tutorial/test_cookie_params/test_tutorial001_an.py b/tests/test_tutorial/test_cookie_params/test_tutorial001_an.py
deleted file mode 100644 (file)
index 2505876..0000000
--- a/tests/test_tutorial/test_cookie_params/test_tutorial001_an.py
+++ /dev/null
@@ -1,108 +0,0 @@
-import pytest
-from dirty_equals import IsDict
-from fastapi.testclient import TestClient
-
-from docs_src.cookie_params.tutorial001_an import app
-
-
-@pytest.mark.parametrize(
-    "path,cookies,expected_status,expected_response",
-    [
-        ("/items", None, 200, {"ads_id": None}),
-        ("/items", {"ads_id": "ads_track"}, 200, {"ads_id": "ads_track"}),
-        (
-            "/items",
-            {"ads_id": "ads_track", "session": "cookiesession"},
-            200,
-            {"ads_id": "ads_track"},
-        ),
-        ("/items", {"session": "cookiesession"}, 200, {"ads_id": None}),
-    ],
-)
-def test(path, cookies, expected_status, expected_response):
-    client = TestClient(app, cookies=cookies)
-    response = client.get(path)
-    assert response.status_code == expected_status
-    assert response.json() == expected_response
-
-
-def test_openapi_schema():
-    client = TestClient(app)
-    response = client.get("/openapi.json")
-    assert response.status_code == 200
-    assert response.json() == {
-        "openapi": "3.1.0",
-        "info": {"title": "FastAPI", "version": "0.1.0"},
-        "paths": {
-            "/items/": {
-                "get": {
-                    "responses": {
-                        "200": {
-                            "description": "Successful Response",
-                            "content": {"application/json": {"schema": {}}},
-                        },
-                        "422": {
-                            "description": "Validation Error",
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "$ref": "#/components/schemas/HTTPValidationError"
-                                    }
-                                }
-                            },
-                        },
-                    },
-                    "summary": "Read Items",
-                    "operationId": "read_items_items__get",
-                    "parameters": [
-                        {
-                            "required": False,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "title": "Ads Id",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {"title": "Ads Id", "type": "string"}
-                            ),
-                            "name": "ads_id",
-                            "in": "cookie",
-                        }
-                    ],
-                }
-            }
-        },
-        "components": {
-            "schemas": {
-                "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"},
-                    },
-                },
-                "HTTPValidationError": {
-                    "title": "HTTPValidationError",
-                    "type": "object",
-                    "properties": {
-                        "detail": {
-                            "title": "Detail",
-                            "type": "array",
-                            "items": {"$ref": "#/components/schemas/ValidationError"},
-                        }
-                    },
-                },
-            }
-        },
-    }

diff --git a/tests/test_tutorial/test_cookie_params/test_tutorial001_an_py310.py b/tests/test_tutorial/test_cookie_params/test_tutorial001_an_py310.py
deleted file mode 100644 (file)
index 108f78b..0000000
--- a/tests/test_tutorial/test_cookie_params/test_tutorial001_an_py310.py
+++ /dev/null
@@ -1,114 +0,0 @@
-import pytest
-from dirty_equals import IsDict
-from fastapi.testclient import TestClient
-
-from ...utils import needs_py310
-
-
-@needs_py310
-@pytest.mark.parametrize(
-    "path,cookies,expected_status,expected_response",
-    [
-        ("/items", None, 200, {"ads_id": None}),
-        ("/items", {"ads_id": "ads_track"}, 200, {"ads_id": "ads_track"}),
-        (
-            "/items",
-            {"ads_id": "ads_track", "session": "cookiesession"},
-            200,
-            {"ads_id": "ads_track"},
-        ),
-        ("/items", {"session": "cookiesession"}, 200, {"ads_id": None}),
-    ],
-)
-def test(path, cookies, expected_status, expected_response):
-    from docs_src.cookie_params.tutorial001_an_py310 import app
-
-    client = TestClient(app, cookies=cookies)
-    response = client.get(path)
-    assert response.status_code == expected_status
-    assert response.json() == expected_response
-
-
-@needs_py310
-def test_openapi_schema():
-    from docs_src.cookie_params.tutorial001_an_py310 import app
-
-    client = TestClient(app)
-    response = client.get("/openapi.json")
-    assert response.status_code == 200
-    assert response.json() == {
-        "openapi": "3.1.0",
-        "info": {"title": "FastAPI", "version": "0.1.0"},
-        "paths": {
-            "/items/": {
-                "get": {
-                    "responses": {
-                        "200": {
-                            "description": "Successful Response",
-                            "content": {"application/json": {"schema": {}}},
-                        },
-                        "422": {
-                            "description": "Validation Error",
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "$ref": "#/components/schemas/HTTPValidationError"
-                                    }
-                                }
-                            },
-                        },
-                    },
-                    "summary": "Read Items",
-                    "operationId": "read_items_items__get",
-                    "parameters": [
-                        {
-                            "required": False,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "title": "Ads Id",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {"title": "Ads Id", "type": "string"}
-                            ),
-                            "name": "ads_id",
-                            "in": "cookie",
-                        }
-                    ],
-                }
-            }
-        },
-        "components": {
-            "schemas": {
-                "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"},
-                    },
-                },
-                "HTTPValidationError": {
-                    "title": "HTTPValidationError",
-                    "type": "object",
-                    "properties": {
-                        "detail": {
-                            "title": "Detail",
-                            "type": "array",
-                            "items": {"$ref": "#/components/schemas/ValidationError"},
-                        }
-                    },
-                },
-            }
-        },
-    }

diff --git a/tests/test_tutorial/test_cookie_params/test_tutorial001_an_py39.py b/tests/test_tutorial/test_cookie_params/test_tutorial001_an_py39.py
deleted file mode 100644 (file)
index 8126a10..0000000
--- a/tests/test_tutorial/test_cookie_params/test_tutorial001_an_py39.py
+++ /dev/null
@@ -1,114 +0,0 @@
-import pytest
-from dirty_equals import IsDict
-from fastapi.testclient import TestClient
-
-from ...utils import needs_py39
-
-
-@needs_py39
-@pytest.mark.parametrize(
-    "path,cookies,expected_status,expected_response",
-    [
-        ("/items", None, 200, {"ads_id": None}),
-        ("/items", {"ads_id": "ads_track"}, 200, {"ads_id": "ads_track"}),
-        (
-            "/items",
-            {"ads_id": "ads_track", "session": "cookiesession"},
-            200,
-            {"ads_id": "ads_track"},
-        ),
-        ("/items", {"session": "cookiesession"}, 200, {"ads_id": None}),
-    ],
-)
-def test(path, cookies, expected_status, expected_response):
-    from docs_src.cookie_params.tutorial001_an_py39 import app
-
-    client = TestClient(app, cookies=cookies)
-    response = client.get(path)
-    assert response.status_code == expected_status
-    assert response.json() == expected_response
-
-
-@needs_py39
-def test_openapi_schema():
-    from docs_src.cookie_params.tutorial001_an_py39 import app
-
-    client = TestClient(app)
-    response = client.get("/openapi.json")
-    assert response.status_code == 200
-    assert response.json() == {
-        "openapi": "3.1.0",
-        "info": {"title": "FastAPI", "version": "0.1.0"},
-        "paths": {
-            "/items/": {
-                "get": {
-                    "responses": {
-                        "200": {
-                            "description": "Successful Response",
-                            "content": {"application/json": {"schema": {}}},
-                        },
-                        "422": {
-                            "description": "Validation Error",
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "$ref": "#/components/schemas/HTTPValidationError"
-                                    }
-                                }
-                            },
-                        },
-                    },
-                    "summary": "Read Items",
-                    "operationId": "read_items_items__get",
-                    "parameters": [
-                        {
-                            "required": False,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "title": "Ads Id",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {"title": "Ads Id", "type": "string"}
-                            ),
-                            "name": "ads_id",
-                            "in": "cookie",
-                        }
-                    ],
-                }
-            }
-        },
-        "components": {
-            "schemas": {
-                "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"},
-                    },
-                },
-                "HTTPValidationError": {
-                    "title": "HTTPValidationError",
-                    "type": "object",
-                    "properties": {
-                        "detail": {
-                            "title": "Detail",
-                            "type": "array",
-                            "items": {"$ref": "#/components/schemas/ValidationError"},
-                        }
-                    },
-                },
-            }
-        },
-    }

diff --git a/tests/test_tutorial/test_cookie_params/test_tutorial001_py310.py b/tests/test_tutorial/test_cookie_params/test_tutorial001_py310.py
deleted file mode 100644 (file)
index 6711fa5..0000000
--- a/tests/test_tutorial/test_cookie_params/test_tutorial001_py310.py
+++ /dev/null
@@ -1,114 +0,0 @@
-import pytest
-from dirty_equals import IsDict
-from fastapi.testclient import TestClient
-
-from ...utils import needs_py310
-
-
-@needs_py310
-@pytest.mark.parametrize(
-    "path,cookies,expected_status,expected_response",
-    [
-        ("/items", None, 200, {"ads_id": None}),
-        ("/items", {"ads_id": "ads_track"}, 200, {"ads_id": "ads_track"}),
-        (
-            "/items",
-            {"ads_id": "ads_track", "session": "cookiesession"},
-            200,
-            {"ads_id": "ads_track"},
-        ),
-        ("/items", {"session": "cookiesession"}, 200, {"ads_id": None}),
-    ],
-)
-def test(path, cookies, expected_status, expected_response):
-    from docs_src.cookie_params.tutorial001_py310 import app
-
-    client = TestClient(app, cookies=cookies)
-    response = client.get(path)
-    assert response.status_code == expected_status
-    assert response.json() == expected_response
-
-
-@needs_py310
-def test_openapi_schema():
-    from docs_src.cookie_params.tutorial001_py310 import app
-
-    client = TestClient(app)
-    response = client.get("/openapi.json")
-    assert response.status_code == 200
-    assert response.json() == {
-        "openapi": "3.1.0",
-        "info": {"title": "FastAPI", "version": "0.1.0"},
-        "paths": {
-            "/items/": {
-                "get": {
-                    "responses": {
-                        "200": {
-                            "description": "Successful Response",
-                            "content": {"application/json": {"schema": {}}},
-                        },
-                        "422": {
-                            "description": "Validation Error",
-                            "content": {
-                                "application/json": {
-                                    "schema": {
-                                        "$ref": "#/components/schemas/HTTPValidationError"
-                                    }
-                                }
-                            },
-                        },
-                    },
-                    "summary": "Read Items",
-                    "operationId": "read_items_items__get",
-                    "parameters": [
-                        {
-                            "required": False,
-                            "schema": IsDict(
-                                {
-                                    "anyOf": [{"type": "string"}, {"type": "null"}],
-                                    "title": "Ads Id",
-                                }
-                            )
-                            | IsDict(
-                                # TODO: remove when deprecating Pydantic v1
-                                {"title": "Ads Id", "type": "string"}
-                            ),
-                            "name": "ads_id",
-                            "in": "cookie",
-                        }
-                    ],
-                }
-            }
-        },
-        "components": {
-            "schemas": {
-                "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"},
-                    },
-                },
-                "HTTPValidationError": {
-                    "title": "HTTPValidationError",
-                    "type": "object",
-                    "properties": {
-                        "detail": {
-                            "title": "Detail",
-                            "type": "array",
-                            "items": {"$ref": "#/components/schemas/ValidationError"},
-                        }
-                    },
-                },
-            }
-        },
-    }