diff --git a/apps/accounts/tests/test_api.py b/apps/accounts/tests/test_api.py index 6b49335..f66a3a6 100644 --- a/apps/accounts/tests/test_api.py +++ b/apps/accounts/tests/test_api.py @@ -1,16 +1,13 @@ -from django.contrib.auth import get_user_model from django.test import TestCase from rest_framework import status from rest_framework.test import APIClient -from apps.accounts.models import Invite, Organization, Role - -User = get_user_model() +from apps.accounts.models import Invite, Organization, Role, User class AccountsApiTests(TestCase): def setUp(self): self.client: APIClient = APIClient() - self.manager = User.objects.create_user( + self.manager: User = User.objects.create_user( email_address='manager@example.com', password='pass1234', first_name='Manager', @@ -18,14 +15,14 @@ class AccountsApiTests(TestCase): date_of_birth='1990-01-01', is_manager=True, ) - self.member = User.objects.create_user( + self.member: User = User.objects.create_user( email_address='member@example.com', password='pass1234', first_name='Member', last_name='User', date_of_birth='1992-02-02', ) - self.other = User.objects.create_user( + self.other: User = User.objects.create_user( email_address='other@example.com', password='pass1234', first_name='Other', @@ -145,20 +142,20 @@ class AccountsApiTests(TestCase): def test_organization_create_invite_path(self): self.client.force_authenticate(self.manager) - response = self.client.post(f'/api/organization/{self.organization.uuid}/create-invite/', {'max_uses': 2}, format='json') + response = self.client.post(f'/api/organization/{self.organization.uuid}/create-invite/?max_uses=2', {}, format='json') self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertIn('token', response.json()) + self.assertIn('uuid', response.json()) def test_organization_revoke_invite_path(self): self.client.force_authenticate(self.manager) invite = Invite.objects.create(organization=self.organization, created_by=self.manager) - response = self.client.delete(f'/api/organization/{self.organization.uuid}/revoke-invite/{invite.token}/') + response = self.client.delete(f'/api/organization/{self.organization.uuid}/revoke-invite/{invite.uuid}/') self.assertEqual(response.status_code, status.HTTP_200_OK) def test_organization_join_path(self): self.client.force_authenticate(self.other) invite = Invite.objects.create(organization=self.organization, created_by=self.manager) - response = self.client.post(f'/api/organization/join/{invite.token}/') + response = self.client.post(f'/api/organization/join/{invite.uuid}/') self.assertEqual(response.status_code, status.HTTP_200_OK) def test_organization_leave_path(self): @@ -173,7 +170,7 @@ class AccountsApiTests(TestCase): def test_organization_remove_member_path(self): self.client.force_authenticate(self.manager) - response = self.client.post(f'/api/organization/{self.organization.uuid}/member/{self.member.id}/remove/') + response = self.client.post(f'/api/organization/{self.organization.uuid}/member/{self.member.uuid}/remove/') self.assertEqual(response.status_code, status.HTTP_200_OK) def test_organization_roles_get_path(self): diff --git a/apps/accounts/tests/test_models.py b/apps/accounts/tests/test_models.py index e8f3940..f28dc1f 100644 --- a/apps/accounts/tests/test_models.py +++ b/apps/accounts/tests/test_models.py @@ -66,7 +66,7 @@ class AccountsModelTests(TestCase): org = Organization.objects.create(name='Org B', owner=self.owner) invite = Invite.objects.create(organization=org, created_by=self.owner) - self.assertIsNotNone(invite.token) + self.assertIsNotNone(invite.uuid) self.assertEqual(invite.organization, org) self.assertEqual(invite.created_by, self.owner) self.assertEqual(invite.uses, 0) diff --git a/config/views.py b/config/views.py index 726165e..bb27305 100644 --- a/config/views.py +++ b/config/views.py @@ -7,7 +7,6 @@ from django.views.decorators.csrf import ensure_csrf_cookie @ensure_csrf_cookie def serve_frontend(request, path, document_root = None): - print(f"Serving path: {path} from {document_root}") path = posixpath.normpath(path).lstrip("/") fullpath = Path(safe_join(document_root, path)) if fullpath.is_file():