Skip to content

Commit 8592e59

Browse files
Refactor redundant random item creation
1 parent aef8a96 commit 8592e59

2 files changed

Lines changed: 9 additions & 16 deletions

File tree

backend/tests/api/routes/test_users.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from app.core.config import settings
99
from app.core.security import verify_password
1010
from app.models import Item, User, UserCreate
11-
from tests.utils.item import create_random_item_for_user
11+
from tests.utils.item import create_random_item
1212
from tests.utils.user import create_random_user
1313
from tests.utils.utils import random_email, random_lower_string
1414

@@ -529,8 +529,8 @@ def test_delete_user_me_deletes_items(client: TestClient, db: Session) -> None:
529529
user = crud.create_user(session=db, user_create=user_in)
530530
user_id = user.id
531531

532-
create_random_item_for_user(db, user_id)
533-
create_random_item_for_user(db, user_id)
532+
create_random_item(db, user_id)
533+
create_random_item(db, user_id)
534534

535535
items_query = select(Item).where(Item.owner_id == user_id)
536536
items_result = db.exec(items_query).all()
@@ -565,8 +565,8 @@ def test_delete_user_super_user_deletes_items(
565565
user = crud.create_user(session=db, user_create=user_in)
566566
user_id = user.id
567567

568-
create_random_item_for_user(db, user_id)
569-
create_random_item_for_user(db, user_id)
568+
create_random_item(db, user_id)
569+
create_random_item(db, user_id)
570570

571571
items_query = select(Item).where(Item.owner_id == user_id)
572572
items_result = db.exec(items_query).all()

backend/tests/utils/item.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,10 @@
88
from tests.utils.utils import random_lower_string
99

1010

11-
def create_random_item(db: Session) -> Item:
12-
user = create_random_user(db)
13-
owner_id = user.id
14-
assert owner_id is not None
15-
title = random_lower_string()
16-
description = random_lower_string()
17-
item_in = ItemCreate(title=title, description=description)
18-
return crud.create_item(session=db, item_in=item_in, owner_id=owner_id)
19-
20-
21-
def create_random_item_for_user(db: Session, owner_id: uuid.UUID) -> Item:
11+
def create_random_item(db: Session, owner_id: uuid.UUID | None = None) -> Item:
12+
if owner_id is None:
13+
user = create_random_user(db)
14+
owner_id = user.id
2215
assert owner_id is not None
2316
title = random_lower_string()
2417
description = random_lower_string()

0 commit comments

Comments
 (0)