diff --git a/app/api/tests/functional/test_functional_api_fields.py b/app/api/tests/functional/test_functional_api_fields.py index 38ea3ed3..6a7a22a6 100644 --- a/app/api/tests/functional/test_functional_api_fields.py +++ b/app/api/tests/functional/test_functional_api_fields.py @@ -3,6 +3,7 @@ import django import pytest from django.contrib.auth.models import ContentType, Permission +from django.db import models from django.shortcuts import reverse from django.test import Client @@ -11,8 +12,6 @@ from rest_framework.relations import Hyperlink from access.models.team import Team from access.models.team_user import TeamUsers -from centurion.tests.common import DoesNotExist - User = django.contrib.auth.get_user_model() @@ -252,7 +251,7 @@ class APIFieldsTestCases: api_data_two = recursearray(self.api_data_two, param_value) - if param_expected is DoesNotExist: + if param_expected is models.NOT_PROVIDED: assert( api_data['key'] not in api_data['obj'] @@ -278,7 +277,7 @@ class APIFieldsTestCases: api_data_two = recursearray(self.api_data_two, param_value) - if param_expected is DoesNotExist: + if param_expected is models.NOT_PROVIDED: assert( api_data['key'] not in api_data['obj'] 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 fa353788..b0344d9e 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 @@ -1,13 +1,14 @@ import django import pytest +from django.db import models + from rest_framework.relations import Hyperlink from access.models.entity import Entity from api.tests.functional.test_functional_api_fields import ( APIFieldsInheritedCases, - DoesNotExist, ) from core.models.ticket.ticket_category import TicketCategory @@ -127,10 +128,10 @@ class APITestCases( parameterized_test_data = { 'model_notes': { - 'expected': DoesNotExist + 'expected': models.NOT_PROVIDED }, '_urls.notes': { - 'expected': DoesNotExist + 'expected': models.NOT_PROVIDED }, 'external_system': { 'expected': int diff --git a/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_api_fields.py b/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_api_fields.py index a0ca3613..00ce5d02 100644 --- a/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_api_fields.py +++ b/app/core/tests/unit/ticket_comment_base/test_unit_ticket_comment_base_api_fields.py @@ -2,12 +2,11 @@ import django import pytest from django.contrib.auth.models import ContentType, Permission +from django.db import models from django.shortcuts import reverse from rest_framework.relations import Hyperlink -from centurion.tests.common import DoesNotExist - from api.tests.functional.test_functional_api_fields import ( APIFieldsInheritedCases, ) @@ -327,13 +326,13 @@ class TicketCommentBaseAPITestCases( # Below fields dont exist. 'display_name': { - 'expected': DoesNotExist + 'expected': models.NOT_PROVIDED }, 'model_notes': { - 'expected': DoesNotExist + 'expected': models.NOT_PROVIDED }, '_urls.notes': { - 'expected': DoesNotExist + 'expected': models.NOT_PROVIDED }, }