diff --git a/app/access/tests/unit/entity/test_unit_entity_model.py b/app/access/tests/unit/entity/test_unit_entity_model.py index 80efc049..45607d3b 100644 --- a/app/access/tests/unit/entity/test_unit_entity_model.py +++ b/app/access/tests/unit/entity/test_unit_entity_model.py @@ -93,6 +93,22 @@ class EntityModelTestCases( assert model.kb_model_name == 'entity' + def test_method_get_url_kwargs(self, mocker, model_instance, settings): + """Test Class Method + + Ensure method `get_url_kwargs` returns the correct value. + """ + + + url = model_instance.get_url_kwargs() + + assert model_instance.get_url_kwargs() == { + 'model_name': model_instance._meta.model_name, + 'pk': model_instance.id + } + + + class EntityModelInheritedCases( EntityModelTestCases, @@ -113,3 +129,16 @@ class EntityModelPyTest( """ assert model_instance.get_related_model() is None + + def test_method_get_url_kwargs(self, mocker, model_instance, settings): + """Test Class Method + + Ensure method `get_url_kwargs` returns the correct value. + """ + + + url = model_instance.get_url_kwargs() + + assert model_instance.get_url_kwargs() == { + 'pk': model_instance.id + } diff --git a/app/access/tests/unit/entity/test_unit_entity_viewset.py b/app/access/tests/unit/entity/test_unit_entity_viewset.py index ec278403..f8cd67b7 100644 --- a/app/access/tests/unit/entity/test_unit_entity_viewset.py +++ b/app/access/tests/unit/entity/test_unit_entity_viewset.py @@ -4,7 +4,7 @@ from django.test import Client, TestCase from rest_framework.reverse import reverse - +from access.models.entity import Entity from access.viewsets.entity import ( NoDocsViewSet, ViewSet, @@ -21,6 +21,8 @@ class ViewsetTestCases( kwargs = None + model = Entity + viewset = None route_name = None diff --git a/app/api/tests/unit/test_unit_common_viewset.py b/app/api/tests/unit/test_unit_common_viewset.py index 4bcbb04f..90225a4a 100644 --- a/app/api/tests/unit/test_unit_common_viewset.py +++ b/app/api/tests/unit/test_unit_common_viewset.py @@ -69,7 +69,7 @@ class MockRequest: user: User = None - def __init__(self, user: User, organization: Organization, viewset): + def __init__(self, user: User, organization: Organization, viewset, model = None): self.user = user @@ -77,11 +77,15 @@ class MockRequest: viewset = viewset() + if model is None: + + model = viewset.model + view_permission = Permission.objects.get( - codename = 'view_' + viewset.model._meta.model_name, + codename = 'view_' + model._meta.model_name, content_type = ContentType.objects.get( - app_label = viewset.model._meta.app_label, - model = viewset.model._meta.model_name, + app_label = model._meta.app_label, + model = model._meta.model_name, ) ) @@ -927,6 +931,12 @@ class ModelViewSetBaseCases( """ view_set = self.viewset() + view_set.request = MockRequest( + user = self.view_user, + model = getattr(self, 'model',None), + viewset = self.viewset, + organization = self.organization + ) assert view_set.model is not None @@ -982,8 +992,9 @@ class ModelViewSetBaseCases( view_set.request = MockRequest( user = self.view_user, + model = getattr(self, 'model',None), organization = self.organization, - viewset = self.viewset + viewset = self.viewset, ) view_set.request.headers = {} @@ -1014,8 +1025,9 @@ class ModelViewSetBaseCases( view_set.request = MockRequest( user = self.view_user, + model = getattr(self, 'model',None), organization = self.organization, - viewset = self.viewset + viewset = self.viewset, ) view_set.request.headers = {}