From 6f66b4cf9547895226cb295deeb5552ae4d4687b Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 1 Jun 2025 09:44:48 +0930 Subject: [PATCH] test(devops): re-implement temp removed test suites. ref: #780 #515 #782 --- ...> test_functional_feature_flag_viewset.py} | 26 ++++--------------- ...v2.py => test_unit_feature_flag_api_v2.py} | 9 +++++-- ...t.py => test_unit_feature_flag_viewset.py} | 2 +- 3 files changed, 13 insertions(+), 24 deletions(-) rename app/devops/tests/functional/feature_flag/{functional_feature_flag_viewset.py => test_functional_feature_flag_viewset.py} (96%) rename app/devops/tests/unit/feature_flag/{unit_feature_flag_api_v2.py => test_unit_feature_flag_api_v2.py} (96%) rename app/devops/tests/unit/feature_flag/{unit_feature_flag_viewset.py => test_unit_feature_flag_viewset.py} (93%) diff --git a/app/devops/tests/functional/feature_flag/functional_feature_flag_viewset.py b/app/devops/tests/functional/feature_flag/test_functional_feature_flag_viewset.py similarity index 96% rename from app/devops/tests/functional/feature_flag/functional_feature_flag_viewset.py rename to app/devops/tests/functional/feature_flag/test_functional_feature_flag_viewset.py index 3381d112..d59afb5b 100644 --- a/app/devops/tests/functional/feature_flag/functional_feature_flag_viewset.py +++ b/app/devops/tests/functional/feature_flag/test_functional_feature_flag_viewset.py @@ -31,7 +31,7 @@ class ViewSetBase: app_namespace = 'v2' - url_name = 'devops:_api_v2_feature_flag' + url_name = 'devops:_api_featureflag' change_data = {'name': 'device'} @@ -164,6 +164,8 @@ class ViewSetBase: enabled = True ) + self.model.context['user'] = self.view_user + self.global_org_item = self.model.objects.create( organization = self.global_organization, name = 'global_item', @@ -185,6 +187,8 @@ class ViewSetBase: software = software, ) + self.model.context['user'] = None + self.url_view_kwargs = {'pk': self.item.id} @@ -236,26 +240,6 @@ class ViewSetBase: -class ManufacturerPermissionsAPI( - ViewSetBase, - APIPermissions, - TestCase, -): - - pass - - - -class ManufacturerViewSet( - ViewSetBase, - SerializersTestCases, - TestCase -): - - pass - - - class ManufacturerMetadata( ViewSetBase, MetadataAttributesFunctional, diff --git a/app/devops/tests/unit/feature_flag/unit_feature_flag_api_v2.py b/app/devops/tests/unit/feature_flag/test_unit_feature_flag_api_v2.py similarity index 96% rename from app/devops/tests/unit/feature_flag/unit_feature_flag_api_v2.py rename to app/devops/tests/unit/feature_flag/test_unit_feature_flag_api_v2.py index 2aec7120..5100de8d 100644 --- a/app/devops/tests/unit/feature_flag/unit_feature_flag_api_v2.py +++ b/app/devops/tests/unit/feature_flag/test_unit_feature_flag_api_v2.py @@ -40,6 +40,10 @@ class API( self.organization = Organization.objects.create(name='test_org') + self.view_user = User.objects.create_user(username="test_user_view", password="password") + + self.model.context['user'] = self.view_user + self.item = self.model.objects.create( organization = self.organization, name = 'one', @@ -52,6 +56,8 @@ class API( enabled = True ) + self.model.context['user'] = None + self.url_view_kwargs = {'pk': self.item.id} view_permissions = Permission.objects.get( @@ -69,14 +75,13 @@ class API( view_team.permissions.set([view_permissions]) - self.view_user = User.objects.create_user(username="test_user_view", password="password") TeamUsers.objects.create( team = view_team, user = self.view_user ) client = Client() - url = reverse('v2:devops:_api_v2_feature_flag-detail', kwargs=self.url_view_kwargs) + url = reverse('v2:devops:_api_featureflag-detail', kwargs=self.url_view_kwargs) client.force_login(self.view_user) diff --git a/app/devops/tests/unit/feature_flag/unit_feature_flag_viewset.py b/app/devops/tests/unit/feature_flag/test_unit_feature_flag_viewset.py similarity index 93% rename from app/devops/tests/unit/feature_flag/unit_feature_flag_viewset.py rename to app/devops/tests/unit/feature_flag/test_unit_feature_flag_viewset.py index 35d4adbb..585810ad 100644 --- a/app/devops/tests/unit/feature_flag/unit_feature_flag_viewset.py +++ b/app/devops/tests/unit/feature_flag/test_unit_feature_flag_viewset.py @@ -15,7 +15,7 @@ class ViewsetList( viewset = ViewSet - route_name = 'v2:devops:_api_v2_feature_flag' + route_name = 'v2:devops:_api_featureflag' @classmethod