nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/extras/tests/test_filters.py

@@ -3,11 +3,13 @@ import uuid
 from zoneinfo import ZoneInfo
 
 from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Group
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.test import override_settings, RequestFactory
+from django.test import override_settings, RequestFactory, tag
 from django.utils.timezone import now
 
+from nautobot.core.jobs import BulkDeleteObjects
 from nautobot.core.testing import FilterTestCases
 from nautobot.dcim.filters import DeviceFilterSet
 from nautobot.dcim.models import (
@@ -21,6 +23,7 @@ from nautobot.dcim.models import (
     Rack,
 )
 from nautobot.extras.choices import (
+    ApprovalWorkflowStateChoices,
     CustomFieldTypeChoices,
     DynamicGroupTypeChoices,
     JobExecutionType,
@@ -33,6 +36,11 @@ from nautobot.extras.choices import (
 )
 from nautobot.extras.constants import HTTP_CONTENT_TYPE_JSON
 from nautobot.extras.filters import (
+    ApprovalWorkflowDefinitionFilterSet,
+    ApprovalWorkflowFilterSet,
+    ApprovalWorkflowStageDefinitionFilterSet,
+    ApprovalWorkflowStageFilterSet,
+    ApprovalWorkflowStageResponseFilterSet,
     ComputedFieldFilterSet,
     ConfigContextFilterSet,
     ContactAssociationFilterSet,
@@ -71,6 +79,11 @@ from nautobot.extras.filters import (
     WebhookFilterSet,
 )
 from nautobot.extras.models import (
+    ApprovalWorkflow,
+    ApprovalWorkflowDefinition,
+    ApprovalWorkflowStage,
+    ApprovalWorkflowStageDefinition,
+    ApprovalWorkflowStageResponse,
     ComputedField,
     ConfigContext,
     Contact,
@@ -111,6 +124,7 @@ from nautobot.extras.models import (
     Webhook,
 )
 from nautobot.extras.tests.constants import BIG_GRAPHQL_DEVICE_QUERY
+from nautobot.extras.utils import get_pending_approval_workflow_stages
 from nautobot.ipam.filters import VLANFilterSet
 from nautobot.ipam.models import IPAddress, Namespace, Prefix, VLAN, VLANGroup
 from nautobot.tenancy.models import Tenant, TenantGroup
@@ -121,6 +135,414 @@ from nautobot.virtualization.models import Cluster, ClusterGroup, ClusterType
 User = get_user_model()
 
 
+class ApprovalWorkflowTestMixin:
+    """Mixin class for ApprovalWorkflow tests."""
+
+    @classmethod
+    def setUpTestData(cls):
+        cls.scheduledjob_ct = ContentType.objects.get_for_model(ScheduledJob)
+        cls.approver_group_1 = Group.objects.create(name="Approver Group 1")
+        cls.approver_group_2 = Group.objects.create(name="Approver Group 2")
+        cls.approver_group_3 = Group.objects.create(name="Approver Group 3")
+        cls.users = list(User.objects.all())
+        for user in cls.users:
+            user.groups.add(cls.approver_group_1)
+            user.groups.add(cls.approver_group_2)
+            user.groups.add(cls.approver_group_3)
+
+        job_model = Job.objects.get_for_class_path(BulkDeleteObjects.class_path)
+        cls.scheduled_jobs = [
+            ScheduledJob.objects.create(
+                name=f"Bulk Delete Objects Scheduled Job {i}",
+                task=BulkDeleteObjects.class_path,
+                job_model=job_model,
+                interval=JobExecutionType.TYPE_IMMEDIATELY,
+                user=cls.users[0],
+                start_time=now(),
+            )
+            for i in range(7)
+        ]
+        cls.approval_workflow_1_definition = ApprovalWorkflowDefinition.objects.create(
+            name="Test Approval Workflow 1 Definition",
+            model_content_type=cls.scheduledjob_ct,
+            weight=1,
+        )
+        cls.approval_workflow_2_definition = ApprovalWorkflowDefinition.objects.create(
+            name="Test Approval Workflow 2 Definition",
+            model_content_type=cls.scheduledjob_ct,
+            model_constraints={"name": "Bulk Delete Objects"},
+            weight=2,
+        )
+        cls.approval_workflow_3_definition = ApprovalWorkflowDefinition.objects.create(
+            name="Test Approval Workflow 3 Definition",
+            model_content_type=cls.scheduledjob_ct,
+            model_constraints={"name": "Bulk Delete Objects"},
+            weight=3,
+        )
+        cls.approval_workflow_4_definition = ApprovalWorkflowDefinition.objects.create(
+            name="Test Approval Workflow 4 Definition",
+            model_content_type=cls.scheduledjob_ct,
+            model_constraints={"name": "Bulk Delete Objects"},
+            weight=4,
+        )
+        cls.approval_workflow_5_definition = ApprovalWorkflowDefinition.objects.create(
+            name="Test Approval Workflow 5 Definition",
+            model_content_type=cls.scheduledjob_ct,
+            model_constraints={"name": "Bulk Delete Objects"},
+            weight=5,
+        )
+        cls.approval_workflow_1_stage_1_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_1_definition,
+            sequence=100,
+            name="Test Approval Workflow 1 Stage 1 Definition",
+            min_approvers=2,
+            denial_message="Stage 1 Denial Message",
+            approver_group=cls.approver_group_1,
+        )
+        cls.approval_workflow_1_stage_2_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_1_definition,
+            sequence=200,
+            name="Test Approval Workflow 1 Stage 2 Definition",
+            min_approvers=2,
+            denial_message="Stage 2 Denial Message",
+            approver_group=cls.approver_group_2,
+        )
+        cls.approval_workflow_1_stage_3_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_1_definition,
+            sequence=300,
+            name="Test Approval Workflow 1 Stage 3 Definition",
+            min_approvers=3,
+            denial_message="Stage 3 Denial Message",
+            approver_group=cls.approver_group_3,
+        )
+        cls.approval_workflow_1_stage_4_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_1_definition,
+            sequence=400,
+            name="Test Approval Workflow 1 Stage 4 Definition",
+            min_approvers=5,
+            denial_message="Stage 4 Denial Message",
+            approver_group=cls.approver_group_1,
+        )
+        cls.approval_workflow_1_stage_5_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_1_definition,
+            sequence=500,
+            name="Test Approval Workflow 1 Stage 5 Definition",
+            min_approvers=2,
+            denial_message="Stage 5 Denial Message",
+            approver_group=cls.approver_group_2,
+        )
+        cls.approval_workflow_1_stage_6_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_1_definition,
+            sequence=600,
+            name="Test Approval Workflow 1 Stage 6 Definition",
+            min_approvers=2,
+            denial_message="Stage 6 Denial Message",
+            approver_group=cls.approver_group_3,
+        )
+        cls.approval_workflow_2_stage_1_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_2_definition,
+            sequence=100,
+            name="Test Approval Workflow 2 Stage 1 Definition",
+            min_approvers=2,
+            denial_message="Stage 1 Denial Message",
+            approver_group=cls.approver_group_1,
+        )
+        cls.approval_workflow_2_stage_2_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_2_definition,
+            sequence=200,
+            name="Test Approval Workflow 2 Stage 2 Definition",
+            min_approvers=2,
+            denial_message="Stage 2 Denial Message",
+            approver_group=cls.approver_group_2,
+        )
+        cls.approval_workflow_2_stage_3_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_2_definition,
+            sequence=300,
+            name="Test Approval Workflow 2 Stage 3 Definition",
+            min_approvers=2,
+            denial_message="Stage 3 Denial Message",
+            approver_group=cls.approver_group_3,
+        )
+        cls.approval_workflow_3_stage_1_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_3_definition,
+            sequence=100,
+            name="Test Approval Workflow 3 Stage 1 Definition",
+            min_approvers=2,
+            denial_message="Stage 1 Denial Message",
+            approver_group=cls.approver_group_1,
+        )
+        cls.approval_workflow_3_stage_2_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_3_definition,
+            sequence=200,
+            name="Test Approval Workflow 3 Stage 2 Definition",
+            min_approvers=2,
+            denial_message="Stage 2 Denial Message",
+            approver_group=cls.approver_group_2,
+        )
+        cls.approval_workflow_3_stage_3_definition = ApprovalWorkflowStageDefinition.objects.create(
+            approval_workflow_definition=cls.approval_workflow_3_definition,
+            sequence=300,
+            name="Test Approval Workflow 3 Stage 3 Definition",
+            min_approvers=2,
+            denial_message="Stage 3 Denial Message",
+            approver_group=cls.approver_group_3,
+        )
+        cls.approval_workflow_1_instance_1 = ApprovalWorkflow.objects.create(
+            approval_workflow_definition=cls.approval_workflow_1_definition,
+            object_under_review_content_type=cls.scheduledjob_ct,
+            object_under_review_object_id=cls.scheduled_jobs[0].pk,
+            current_state=ApprovalWorkflowStateChoices.PENDING,
+        )
+        cls.approval_workflow_1_instance_2 = ApprovalWorkflow.objects.create(
+            approval_workflow_definition=cls.approval_workflow_3_definition,
+            object_under_review_content_type=cls.scheduledjob_ct,
+            object_under_review_object_id=cls.scheduled_jobs[1].pk,
+            current_state=ApprovalWorkflowStateChoices.PENDING,
+        )
+        cls.approval_workflow_1_instance_3 = ApprovalWorkflow.objects.create(
+            approval_workflow_definition=cls.approval_workflow_3_definition,
+            object_under_review_content_type=cls.scheduledjob_ct,
+            object_under_review_object_id=cls.scheduled_jobs[2].pk,
+            current_state=ApprovalWorkflowStateChoices.APPROVED,
+        )
+        cls.approval_workflow_1_instance_4 = ApprovalWorkflow.objects.create(
+            approval_workflow_definition=cls.approval_workflow_4_definition,
+            object_under_review_content_type=cls.scheduledjob_ct,
+            object_under_review_object_id=cls.scheduled_jobs[3].pk,
+            current_state=ApprovalWorkflowStateChoices.APPROVED,
+        )
+        cls.approval_workflow_1_instance_5 = ApprovalWorkflow.objects.create(
+            approval_workflow_definition=cls.approval_workflow_5_definition,
+            object_under_review_content_type=cls.scheduledjob_ct,
+            object_under_review_object_id=cls.scheduled_jobs[4].pk,
+            current_state=ApprovalWorkflowStateChoices.DENIED,
+        )
+        cls.approval_workflow_1_instance_6 = ApprovalWorkflow.objects.create(
+            approval_workflow_definition=cls.approval_workflow_5_definition,
+            object_under_review_content_type=cls.scheduledjob_ct,
+            object_under_review_object_id=cls.scheduled_jobs[5].pk,
+            current_state=ApprovalWorkflowStateChoices.DENIED,
+        )
+        cls.approval_workflow_1_instance_7 = ApprovalWorkflow.objects.create(
+            approval_workflow_definition=cls.approval_workflow_2_definition,
+            object_under_review_content_type=cls.scheduledjob_ct,
+            object_under_review_object_id=cls.scheduled_jobs[6].pk,
+            current_state=ApprovalWorkflowStateChoices.APPROVED,
+        )
+        cls.approval_workflow_1_stage_instance_1 = ApprovalWorkflowStage.objects.create(
+            approval_workflow=cls.approval_workflow_1_instance_1,
+            approval_workflow_stage_definition=cls.approval_workflow_1_stage_1_definition,
+            state=ApprovalWorkflowStateChoices.APPROVED,
+            decision_date=datetime.now(ZoneInfo("America/New_York")),
+        )
+        cls.approval_workflow_1_stage_instance_2 = ApprovalWorkflowStage.objects.create(
+            approval_workflow=cls.approval_workflow_1_instance_1,
+            approval_workflow_stage_definition=cls.approval_workflow_1_stage_2_definition,
+            state=ApprovalWorkflowStateChoices.PENDING,
+        )
+        cls.approval_workflow_1_stage_instance_3 = ApprovalWorkflowStage.objects.create(
+            approval_workflow=cls.approval_workflow_1_instance_1,
+            approval_workflow_stage_definition=cls.approval_workflow_1_stage_3_definition,
+            state=ApprovalWorkflowStateChoices.PENDING,
+        )
+        cls.approval_workflow_2_stage_instance_1 = ApprovalWorkflowStage.objects.create(
+            approval_workflow=cls.approval_workflow_1_instance_2,
+            approval_workflow_stage_definition=cls.approval_workflow_1_stage_1_definition,
+            state=ApprovalWorkflowStateChoices.DENIED,
+            decision_date=datetime(2025, 4, 15, 10, 30, 0, tzinfo=ZoneInfo("America/New_York")),
+        )
+        cls.approval_workflow_2_stage_instance_2 = ApprovalWorkflowStage.objects.create(
+            approval_workflow=cls.approval_workflow_1_instance_2,
+            approval_workflow_stage_definition=cls.approval_workflow_1_stage_2_definition,
+            state=ApprovalWorkflowStateChoices.PENDING,
+        )
+        cls.approval_workflow_2_stage_instance_3 = ApprovalWorkflowStage.objects.create(
+            approval_workflow=cls.approval_workflow_1_instance_2,
+            approval_workflow_stage_definition=cls.approval_workflow_1_stage_3_definition,
+            state=ApprovalWorkflowStateChoices.PENDING,
+        )
+        cls.approval_workflow_3_stage_instance_1 = ApprovalWorkflowStage.objects.create(
+            approval_workflow=cls.approval_workflow_1_instance_3,
+            approval_workflow_stage_definition=cls.approval_workflow_3_stage_1_definition,
+            state=ApprovalWorkflowStateChoices.DENIED,
+            decision_date=datetime(2025, 4, 14, 10, 30, 0, tzinfo=ZoneInfo("America/New_York")),
+        )
+        ApprovalWorkflowStageResponse.objects.create(
+            approval_workflow_stage=cls.approval_workflow_1_stage_instance_1,
+            user=cls.users[0],
+            comments="Approved by user 1",
+            state=ApprovalWorkflowStateChoices.APPROVED,
+        )
+        ApprovalWorkflowStageResponse.objects.create(
+            approval_workflow_stage=cls.approval_workflow_1_stage_instance_2,
+            user=cls.users[1],
+            comments="Denied by user 2",
+            state=ApprovalWorkflowStateChoices.DENIED,
+        )
+        ApprovalWorkflowStageResponse.objects.create(
+            approval_workflow_stage=cls.approval_workflow_1_stage_instance_1,
+            user=cls.users[1],
+            comments="Approved by user 2",
+            state=ApprovalWorkflowStateChoices.APPROVED,
+        )
+        ApprovalWorkflowStageResponse.objects.create(
+            approval_workflow_stage=cls.approval_workflow_1_stage_instance_2,
+            user=cls.users[0],
+            comments="Approved by user 1",
+            state=ApprovalWorkflowStateChoices.APPROVED,
+        )
+        ApprovalWorkflowStageResponse.objects.create(
+            approval_workflow_stage=cls.approval_workflow_1_stage_instance_2,
+            user=cls.users[2],
+            comments="Denied by user 3",
+            state=ApprovalWorkflowStateChoices.DENIED,
+        )
+        ApprovalWorkflowStageResponse.objects.create(
+            approval_workflow_stage=cls.approval_workflow_1_stage_instance_2,
+            user=cls.users[2],
+            comments="Approved by user 3",
+            state=ApprovalWorkflowStateChoices.APPROVED,
+        )
+        ApprovalWorkflowStageResponse.objects.create(
+            approval_workflow_stage=cls.approval_workflow_1_stage_instance_3,
+            user=cls.users[3],
+            comments="",
+            state=ApprovalWorkflowStateChoices.PENDING,
+        )
+
+
+class ApprovalWorkflowDefinitionFilterTestCase(ApprovalWorkflowTestMixin, FilterTestCases.FilterTestCase):
+    """ApprovalWorkflowDefinitionFilterSet Test Case."""
+
+    queryset = ApprovalWorkflowDefinition.objects.all()
+    filterset = ApprovalWorkflowDefinitionFilterSet
+    generic_filter_tests = (
+        ("id",),
+        ("created",),
+        ("last_updated",),
+        ("name",),
+        # ("model_content_type",), # TODO we only have two values so far
+    )
+
+    def test_model_content_type(self):
+        params = {"model_content_type": ["extras.scheduledjob"]}
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset).qs,
+            self.queryset.filter(model_content_type=self.scheduledjob_ct),
+        )
+
+
+class ApprovalWorkflowStageDefinitionFilterTestCase(ApprovalWorkflowTestMixin, FilterTestCases.FilterTestCase):
+    """ApprovalWorkflowStageDefinitionFilterSet Test Case."""
+
+    queryset = ApprovalWorkflowStageDefinition.objects.all()
+    filterset = ApprovalWorkflowStageDefinitionFilterSet
+    generic_filter_tests = (
+        ("id",),
+        ("created",),
+        ("last_updated",),
+        ("approval_workflow_definition",),
+        ("sequence",),
+        ("name",),
+        ("min_approvers",),
+        ("denial_message",),
+        ("approver_group",),
+    )
+
+
+class ApprovalWorkflowFilterTestCase(ApprovalWorkflowTestMixin, FilterTestCases.FilterTestCase):
+    """ApprovalWorkflowFilterSet Test Case."""
+
+    queryset = ApprovalWorkflow.objects.all()
+    filterset = ApprovalWorkflowFilterSet
+    generic_filter_tests = (
+        ("id",),
+        ("created",),
+        ("last_updated",),
+        ("approval_workflow_definition",),
+        # ("object_under_review_content_type",), # TODO we only have two values so far
+        ("object_under_review_object_id",),
+        ("current_state",),
+    )
+
+    def test_object_under_review_content_type(self):
+        params = {"object_under_review_content_type": ["extras.scheduledjob"]}
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset).qs,
+            self.queryset.filter(object_under_review_content_type=self.scheduledjob_ct),
+            ordered=False,
+        )
+        params = {"object_under_review_content_type": ["extras.job"]}
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset).qs,
+            self.queryset.filter(object_under_review_content_type=self.scheduledjob_ct),
+            ordered=False,
+        )
+
+
+class ApprovalWorkflowStageFilterTestCase(ApprovalWorkflowTestMixin, FilterTestCases.FilterTestCase):
+    """ApprovalWorkflowStageFilterSet Test Case."""
+
+    queryset = ApprovalWorkflowStage.objects.all()
+    filterset = ApprovalWorkflowStageFilterSet
+    generic_filter_tests = (
+        ("id",),
+        ("created",),
+        ("last_updated",),
+        ("approval_workflow",),
+        ("approval_workflow_stage_definition",),
+        ("state",),
+        ("decision_date",),
+    )
+
+    def setUp(self):
+        super().setUp()
+        self.factory = RequestFactory(SERVER_NAME="nautobot.example.com")
+
+    def test_pending_my_approvals(self):
+        """Test filtering approval stages by pending_my_approvals query param."""
+        test_user = self.users[0]
+        request = self.factory.get("/api/extras/approval-workflow-stages/")
+        request.user = test_user
+
+        params = {"pending_my_approvals": "false"}
+        pending_qs = get_pending_approval_workflow_stages(test_user, self.queryset)
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset, request=request).qs,
+            self.queryset.filter(approval_workflow_stage_responses__user=test_user).exclude(
+                id__in=pending_qs.values_list("id", flat=True)
+            ),
+            ordered=False,
+        )
+
+        params = {"pending_my_approvals": "true"}
+        # set pending state for active workflow
+        for approval_workflow_stage in self.queryset:
+            if approval_workflow_stage.approval_workflow.active_stage:
+                approval_workflow_stage.state = ApprovalWorkflowStateChoices.PENDING
+                approval_workflow_stage.save()
+
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset, request=request).qs,
+            get_pending_approval_workflow_stages(test_user, self.queryset),
+            ordered=False,
+        )
+
+
+class ApprovalWorkflowStageResponseFilterTestCase(ApprovalWorkflowTestMixin, FilterTestCases.FilterTestCase):
+    """ApprovalWorkflowStageResponseFilterSet Test Case."""
+
+    queryset = ApprovalWorkflowStageResponse.objects.all()
+    filterset = ApprovalWorkflowStageResponseFilterSet
+    generic_filter_tests = (
+        ("id",),
+        ("approval_workflow_stage",),
+        ("user",),
+        ("comments",),
+        ("state",),
+    )
+
+
 class ComputedFieldTestCase(FilterTestCases.FilterTestCase):
     queryset = ComputedField.objects.all()
     filterset = ComputedFieldFilterSet
