From a31064950712692021369b1750f53a3e20f8b3c5 Mon Sep 17 00:00:00 2001 From: phil Date: Fri, 10 Jan 2025 19:18:57 +0100 Subject: [PATCH] Add basic test --- pyproject.toml | 7 ++++-- src/oidc_test/models.py | 5 ++-- src/oidc_test/settings.py | 4 ++-- tests/basic.py | 11 +++++++++ uv.lock | 50 +++++++++++++++++++++++++++++++++++++-- 5 files changed, 68 insertions(+), 9 deletions(-) create mode 100644 tests/basic.py diff --git a/pyproject.toml b/pyproject.toml index 2ca396d..8fda2c2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "oidc-fastapi-test" -version = "0.1.0" +version = "0.1.2" description = "Add your description here" readme = "README.md" requires-python = ">=3.13" @@ -20,7 +20,10 @@ dependencies = [ oidc-test = "oidc_test.main:main" [dependency-groups] -dev = ["ipdb>=0.13.13"] +dev = [ + "ipdb>=0.13.13", + "pytest>=8.3.4", +] [build-system] requires = ["hatchling"] diff --git a/src/oidc_test/models.py b/src/oidc_test/models.py index 5ce7e7b..8c25a69 100644 --- a/src/oidc_test/models.py +++ b/src/oidc_test/models.py @@ -1,7 +1,7 @@ from functools import cached_property from typing import Self -from pydantic import computed_field, AnyHttpUrl, EmailStr +from pydantic import computed_field, AnyHttpUrl, EmailStr, ConfigDict from authlib.integrations.starlette_client.apps import StarletteOAuth2App from sqlmodel import SQLModel, Field @@ -21,8 +21,7 @@ class UserBase(SQLModel, extra="ignore"): class User(UserBase): - class Config: - arbitrary_types_allowed = True + model_config = ConfigDict(arbitrary_types_allowed=True) sub: str = Field( description="""subject id of the user given by the oidc provider, diff --git a/src/oidc_test/settings.py b/src/oidc_test/settings.py index fee105e..a271caf 100644 --- a/src/oidc_test/settings.py +++ b/src/oidc_test/settings.py @@ -7,6 +7,7 @@ from pathlib import Path from pydantic import BaseModel, computed_field from pydantic_settings import ( BaseSettings, + SettingsConfigDict, PydanticBaseSettingsSource, YamlConfigSettingsSource, ) @@ -42,8 +43,7 @@ class Settings(BaseSettings): oidc: OIDCSettings = OIDCSettings() secret_key: str = "".join(random.choice(string.ascii_letters) for _ in range(16)) - class Config: - env_nested_delimiter = "__" + model_config = SettingsConfigDict(env_nested_delimiter="__") @classmethod def settings_customise_sources( diff --git a/tests/basic.py b/tests/basic.py new file mode 100644 index 0000000..edba4a7 --- /dev/null +++ b/tests/basic.py @@ -0,0 +1,11 @@ +from fastapi.testclient import TestClient + +from oidc_test.main import app + +client = TestClient(app) + + +def test_bootstrap(): + with TestClient(app) as client: + response = client.get("/") + assert response.status_code == 200 diff --git a/uv.lock b/uv.lock index 6c04ded..9b7b11c 100644 --- a/uv.lock +++ b/uv.lock @@ -344,6 +344,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/76/c6/c88e154df9c4e1a2a66ccf0005a88dfb2650c1dffb6f5ce603dfbd452ce3/idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3", size = 70442 }, ] +[[package]] +name = "iniconfig" +version = "2.0.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d7/4b/cbd8e699e64a6f16ca3a8220661b5f83792b3017d0f79807cb8708d33913/iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3", size = 4646 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374", size = 5892 }, +] + [[package]] name = "ipdb" version = "0.13.13" @@ -473,7 +482,7 @@ wheels = [ [[package]] name = "oidc-fastapi-test" -version = "0.1.0" +version = "0.1.2" source = { editable = "." } dependencies = [ { name = "authlib" }, @@ -490,6 +499,7 @@ dependencies = [ [package.dev-dependencies] dev = [ { name = "ipdb" }, + { name = "pytest" }, ] [package.metadata] @@ -506,7 +516,19 @@ requires-dist = [ ] [package.metadata.requires-dev] -dev = [{ name = "ipdb", specifier = ">=0.13.13" }] +dev = [ + { name = "ipdb", specifier = ">=0.13.13" }, + { name = "pytest", specifier = ">=8.3.4" }, +] + +[[package]] +name = "packaging" +version = "24.2" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/d0/63/68dbb6eb2de9cb10ee4c9c14a0148804425e13c4fb20d61cce69f53106da/packaging-24.2.tar.gz", hash = "sha256:c228a6dc5e932d346bc5739379109d49e8853dd8223571c7c5b55260edc0b97f", size = 163950 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/88/ef/eb23f262cca3c0c4eb7ab1933c3b1f03d021f2c48f54763065b6f0e321be/packaging-24.2-py3-none-any.whl", hash = "sha256:09abb1bccd265c01f4a3aa3f7a7db064b36514d2cba19a2f694fe6150451a759", size = 65451 }, +] [[package]] name = "parso" @@ -543,6 +565,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/9e/c3/059298687310d527a58bb01f3b1965787ee3b40dce76752eda8b44e9a2c5/pexpect-4.9.0-py2.py3-none-any.whl", hash = "sha256:7236d1e080e4936be2dc3e326cec0af72acf9212a7e1d060210e70a47e253523", size = 63772 }, ] +[[package]] +name = "pluggy" +version = "1.5.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/96/2d/02d4312c973c6050a18b314a5ad0b3210edb65a906f868e31c111dede4a6/pluggy-1.5.0.tar.gz", hash = "sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1", size = 67955 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/88/5f/e351af9a41f866ac3f1fac4ca0613908d9a41741cfcf2228f4ad853b697d/pluggy-1.5.0-py3-none-any.whl", hash = "sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669", size = 20556 }, +] + [[package]] name = "prompt-toolkit" version = "3.0.48" @@ -652,6 +683,21 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/f7/3f/01c8b82017c199075f8f788d0d906b9ffbbc5a47dc9918a945e13d5a2bda/pygments-2.18.0-py3-none-any.whl", hash = "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a", size = 1205513 }, ] +[[package]] +name = "pytest" +version = "8.3.4" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "iniconfig" }, + { name = "packaging" }, + { name = "pluggy" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/05/35/30e0d83068951d90a01852cb1cef56e5d8a09d20c7f511634cc2f7e0372a/pytest-8.3.4.tar.gz", hash = "sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761", size = 1445919 } +wheels = [ + { url = "https://files.pythonhosted.org/packages/11/92/76a1c94d3afee238333bc0a42b82935dd8f9cf8ce9e336ff87ee14d9e1cf/pytest-8.3.4-py3-none-any.whl", hash = "sha256:50e16d954148559c9a74109af1eaf0c945ba2d8f30f0a3d3335edde19788b6f6", size = 343083 }, +] + [[package]] name = "python-dotenv" version = "1.0.1"