From 27e842a57ff94c264e6f12ab915d218c80639b49 Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 16 Jul 2025 21:56:12 +0930 Subject: [PATCH] refactor(core): Update Tests to cater for inheritence changes ref: #871 #861 --- .../test_functional_ticket_base_metadata.py | 4 ++-- .../test_functional_ticket_base_permission.py | 4 ++-- .../test_functional_ticket_base_viewset.py | 6 +++--- .../ticket_base/test_unit_ticket_base_api_fields.py | 6 +++--- .../ticket_base/test_unit_ticket_base_viewset.py | 4 ++-- app/core/urls_api.py | 2 +- app/core/viewsets/ticket.py | 12 ++++++------ 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/core/tests/functional/ticket_base/test_functional_ticket_base_metadata.py b/app/core/tests/functional/ticket_base/test_functional_ticket_base_metadata.py index a6051507..8757a3b1 100644 --- a/app/core/tests/functional/ticket_base/test_functional_ticket_base_metadata.py +++ b/app/core/tests/functional/ticket_base/test_functional_ticket_base_metadata.py @@ -260,11 +260,11 @@ class TicketBaseMetadataInheritedCases( } self.url_kwargs = { - 'ticket_model': self.model._meta.sub_model_type + 'model_name': self.model._meta.sub_model_type } self.url_view_kwargs = { - 'ticket_model': self.model._meta.sub_model_type + 'model_name': self.model._meta.sub_model_type } super().setUpTestData() diff --git a/app/core/tests/functional/ticket_base/test_functional_ticket_base_permission.py b/app/core/tests/functional/ticket_base/test_functional_ticket_base_permission.py index 20b90829..6aabfaaf 100644 --- a/app/core/tests/functional/ticket_base/test_functional_ticket_base_permission.py +++ b/app/core/tests/functional/ticket_base/test_functional_ticket_base_permission.py @@ -103,11 +103,11 @@ class TicketBasePermissionsAPIInheritedCases( def inherited_var_setup(self, request): request.cls.url_kwargs.update({ - 'ticket_model': self.model._meta.sub_model_type + 'model_name': self.model._meta.sub_model_type }) request.cls.url_view_kwargs.update({ - 'ticket_model': self.model._meta.sub_model_type + 'model_name': self.model._meta.sub_model_type }) diff --git a/app/core/tests/functional/ticket_base/test_functional_ticket_base_viewset.py b/app/core/tests/functional/ticket_base/test_functional_ticket_base_viewset.py index cb15c8bf..e33a710c 100644 --- a/app/core/tests/functional/ticket_base/test_functional_ticket_base_viewset.py +++ b/app/core/tests/functional/ticket_base/test_functional_ticket_base_viewset.py @@ -93,7 +93,7 @@ class ViewSetBase: ) - self.url_view_kwargs.update({ 'pk': self.item.id }) + self.url_view_kwargs.update({'model_name': self.item._meta.model_name, 'pk': self.item.id }) if self.add_data is not None: @@ -267,11 +267,11 @@ class TicketBaseViewSetInheritedCases( } self.url_kwargs = { - 'ticket_model': self.model._meta.model_name + 'model_name': self.model._meta.model_name } self.url_view_kwargs = { - 'ticket_model': self.model._meta.model_name + 'model_name': self.model._meta.model_name } super().setUpTestData() diff --git a/app/core/tests/unit/ticket_base/test_unit_ticket_base_api_fields.py b/app/core/tests/unit/ticket_base/test_unit_ticket_base_api_fields.py index f7d49e9a..b747ddb5 100644 --- a/app/core/tests/unit/ticket_base/test_unit_ticket_base_api_fields.py +++ b/app/core/tests/unit/ticket_base/test_unit_ticket_base_api_fields.py @@ -70,7 +70,7 @@ class APITestCases( if request.cls.model._meta.model_name != 'ticketbase': request.cls.url_view_kwargs.update({ - 'ticket_model': str(request.cls.model._meta.sub_model_type), + 'model_name': str(request.cls.model._meta.sub_model_type), }) yield @@ -87,9 +87,9 @@ class APITestCases( request.cls.kwargs_create_item['category'].delete() - if 'ticket_model' in request.cls.url_view_kwargs: + if 'model_name' in request.cls.url_view_kwargs: - del request.cls.url_view_kwargs['ticket_model'] + del request.cls.url_view_kwargs['model_name'] diff --git a/app/core/tests/unit/ticket_base/test_unit_ticket_base_viewset.py b/app/core/tests/unit/ticket_base/test_unit_ticket_base_viewset.py index c7f9683e..a5e27e1d 100644 --- a/app/core/tests/unit/ticket_base/test_unit_ticket_base_viewset.py +++ b/app/core/tests/unit/ticket_base/test_unit_ticket_base_viewset.py @@ -45,7 +45,7 @@ class ViewsetTestCases( if self.model != TicketBase: self.kwargs = { - 'ticket_model': self.model._meta.sub_model_type + 'model_name': self.model._meta.model_name } self.viewset.kwargs = self.kwargs @@ -73,7 +73,7 @@ class ViewsetTestCases( view_set = self.viewset() - assert view_set.model_kwarg == 'ticket_model' + assert view_set.model_kwarg == 'model_name' diff --git a/app/core/urls_api.py b/app/core/urls_api.py index ad99ccce..0f1ed47a 100644 --- a/app/core/urls_api.py +++ b/app/core/urls_api.py @@ -21,7 +21,7 @@ for model in apps.get_models(): if issubclass(model, ticket.TicketBase): - ticket_type_names += model._meta.sub_model_type + '|' + ticket_type_names += model._meta.model_name + '|' if issubclass(model, ticket_comment.TicketCommentBase): diff --git a/app/core/viewsets/ticket.py b/app/core/viewsets/ticket.py index 82315446..ab48f486 100644 --- a/app/core/viewsets/ticket.py +++ b/app/core/viewsets/ticket.py @@ -53,7 +53,7 @@ def spectacular_request_serializers( serializer_type = 'Model'): description='.', parameters = [ OpenApiParameter( - name = 'ticket_model', + name = 'model_name', description = 'Enter the Ticket type. This is the name of the Ticket sub-model.', location = OpenApiParameter.PATH, type = str, @@ -94,7 +94,7 @@ def spectacular_request_serializers( serializer_type = 'Model'): description = '.', parameters =[ OpenApiParameter( - name = 'ticket_model', + name = 'model_name', description = 'Enter the ticket type. This is the name of the Ticket sub-model.', location = OpenApiParameter.PATH, type = str, @@ -118,7 +118,7 @@ def spectacular_request_serializers( serializer_type = 'Model'): description='.', parameters = [ OpenApiParameter( - name = 'ticket_model', + name = 'model_name', description = 'Enter the ticket type. This is the name of the Ticket sub-model.', location = OpenApiParameter.PATH, type = str, @@ -150,7 +150,7 @@ def spectacular_request_serializers( serializer_type = 'Model'): description='.', parameters = [ OpenApiParameter( - name = 'ticket_model', + name = 'model_name', description = 'Enter the ticket type. This is the name of the Ticket sub-model.', location = OpenApiParameter.PATH, type = str, @@ -238,7 +238,7 @@ class ViewSet( SubModelViewSet ): 'is_deleted' ] - model_kwarg = 'ticket_model' + model_kwarg = 'model_name' search_fields = [ 'title', @@ -260,7 +260,7 @@ class ViewSet( SubModelViewSet ): viewname = '_api_ticket_sub-list', request = self.request, kwargs = { - 'ticket_model': self.kwargs[self.model_kwarg], + 'model_name': self.kwargs[self.model_kwarg], } )