@@ -909,6 +1331,7 @@ class JobFilterSetTestCase(FilterTestCases.FilterTestCase):
         params = {"dryrun_default": True}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 0)
 
+    @tag("example_app")
     def test_hidden(self):
         params = {"hidden": True}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
@@ -919,13 +1342,7 @@ class JobFilterSetTestCase(FilterTestCases.FilterTestCase):
             self.filterset(params, self.queryset).qs, self.queryset.filter(read_only=True)
         )
 
-    def test_approval_required(self):
-        params = {"approval_required": True}
-        self.assertQuerysetEqualAndNotEmpty(
-            self.filterset(params, self.queryset).qs,
-            self.queryset.filter(approval_required=True),
-        )
-
+    @tag("example_app")
     def test_is_job_hook_receiver(self):
         params = {"is_job_hook_receiver": True}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
@@ -1310,7 +1727,7 @@ class ObjectChangeTestCase(FilterTestCases.FilterTestCase):
         )
 
     def test_changed_object_type_id(self):
-        params = {"changed_object_type_id": ContentType.objects.get(app_label="dcim", model="location").pk}
+        params = {"changed_object_type_id": [ContentType.objects.get(app_label="dcim", model="location").pk]}
         self.assertQuerysetEqualAndNotEmpty(
             self.filterset(params, self.queryset).qs,
             self.queryset.filter(changed_object_type=ContentType.objects.get_for_model(Location)),
@@ -1384,12 +1801,25 @@ class ObjectMetadataTestCase(FilterTestCases.FilterTestCase):
         ct_1_pk, ct_2_pk = self.queryset.values_list("assigned_object_type", flat=True)[:2]
         ct_1 = ContentType.objects.get(pk=ct_1_pk)
         ct_2 = ContentType.objects.get(pk=ct_2_pk)
-        oms = self.queryset.filter(assigned_object_type=ct_1_pk).distinct()
+        # Default ordering for the model is just by metadata_type, so if we have multiple records it's nondeterministic
+        oms = (
+            self.queryset.filter(assigned_object_type=ct_1_pk)
+            .distinct()
+            .order_by("metadata_type", "assigned_object_id")
+        )
         params = {"assigned_object_type": [f"{ct_1.app_label}.{ct_1.model}"]}
-        self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, oms)
-        oms = self.queryset.filter(assigned_object_type=ct_2_pk).distinct()
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset).qs.order_by("metadata_type", "assigned_object_id"), oms
+        )
+        oms = (
+            self.queryset.filter(assigned_object_type=ct_2_pk)
+            .distinct()
+            .order_by("metadata_type", "assigned_object_id")
+        )
         params = {"assigned_object_type": [f"{ct_2.app_label}.{ct_2.model}"]}
