Skip to content

Commit 0cfcf73

Browse files
committed
Replace UserFactory for user fixture
1 parent b5a6bba commit 0cfcf73

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

mosquito_alert/authorization/tests/test_admin.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from django.urls import reverse
22

33
from mosquito_alert.geo.tests.factories import BoundaryFactory
4-
from mosquito_alert.users.tests.factories import UserFactory
54

65
from ..models import BoundaryAuthorization, BoundaryMembership
76
from .factories import BoundaryAuthorizationFactory
@@ -13,13 +12,12 @@ def test_changelist(self, admin_client):
1312
response = admin_client.get(url)
1413
assert response.status_code == 200
1514

16-
def test_add(self, admin_client, freezer):
15+
def test_add(self, admin_client, freezer, user):
1716
url = reverse("admin:authorization_boundaryauthorization_add")
1817
response = admin_client.get(url)
1918
assert response.status_code == 200
2019

2120
boundary = BoundaryFactory()
22-
user = UserFactory()
2321

2422
response = admin_client.post(
2523
url,

mosquito_alert/identifications/tests/test_models.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from mosquito_alert.individuals.tests.factories import IndividualFactory
2323
from mosquito_alert.taxa.models import Taxon
2424
from mosquito_alert.taxa.tests.factories import TaxonFactory
25-
from mosquito_alert.users.tests.factories import UserFactory
2625
from mosquito_alert.utils.tests.test_models import BaseTestObservableMixin, BaseTestTimeStampedModel
2726

2827
from ..models import (
@@ -1115,9 +1114,8 @@ def test_on_delete_counters_are_updated(self, was_skipped):
11151114
assert photo_task.total_external == 0
11161115

11171116
# Meta
1118-
def test_constraint_unique_user_by_task(self):
1117+
def test_constraint_unique_user_by_task(self, user):
11191118
task = PhotoIdentificationTaskFactory()
1120-
user = UserFactory()
11211119
with pytest.raises(IntegrityError, match=r"unique constraint"):
11221120
self.factory_cls.create_batch(size=2, user=user, task=task)
11231121

mosquito_alert/moderation/tests/test_models.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from django.db.utils import IntegrityError
88
from django.utils import timezone
99

10-
from mosquito_alert.users.tests.factories import UserFactory
1110
from mosquito_alert.utils.tests.test_models import AbstractDjangoModelTestMixin, BaseTestTimeStampedModel
1211

1312
from ..models import Flag, FlagInstance, FlagModeratedModel
@@ -245,14 +244,13 @@ def test_flag_counter_decrease_after_delete(self):
245244
assert obj.flag.count == 10
246245

247246
# meta
248-
def test_constraint_unique_flag_by_user_only_if_user_is_not_null(self):
247+
def test_constraint_unique_flag_by_user_only_if_user_is_not_null(self, user):
249248
flag = FlagFactory()
250249

251250
# Case user is null -> NOT RAISE
252251
_ = self.factory_cls.create_batch(size=2, flag=flag, user=None)
253252

254253
# Case user is not null -> RAISE
255-
user = UserFactory()
256254
with pytest.raises(IntegrityError, match=r"unique constraint"):
257255
self.factory_cls.create_batch(size=2, flag=flag, user=user)
258256

0 commit comments

Comments
 (0)