fix tests

Author: ProFastCode

app/logic/users.py

@@ -8,7 +8,7 @@
 
 
 class Users:
-    def __init__(self, logic: 'Logic'):
+    def __init__(self, logic: "Logic"):
         self.logic = logic
 
     async def create(self, data: UserCreate) -> User | None:
@@ -21,10 +21,10 @@ async def create(self, data: UserCreate) -> User | None:
 
     async def retrieve_by_token(self, token: str) -> User | None:
         payload = self.logic.security.jwt.decode_token(token)
-        if not (
-            user := await self.logic.db.user.retrieve_one(
-                ident=payload.get('id')
-            )
-        ):
+        if not (user := await self.logic.db.user.retrieve_one(ident=payload.get("id"))):
             raise exps.UserNotFoundException()
         return user
+
+    async def delete_by_token(self, token: str) -> None:
+        if user := await self.retrieve_by_token(token):
+            await self.logic.db.user.delete(user)

tests/conftest.py

@@ -1,6 +1,6 @@
 from typing import AsyncGenerator
 
-import pytest_asyncio
+import pytest
 
 from sqlmodel import SQLModel
 from sqlalchemy.ext.asyncio import create_async_engine
@@ -14,7 +14,7 @@
 engine = create_async_engine("sqlite+aiosqlite:///:memory:", echo=False, future=True)
 
 
-@pytest_asyncio.fixture(scope="function")
+@pytest.fixture(scope="session", autouse=True)
 async def db() -> AsyncGenerator[Database, None]:
     async with engine.begin() as conn:
         await conn.run_sync(SQLModel.metadata.create_all)
@@ -23,23 +23,26 @@ async def db() -> AsyncGenerator[Database, None]:
         yield db
 
 
-@pytest_asyncio.fixture(scope="function")
+@pytest.fixture(scope="session", autouse=True)
 async def logic(db: Database) -> Logic:
     return Logic(db)
 
 
-@pytest_asyncio.fixture(scope="function")
-async def user_create_model() -> UserCreate:
+@pytest.fixture(scope="function")
+async def user_create() -> UserCreate:
     return UserCreate(email="email@email.email", password="password")
 
 
-@pytest_asyncio.fixture(scope="function")
+@pytest.fixture(scope="function")
 async def token(logic: Logic) -> str:
     return logic.security.jwt.encode_token({}, 1)
 
 
-@pytest_asyncio.fixture(scope="function")
-async def access_token(
-    logic: Logic, user_create_model: UserCreate
-) -> AccessToken | None:
-    return await logic.auth.generate_token(user_create_model)
+@pytest.fixture(scope="function")
+async def access_token(logic: Logic, user_create: UserCreate) -> AccessToken | None:
+    return await logic.auth.generate_token(user_create)
+
+
+@pytest.fixture(scope="function")
+async def hashpwd(logic: Logic, user_create: UserCreate) -> str | None:
+    return logic.security.pwd.hashpwd(user_create.password)

tests/logic/security/test_jwt.py

@@ -1,20 +1,10 @@
-import pytest
-import pytest_asyncio
-
 from app.logic.logic import Logic
 
 
-@pytest_asyncio.fixture(scope="function")
-async def token(logic: Logic) -> str:
-    return logic.security.jwt.encode_token({}, 1)
-
-
-@pytest.mark.asyncio
 async def test_encode(token: str):
     assert token is not None
 
 
-@pytest.mark.asyncio
 async def test_decode(logic: Logic, token: str):
     data = logic.security.jwt.decode_token(token)
     assert data is not None

tests/logic/security/test_pwd.py

@@ -1,21 +1,11 @@
-import pytest
-import pytest_asyncio
-
 from app.logic.logic import Logic
 from app.models.users import UserCreate
 
 
-@pytest_asyncio.fixture(scope="function")
-async def hashpwd(logic: Logic, user_create_model: UserCreate):
-    return logic.security.pwd.hashpwd(user_create_model.password)
-
-
-@pytest.mark.asyncio
 async def test_hashpwd(hashpwd: str):
     assert hashpwd is not None
 
 
-@pytest.mark.asyncio
-async def test_checkpwd(logic: Logic, hashpwd: str, user_create_model: UserCreate):
-    data = logic.security.pwd.checkpwd(user_create_model.password, hashpwd)
+async def test_checkpwd(logic: Logic, hashpwd: str, user_create: UserCreate):
+    data = logic.security.pwd.checkpwd(user_create.password, hashpwd)
     assert data is not None

tests/logic/users/test_users.py

@@ -1,28 +1,17 @@
-import pytest
-import pytest_asyncio
-
 from app.logic.logic import Logic
 from app.models.auth import AccessToken
 from app.models.users import UserCreate
 
 
-@pytest_asyncio.fixture(scope="function")
-async def user_create() -> UserCreate:
-    return UserCreate(email="email@email.email", password="password")
-
-
-@pytest_asyncio.fixture(scope="function")
-async def access_token(logic: Logic, user_create: UserCreate) -> AccessToken | None:
-    return await logic.auth.generate_token(user_create)
-
-
-@pytest.mark.asyncio
 async def test_create(logic: Logic, user_create: UserCreate):
     user = await logic.users.create(user_create)
     assert user is not None
 
 
-@pytest.mark.asyncio
 async def test_retrieve(logic: Logic, access_token: AccessToken):
     user = await logic.users.retrieve_by_token(access_token.token)
     assert user is not None
+
+
+async def test_delete(logic: Logic, access_token: AccessToken):
+    await logic.users.delete_by_token(access_token.token)

tests/pytest.ini

@@ -0,0 +1,3 @@
+# pytest.ini
+[pytest]
+asyncio_mode=auto