-        self.assertQuerysetEqualAndNotEmpty(self.filterset(params, self.queryset).qs, oms)
+        self.assertQuerysetEqualAndNotEmpty(
+            self.filterset(params, self.queryset).qs.order_by("metadata_type", "assigned_object_id"), oms
+        )
 
 
 class RelationshipTestCase(FilterTestCases.FilterTestCase):

nautobot/extras/tests/test_forms.py

@@ -1,4 +1,5 @@
 import json
+from unittest import skip
 import warnings
 
 from django.contrib.auth import get_user_model
@@ -14,15 +15,9 @@ from nautobot.extras.choices import CustomFieldTypeChoices, RelationshipTypeChoi
 from nautobot.extras.forms import (
     ConfigContextFilterForm,
     ConfigContextForm,
-    CustomFieldModelBulkEditFormMixin,
     CustomFieldModelFormMixin,
     JobButtonForm,
-    JobEditForm,
     JobHookForm,
-    RelationshipModelFormMixin,
-    StatusModelBulkEditFormMixin,
-    StatusModelFilterFormMixin,
-    TagsBulkEditFormMixin,
     WebhookForm,
 )
 from nautobot.extras.models import (
@@ -1096,29 +1091,30 @@ class WebhookFormTestCase(TestCase):
         )
 
 
