From 84afc3274a3c76188fc7081170cd591b8e36a23a Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Thu, 8 May 2025 12:26:55 +0930
Subject: [PATCH] test: remove ticket only vars from api permissions tests

ref: #742 #730
---
 .../test_functional_api_permissions.py        | 33 +++++++++++------
 .../test_functional_ticket_base_permission.py | 37 +++++++++++++++++++
 2 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/app/api/tests/functional/test_functional_api_permissions.py b/app/api/tests/functional/test_functional_api_permissions.py
index 68f77791..1915245e 100644
--- a/app/api/tests/functional/test_functional_api_permissions.py
+++ b/app/api/tests/functional/test_functional_api_permissions.py
@@ -516,24 +516,17 @@ class APIPermissionsInheritedCases(
 
             request.cls.kwargs_create_item.update({
                 'organization': request.cls.organization,
-                'opened_by': request.cls.view_user
             })
 
             request.cls.kwargs_create_item_diff_org.update({
                 'organization': request.cls.different_organization,
-                'opened_by': request.cls.view_user
             })
 
-            request.cls.other_org_item = request.cls.model.objects.create(
-                **request.cls.kwargs_create_item_diff_org
-            )
-
 
             if request.cls.add_data is not None:
 
                 request.cls.add_data.update({
                     'organization': request.cls.organization.id,
-                    'opened_by': request.cls.view_user.pk
                 })
 
             view_permissions = Permission.objects.get(
@@ -651,11 +644,6 @@ class APIPermissionsInheritedCases(
 
             yield
 
-            request.cls.other_org_item.delete()
-
-            del request.cls.other_org_item
-
-
             request.cls.add_user.delete()
 
             add_team.delete()
@@ -679,6 +667,26 @@ class APIPermissionsInheritedCases(
             different_organization_team.delete()
 
 
+
+    @pytest.fixture(scope='class', autouse = True)
+    def diff_org_model(self, request, django_db_blocker):
+
+        with django_db_blocker.unblock():
+
+            request.cls.other_org_item = request.cls.model.objects.create(
+                **request.cls.kwargs_create_item_diff_org
+            )
+
+        yield request.cls.other_org_item
+
+        with django_db_blocker.unblock():
+
+            request.cls.other_org_item.delete()
+
+            del request.cls.other_org_item
+
+
+
     @pytest.fixture(scope='class', autouse = True)
     def post_model(self, request):
 
@@ -690,6 +698,7 @@ class APIPermissionsInheritedCases(
         model,
         var_setup,
         prepare,
+        diff_org_model,
         create_model,
         post_model
     ):
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 f929e002..b83553da 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
@@ -39,6 +39,41 @@ class PermissionsAPITestCases(
 
 
 
+
+    @pytest.fixture(scope='class')
+    def opened_by_var_setup(self, request):
+
+        request.cls.kwargs_create_item.update({
+            'opened_by': request.cls.view_user
+        })
+
+        request.cls.kwargs_create_item_diff_org.update({
+            'opened_by': request.cls.view_user
+        })
+
+        if request.cls.add_data is not None:
+
+            request.cls.add_data.update({
+                'opened_by': request.cls.view_user.pk
+            })
+
+
+
+    @pytest.fixture(scope='class', autouse = True)
+    def class_setup(self, request, django_db_blocker,
+        model,
+        var_setup,
+        prepare,
+        opened_by_var_setup,
+        diff_org_model,
+        create_model,
+        post_model
+    ):
+
+        pass
+
+
+
     def test_returned_data_from_user_and_global_organizations_only(self):
         """Check items returned
 
@@ -81,7 +116,9 @@ class TicketBasePermissionsAPIInheritedCases(
         model,
         var_setup,
         prepare,
+        opened_by_var_setup,
         inherited_var_setup,
+        diff_org_model,
         create_model,
     ):