From 1b749e9f1a4994d108a0f25e5cae42b0050c0f6b Mon Sep 17 00:00:00 2001 From: Jon Date: Wed, 14 May 2025 18:46:33 +0930 Subject: [PATCH] refactor(devops): Update all references to `User` to use `get_user_model()` ref: #756 #755 --- .../feature_flag/test_functional_feature_flag_viewset.py | 4 +++- ...st_functional_software_enable_feature_flag_serializer.py | 4 +++- .../test_functional_software_enable_feature_flag_viewset.py | 4 +++- .../unit/feature_flag/test_unit_feature_flag_api_v2.py | 6 +++++- .../test_unit_software_enable_feature_flag_api_v2.py | 6 +++++- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/devops/tests/functional/feature_flag/test_functional_feature_flag_viewset.py b/app/devops/tests/functional/feature_flag/test_functional_feature_flag_viewset.py index dfbd1e14..a0c46782 100644 --- a/app/devops/tests/functional/feature_flag/test_functional_feature_flag_viewset.py +++ b/app/devops/tests/functional/feature_flag/test_functional_feature_flag_viewset.py @@ -1,6 +1,7 @@ +import django + from django.contrib.auth.models import ( Permission, - User, ) from django.contrib.contenttypes.models import ContentType from django.test import TestCase @@ -20,6 +21,7 @@ from itam.models.software import Software from settings.models.app_settings import AppSettings +User = django.contrib.auth.get_user_model() diff --git a/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_serializer.py b/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_serializer.py index 44f5d5a0..a4f92687 100644 --- a/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_serializer.py +++ b/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_serializer.py @@ -1,6 +1,6 @@ +import django import pytest -from django.contrib.auth.models import User from django.test import TestCase from rest_framework.exceptions import ValidationError @@ -13,6 +13,8 @@ from devops.serializers.software_enable_feature_flag import SoftwareEnableFeatur from itam.models.software import Software +User = django.contrib.auth.get_user_model() + class ValidationAPI( diff --git a/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_viewset.py b/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_viewset.py index 9dfa968c..cd8154c5 100644 --- a/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_viewset.py +++ b/app/devops/tests/functional/software_enable_feature_flag/test_functional_software_enable_feature_flag_viewset.py @@ -1,6 +1,7 @@ +import django + from django.contrib.auth.models import ( Permission, - User, ) from django.contrib.contenttypes.models import ContentType from django.test import Client, TestCase @@ -22,6 +23,7 @@ from itam.models.software import Software from settings.models.app_settings import AppSettings +User = django.contrib.auth.get_user_model() diff --git a/app/devops/tests/unit/feature_flag/test_unit_feature_flag_api_v2.py b/app/devops/tests/unit/feature_flag/test_unit_feature_flag_api_v2.py index 0456df42..19ba8071 100644 --- a/app/devops/tests/unit/feature_flag/test_unit_feature_flag_api_v2.py +++ b/app/devops/tests/unit/feature_flag/test_unit_feature_flag_api_v2.py @@ -1,4 +1,6 @@ -from django.contrib.auth.models import Permission, User +import django + +from django.contrib.auth.models import Permission from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase @@ -15,6 +17,8 @@ from devops.models.feature_flag import FeatureFlag from itam.models.software import Software +User = django.contrib.auth.get_user_model() + class API( diff --git a/app/devops/tests/unit/software_enable_feature_flag/test_unit_software_enable_feature_flag_api_v2.py b/app/devops/tests/unit/software_enable_feature_flag/test_unit_software_enable_feature_flag_api_v2.py index 13ae0289..60b50371 100644 --- a/app/devops/tests/unit/software_enable_feature_flag/test_unit_software_enable_feature_flag_api_v2.py +++ b/app/devops/tests/unit/software_enable_feature_flag/test_unit_software_enable_feature_flag_api_v2.py @@ -1,4 +1,6 @@ -from django.contrib.auth.models import Permission, User +import django + +from django.contrib.auth.models import Permission from django.contrib.contenttypes.models import ContentType from django.shortcuts import reverse from django.test import Client, TestCase @@ -15,6 +17,8 @@ from devops.models.software_enable_feature_flag import SoftwareEnableFeatureFlag from itam.models.software import Software +User = django.contrib.auth.get_user_model() + class API(