+@skip(reason="Skipping until we have items that need to be deprecated again.")
 class DeprecatedAliasesTestCase(TestCase):
     """Test that deprecated class names still exist, but report a DeprecationWarning when used."""
 
     def test_deprecated_form_mixin_classes(self):
         # Importing these mixin classes doesn't directly warn, but subclassing them does.
-        from nautobot.extras.forms import CustomFieldBulkCreateForm
-        from nautobot.extras.forms.mixins import (
-            AddRemoveTagsForm,
-            CustomFieldBulkEditForm,
-            CustomFieldModelForm,
-            RelationshipModelForm,
-            StatusBulkEditFormMixin,
-            StatusFilterFormMixin,
-        )
+        # from nautobot.extras.forms import CustomFieldBulkCreateForm
+        # from nautobot.extras.forms.mixins import (
+        #     AddRemoveTagsForm,
+        #     CustomFieldBulkEditForm,
+        #     CustomFieldModelForm,
+        #     RelationshipModelForm,
+        #     StatusBulkEditFormMixin,
+        #     StatusFilterFormMixin,
+        # )
 
         for deprecated_form_class, replacement_form_class in (
-            (AddRemoveTagsForm, TagsBulkEditFormMixin),
-            (CustomFieldBulkEditForm, CustomFieldModelBulkEditFormMixin),
-            (CustomFieldBulkCreateForm, CustomFieldModelBulkEditFormMixin),
-            (CustomFieldModelForm, CustomFieldModelFormMixin),
-            (RelationshipModelForm, RelationshipModelFormMixin),
-            (StatusBulkEditFormMixin, StatusModelBulkEditFormMixin),
-            (StatusFilterFormMixin, StatusModelFilterFormMixin),
+            # (AddRemoveTagsForm, TagsBulkEditFormMixin),
+            # (CustomFieldBulkEditForm, CustomFieldModelBulkEditFormMixin),
+            # (CustomFieldBulkCreateForm, CustomFieldModelBulkEditFormMixin),
+            # (CustomFieldModelForm, CustomFieldModelFormMixin),
+            # (RelationshipModelForm, RelationshipModelFormMixin),
+            # (StatusBulkEditFormMixin, StatusModelBulkEditFormMixin),
+            # (StatusFilterFormMixin, StatusModelFilterFormMixin),
         ):
             with self.subTest(msg=f"Replace {deprecated_form_class.__name__} with {replacement_form_class.__name__}"):
                 # Subclassing the deprecated class should raise a DeprecationWarning
