Move test utilities to users app

backend/api/tests/api/utils.py

@@ -1,7 +1,6 @@
 from typing import List
 
 from django.conf import settings
-from django.contrib.auth import get_user_model
 from model_mommy import mommy
 from rest_framework import status
 from rest_framework.test import APITestCase
@@ -11,6 +10,7 @@ from projects.models import (DOCUMENT_CLASSIFICATION, IMAGE_CLASSIFICATION,
                              SEQUENCE_LABELING, SPEECH2TEXT, Member)
 from roles.models import Role
 from roles.tests.utils import create_default_roles
+from users.tests.utils import make_user
 
 
 class ProjectData:
@@ -47,12 +47,6 @@ def assign_user_to_role(project_member, project, role_name):
     return mapping
 
 
-def make_user(username: str = 'bob'):
-    user_model = get_user_model()
-    user, _ = user_model.objects.get_or_create(username=username, password='pass')
-    return user
-
-
 def make_project(
         task: str,
         users: List[str],

backend/examples/tests/test_comment.py

@@ -1,7 +1,8 @@
 from rest_framework import status
 from rest_framework.reverse import reverse
 
-from api.tests.api.utils import (CRUDMixin, make_user, prepare_project)
+from api.tests.api.utils import (CRUDMixin, prepare_project)
+from users.tests.utils import make_user
 from .utils import make_comment, make_doc
 
 

backend/examples/tests/test_document.py

@@ -4,7 +4,8 @@ from rest_framework import status
 from rest_framework.reverse import reverse
 
 from projects.models import DOCUMENT_CLASSIFICATION
-from api.tests.api.utils import (CRUDMixin, assign_user_to_role, make_user, prepare_project)
+from api.tests.api.utils import (CRUDMixin, assign_user_to_role, prepare_project)
+from users.tests.utils import make_user
 from .utils import make_doc, make_example_state
 
 

backend/examples/tests/test_example_state.py

@@ -1,7 +1,8 @@
 from rest_framework import status
 from rest_framework.reverse import reverse
 
-from api.tests.api.utils import (CRUDMixin, make_user, prepare_project)
+from api.tests.api.utils import (CRUDMixin, prepare_project)
+from users.tests.utils import make_user
 from .utils import make_doc, make_example_state
 
 

backend/label_types/tests/test_views.py

@@ -6,7 +6,8 @@ from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase
 
 from projects.models import DOCUMENT_CLASSIFICATION
-from api.tests.api.utils import (CRUDMixin, make_project, make_user, prepare_project)
+from api.tests.api.utils import (CRUDMixin, make_project, prepare_project)
+from users.tests.utils import make_user
 from .utils import make_label
 
 DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')

backend/labels/tests/test_views.py

@@ -3,9 +3,10 @@ from rest_framework.reverse import reverse
 
 from projects.models import DOCUMENT_CLASSIFICATION, SEQUENCE_LABELING, SEQ2SEQ
 from labels.models import Category, Span, TextLabel
-from api.tests.api.utils import (CRUDMixin, make_user, prepare_project)
+from api.tests.api.utils import (CRUDMixin, prepare_project)
 from examples.tests.utils import make_doc
 from label_types.tests.utils import make_label
+from users.tests.utils import make_user
 from .utils import make_annotation
 
 

backend/projects/tests/test_member.py

@@ -7,7 +7,8 @@ from model_mommy import mommy
 
 from roles.models import Role
 from projects.models import Member
-from api.tests.api.utils import (CRUDMixin, prepare_project, make_user)
+from api.tests.api.utils import (CRUDMixin, prepare_project)
+from users.tests.utils import make_user
 
 
 class TestMemberListAPI(CRUDMixin):

backend/projects/tests/test_project.py

@@ -1,8 +1,9 @@
 from rest_framework import status
 from rest_framework.reverse import reverse
 
-from api.tests.api.utils import CRUDMixin, make_user, prepare_project
+from api.tests.api.utils import CRUDMixin, prepare_project
 from roles.tests.utils import create_default_roles
+from users.tests.utils import make_user
 
 
 class TestProjectList(CRUDMixin):

backend/projects/tests/test_tag.py

@@ -1,7 +1,8 @@
 from rest_framework import status
 from rest_framework.reverse import reverse
 
-from api.tests.api.utils import CRUDMixin, make_tag, make_user, prepare_project
+from api.tests.api.utils import CRUDMixin, make_tag, prepare_project
+from users.tests.utils import make_user
 
 
 class TestTagList(CRUDMixin):

backend/roles/tests/test_views.py

@@ -1,7 +1,8 @@
 from rest_framework import status
 from rest_framework.reverse import reverse
 
-from api.tests.api.utils import (CRUDMixin, make_user)
+from api.tests.api.utils import (CRUDMixin)
+from users.tests.utils import make_user
 from .utils import create_default_roles
 
 

backend/users/tests.py → backend/users/tests/test_views.py

@@ -2,7 +2,7 @@ from rest_framework import status
 from rest_framework.reverse import reverse
 from rest_framework.test import APITestCase
 
-from api.tests.api.utils import make_user
+from .utils import make_user
 
 
 class TestUserAPI(APITestCase):

backend/users/tests/utils.py

@@ -0,0 +1,7 @@
+from django.contrib.auth import get_user_model
+
+
+def make_user(username: str = 'bob'):
+    user_model = get_user_model()
+    user, _ = user_model.objects.get_or_create(username=username, password='pass')
+    return user