fix fixtures async

Author: mahenzon

tests/conftest.py

@@ -4,7 +4,7 @@
 import pytest
 from fastapi import FastAPI
 from httpx import AsyncClient
-from pytest_asyncio import fixture as async_fixture, is_async_test
+from pytest_asyncio import is_async_test
 
 from tests.fixtures.app import (  # noqa
     app,
@@ -75,7 +75,7 @@ def pytest_collection_modifyitems(items):
         async_test.add_marker(session_scope_marker, append=False)
 
 
-@async_fixture()
+@pytest.fixture()
 async def client(app: FastAPI) -> AsyncClient:  # noqa: F811
     async with AsyncClient(app=app, base_url="http://test") as ac:
         yield ac

tests/fixtures/entities.py

@@ -3,7 +3,6 @@
 from typing import TYPE_CHECKING, Callable
 
 import pytest
-from pytest_asyncio import fixture as async_fixture
 
 from tests.misc.utils import fake
 from tests.models import (
@@ -41,7 +40,7 @@ async def create_user(async_session: AsyncSession, **fields):
     return user
 
 
-@async_fixture()
+@pytest.fixture()
 async def user_1(async_session: AsyncSession):
     user = build_user()
     async_session.add(user)
@@ -52,7 +51,7 @@ async def user_1(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def user_2(async_session: AsyncSession):
     user = build_user()
     async_session.add(user)
@@ -63,7 +62,7 @@ async def user_2(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def user_3(async_session: AsyncSession):
     user = build_user()
     async_session.add(user)
@@ -81,7 +80,7 @@ async def build_user_bio(async_session: AsyncSession, user: User, **fields):
     return bio
 
 
-@async_fixture()
+@pytest.fixture()
 async def user_1_bio(async_session: AsyncSession, user_1: User) -> UserBio:
     return await build_user_bio(
         async_session,
@@ -92,7 +91,7 @@ async def user_1_bio(async_session: AsyncSession, user_1: User) -> UserBio:
     )
 
 
-@async_fixture()
+@pytest.fixture()
 async def user_2_bio(async_session: AsyncSession, user_2: User) -> UserBio:
     return await build_user_bio(
         async_session,
@@ -111,7 +110,7 @@ async def build_post(async_session: AsyncSession, user: User, **fields) -> Post:
     return post
 
 
-@async_fixture()
+@pytest.fixture()
 async def user_1_posts(async_session: AsyncSession, user_1: User) -> list[Post]:
     posts = [
         Post(
@@ -130,7 +129,7 @@ async def user_1_posts(async_session: AsyncSession, user_1: User) -> list[Post]:
     return posts
 
 
-@async_fixture()
+@pytest.fixture()
 async def user_1_post(async_session: AsyncSession, user_1: User):
     post = Post(title="post_for_u1", user=user_1)
     async_session.add(post)
@@ -144,7 +143,7 @@ async def user_1_post(async_session: AsyncSession, user_1: User):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def user_2_posts(async_session: AsyncSession, user_2: User) -> list[Post]:
     posts = [
         Post(
@@ -163,7 +162,7 @@ async def user_2_posts(async_session: AsyncSession, user_2: User) -> list[Post]:
     return posts
 
 
-@async_fixture()
+@pytest.fixture()
 async def user_1_comments_for_u2_posts(async_session: AsyncSession, user_1, user_2_posts):
     post_comments = [
         PostComment(
@@ -191,7 +190,7 @@ def user_1_post_for_comments(user_1_posts: list[Post]) -> Post:
     return user_1_posts[0]
 
 
-@async_fixture()
+@pytest.fixture()
 async def computer_1(async_session: AsyncSession):
     computer = Computer(name="Halo")
 
@@ -205,7 +204,7 @@ async def computer_1(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def computer_2(async_session: AsyncSession):
     computer = Computer(name="Nestor")
 
@@ -219,7 +218,7 @@ async def computer_2(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def computer_factory(async_session: AsyncSession) -> Callable[[str | None], Awaitable[Computer]]:
     async def factory(name: str | None = None) -> Computer:
         computer = Computer(name=name or fake.word())
@@ -248,7 +247,7 @@ async def build_post_comment(
     return post_comment
 
 
-@async_fixture()
+@pytest.fixture()
 async def user_2_comment_for_one_u1_post(async_session: AsyncSession, user_2, user_1_post_for_comments):
     post = user_1_post_for_comments
     post_comment = PostComment(
@@ -267,7 +266,7 @@ async def user_2_comment_for_one_u1_post(async_session: AsyncSession, user_2, us
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def parent_1(async_session: AsyncSession):
     parent = Parent(
         name="parent_1",
@@ -283,7 +282,7 @@ async def parent_1(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def parent_2(async_session: AsyncSession):
     parent = Parent(
         name="parent_2",
@@ -299,7 +298,7 @@ async def parent_2(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def parent_3(async_session: AsyncSession):
     parent = Parent(
         name="parent_3",
@@ -315,7 +314,7 @@ async def parent_3(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def child_1(async_session: AsyncSession):
     child = Child(
         name="child_1",
@@ -331,7 +330,7 @@ async def child_1(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def child_2(async_session: AsyncSession):
     child = Child(
         name="child_2",
@@ -347,7 +346,7 @@ async def child_2(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def child_3(async_session: AsyncSession):
     child = Child(
         name="child_3",
@@ -363,7 +362,7 @@ async def child_3(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def child_4(async_session: AsyncSession):
     child = Child(
         name="child_4",
@@ -379,7 +378,7 @@ async def child_4(async_session: AsyncSession):
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def p1_c1_association(
     async_session: AsyncSession,
     parent_1: Parent,
@@ -401,7 +400,7 @@ async def p1_c1_association(
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def p2_c1_association(
     async_session: AsyncSession,
     parent_2: Parent,
@@ -423,7 +422,7 @@ async def p2_c1_association(
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def p1_c2_association(
     async_session: AsyncSession,
     parent_1: Parent,
@@ -445,7 +444,7 @@ async def p1_c2_association(
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def p2_c2_association(
     async_session: AsyncSession,
     parent_2: Parent,
@@ -467,7 +466,7 @@ async def p2_c2_association(
     await async_session.commit()
 
 
-@async_fixture()
+@pytest.fixture()
 async def p2_c3_association(
     async_session: AsyncSession,
     parent_2: Parent,
@@ -498,14 +497,14 @@ async def build_workplace(async_session: AsyncSession, **fields):
     return workplace
 
 
-@async_fixture()
+@pytest.fixture()
 async def workplace_1(
     async_session: AsyncSession,
 ):
     yield await build_workplace(async_session, name="workplace_1")
 
 
-@async_fixture()
+@pytest.fixture()
 async def workplace_2(
     async_session: AsyncSession,
 ):

tests/test_api/test_custom_body_dependency.py

@@ -3,7 +3,6 @@
 import pytest
 from fastapi import Body, Depends, FastAPI, HTTPException, status
 from httpx import AsyncClient
-from pytest_asyncio import fixture
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from fastapi_jsonapi.misc.sqla.generics.base import DetailViewBaseGeneric, ListViewBaseGeneric
@@ -42,7 +41,7 @@ def app_w_deps(resource_type):
     )
 
 
-@fixture(scope="class")
+@pytest.fixture()
 async def client(app_w_deps: FastAPI):
     async with AsyncClient(app=app_w_deps, base_url="http://test") as client:
         yield client

tests/test_api/test_validators.py

@@ -22,7 +22,6 @@
     BaseModel as PydanticBaseModel,
 )
 from pydantic_core.core_schema import ValidationInfo
-from pytest_asyncio import fixture
 
 from fastapi_jsonapi import RoutersJSONAPI
 from fastapi_jsonapi.schema import BaseModel
@@ -42,7 +41,7 @@
     from sqlalchemy.ext.asyncio import AsyncSession
 
 
-@fixture()
+@pytest.fixture()
 def refresh_caches() -> None:
     object_schemas_cache = deepcopy(SchemaBuilder.object_schemas_cache)
     relationship_schema_cache = deepcopy(SchemaBuilder.relationship_schema_cache)
@@ -59,7 +58,7 @@ def refresh_caches() -> None:
     RoutersJSONAPI.all_jsonapi_routers = all_jsonapi_routers
 
 
-@fixture()
+@pytest.fixture()
 async def task_with_none_ids(
     async_session: AsyncSession,
 ) -> Task:

tests/test_atomic/test_current_atomic_operation.py

@@ -6,7 +6,6 @@
 from fastapi import Body, Depends, FastAPI, HTTPException, status
 from httpx import AsyncClient
 from pydantic import BaseModel
-from pytest_asyncio import fixture
 
 from fastapi_jsonapi.atomic import current_atomic_operation
 from fastapi_jsonapi.misc.sqla.generics.base import DetailViewBaseGeneric, ListViewBaseGeneric
@@ -172,7 +171,7 @@ def app_w_deps(self, resource_type):
             path=f"/path_{resource_type}",
         )
 
-    @fixture(scope="class")
+    @pytest.fixture()
     async def client(self, app_w_deps: FastAPI):
         async with AsyncClient(app=app_w_deps, base_url="http://test") as client:
             yield client

tests/test_atomic/test_dependencies.py

@@ -1,9 +1,8 @@
 from typing import ClassVar
 
 import pytest
-from fastapi import Depends, Query, status
+from fastapi import Depends, Query, status, FastAPI
 from httpx import AsyncClient
-from pytest_asyncio import fixture
 
 from fastapi_jsonapi.misc.sqla.generics.base import DetailViewBaseGeneric, ListViewBaseGeneric
 from fastapi_jsonapi.views.utils import (
@@ -100,8 +99,8 @@ def app_w_deps(self, resource_type):
             class_detail=UserCustomDetailView,
         )
 
-    @fixture(scope="class")
-    async def client(self, app_w_deps):
+    @pytest.fixture()
+    async def client(self, app_w_deps: FastAPI):
         async with AsyncClient(app=app_w_deps, base_url="http://test") as client:
             yield client