From 3b86ab0e882846f5a2da8bac688c1a1d059b565d Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 5 Aug 2025 14:39:21 +0930 Subject: [PATCH] refactor(access): Remove old test suites no longer required model Tenant ref: #942 closes #899 --- ...t_functional_tenant_category_api_fields.py | 2 +- .../test_functional_tenant_category_model.py | 2 +- .../unit/tenant/test_organizaiton_api_v2.py | 199 ------------------ 3 files changed, 2 insertions(+), 201 deletions(-) delete mode 100644 app/access/tests/unit/tenant/test_organizaiton_api_v2.py diff --git a/app/access/tests/functional/tenant/test_functional_tenant_category_api_fields.py b/app/access/tests/functional/tenant/test_functional_tenant_category_api_fields.py index 0a0e480c..cc682e88 100644 --- a/app/access/tests/functional/tenant/test_functional_tenant_category_api_fields.py +++ b/app/access/tests/functional/tenant/test_functional_tenant_category_api_fields.py @@ -109,7 +109,7 @@ class TenantAPIInheritedCases( -@pytest.mark.module_assistance +@pytest.mark.module_access class TenantAPIPyTest( TenantAPITestCases, ): diff --git a/app/access/tests/functional/tenant/test_functional_tenant_category_model.py b/app/access/tests/functional/tenant/test_functional_tenant_category_model.py index 01ee215e..1d65cbb0 100644 --- a/app/access/tests/functional/tenant/test_functional_tenant_category_model.py +++ b/app/access/tests/functional/tenant/test_functional_tenant_category_model.py @@ -21,7 +21,7 @@ class TenantModelInheritedCases( -@pytest.mark.module_assistance +@pytest.mark.module_access class TenantModelPyTest( TenantModelTestCases, ): diff --git a/app/access/tests/unit/tenant/test_organizaiton_api_v2.py b/app/access/tests/unit/tenant/test_organizaiton_api_v2.py deleted file mode 100644 index 6b177e1f..00000000 --- a/app/access/tests/unit/tenant/test_organizaiton_api_v2.py +++ /dev/null @@ -1,199 +0,0 @@ -import django -import pytest -import unittest - -from django.contrib.auth import get_user_model -from django.contrib.auth.models import AnonymousUser, Permission -from django.contrib.contenttypes.models import ContentType -from django.shortcuts import reverse -from django.test import Client, TestCase - -from rest_framework.relations import Hyperlink - -from access.models.tenant import Tenant as Organization -from access.models.team import Team -from access.models.team_user import TeamUsers - - -from api.tests.abstract.api_fields import APICommonFields - -User = django.contrib.auth.get_user_model() - - - -class OrganizationAPI( - TestCase, - APICommonFields -): - - model = Organization - - app_namespace = 'v2' - - url_name = '_api_tenant' - - @classmethod - def setUpTestData(self): - """Setup Test - - 1. Create the object - 2. create view user - 3. add user as org manager - 4. make api request - """ - - organization = Organization.objects.create(name='test_org', model_notes='random text') - - self.organization = organization - - - self.item = organization - - self.url_view_kwargs = {'pk': self.item.id} - - view_permissions = Permission.objects.get( - codename = 'view_' + self.model._meta.model_name, - content_type = ContentType.objects.get( - app_label = self.model._meta.app_label, - model = self.model._meta.model_name, - ) - ) - - view_team = Team.objects.create( - team_name = 'view_team', - organization = organization, - ) - - view_team.permissions.set([view_permissions]) - - - self.view_user = User.objects.create_user(username="test_user_view", password="password") - teamuser = TeamUsers.objects.create( - team = view_team, - user = self.view_user - ) - - organization.manager = self.view_user - - organization.save() - - - client = Client() - url = reverse(self.app_namespace + ':' + self.url_name + '-detail', kwargs=self.url_view_kwargs) - - - client.force_login(self.view_user) - response = client.get(url) - - self.api_data = response.data - - - - def test_api_field_exists_name(self): - """ Test for existance of API Field - - name field must exist - """ - - assert 'name' in self.api_data - - - def test_api_field_type_name(self): - """ Test for type for API Field - - name field must be str - """ - - assert type(self.api_data['name']) is str - - - - def test_api_field_exists_manager(self): - """ Test for existance of API Field - - manager field must exist - """ - - assert 'manager' in self.api_data - - - def test_api_field_type_manager(self): - """ Test for type for API Field - - manager field must be dict - """ - - assert type(self.api_data['manager']) is dict - - - def test_api_field_exists_manager_id(self): - """ Test for existance of API Field - - manager.id field must exist - """ - - assert 'id' in self.api_data['manager'] - - - def test_api_field_type_manager_id(self): - """ Test for type for API Field - - manager.id field must be int - """ - - assert type(self.api_data['manager']['id']) is int - - - def test_api_field_exists_manager_display_name(self): - """ Test for existance of API Field - - manager.display_name field must exist - """ - - assert 'display_name' in self.api_data['manager'] - - - def test_api_field_type_manager_display_name(self): - """ Test for type for API Field - - manager.display_name field must be int - """ - - assert type(self.api_data['manager']['display_name']) is str - - - def test_api_field_exists_manager_url(self): - """ Test for existance of API Field - - manager.display_name field must exist - """ - - assert 'url' in self.api_data['manager'] - - - def test_api_field_type_manager_url(self): - """ Test for type for API Field - - manager.url field must be Hyperlink - """ - - assert type(self.api_data['manager']['url']) is Hyperlink - - - - def test_api_field_exists_url_teams(self): - """ Test for existance of API Field - - _urls.teams field must exist - """ - - assert 'teams' in self.api_data['_urls'] - - - def test_api_field_type_url_teams(self): - """ Test for type for API Field - - _urls.teams field must be Hyperlink - """ - - assert type(self.api_data['_urls']['teams']) is str