@@ -1147,41 +1143,6 @@ class DeprecatedAliasesTestCase(TestCase):
                     self.assertEqual(len(warn_list), 0)
 
 
-class JobEditFormTestCase(TestCase):
-    def test_update_job_with_approval_required_and_has_has_sensitive_variables_is_true(self):
-        form_data = {
-            "grouping_override": True,
-            "grouping": "Overridden grouping",
-            "name_override": True,
-            "name": "Overridden name",
-            "description_override": True,
-            "description": "This is an overridden description.",
-            "enabled": True,
-            "approval_required_override": True,
-            "approval_required": True,
-            "dryrun_default_override": True,
-            "dryrun_default": True,
-            "hidden_override": True,
-            "hidden": True,
-            "soft_time_limit_override": True,
-            "soft_time_limit": 350.1,
-            "time_limit_override": True,
-            "time_limit": 650,
-            "has_sensitive_variables": True,
-            "has_sensitive_variables_override": True,
-            "task_queues": [],
-            "task_queues_override": True,
-        }
-        form = JobEditForm(data=form_data)
-
-        self.assertFalse(form.is_valid())
-        error_msg = json.loads(form.errors.as_json())
-        self.assertEqual(
-            error_msg["approval_required"][0]["message"],
-            "A job that may have sensitive variables cannot be marked as requiring approval",
-        )
-
-
 class ConfigContextFormTestCase(TestCase):
     @override_settings(CONFIG_CONTEXT_DYNAMIC_GROUPS_ENABLED=True)
     def test_with_dynamic_groups(self):