nautobot 3.0.0a2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/extras/tests/integration/test_configcontextschema.py

@@ -1,5 +1,4 @@
 from django.contrib.contenttypes.models import ContentType
-from django.test import tag
 
 from nautobot.core.testing.integration import ObjectDetailsMixin, ObjectsListMixin, SeleniumTestCase
 from nautobot.dcim.models import Device, DeviceType, Location, LocationType, Manufacturer
@@ -16,7 +15,6 @@ class ConfigContextSchemaTestCase(SeleniumTestCase, ObjectDetailsMixin, ObjectsL
         super().setUp()
         self.login_as_superuser()
 
-    @tag("fix_in_v3")
     def test_create_valid_config_context_schema(self):
         """
         Given a clean slate, navigate to and fill out the form for a valid schema object
@@ -34,13 +32,12 @@ class ConfigContextSchemaTestCase(SeleniumTestCase, ObjectDetailsMixin, ObjectsL
         self.fill_input("name", "Integration Schema 1")
         self.fill_input("description", "Description")
         self.fill_input("data_schema", '{"type": "object", "properties": {"a": {"type": "string"}}}')
-        self.browser.find_by_text("Create").click()
+        self.browser.find_by_xpath("//button[normalize-space()='Create']").click()
 
         # Verify form redirect
         self.assertTrue(self.browser.is_text_present("Created config context schema Integration Schema 1"))
         self.assertTrue(self.browser.is_text_present("Edit"))
 
-    @tag("fix_in_v3")
     def test_create_invalid_config_context_schema(self):
         """
         Given a clean slate, navigate to and fill out the form for an invalid schema object
@@ -61,14 +58,13 @@ class ConfigContextSchemaTestCase(SeleniumTestCase, ObjectDetailsMixin, ObjectsL
         self.fill_input("name", "Integration Schema 2")
         self.fill_input("description", "Description")
         self.fill_input("data_schema", '{"type": "object", "properties": {"a": {"type": "not a valid type"}}}')
-        self.browser.find_by_text("Create").click()
+        self.browser.find_by_xpath("//button[normalize-space()='Create']").click()
 
         # Verify validation error raised to user within form
         self.assertTrue(self.browser.is_text_present("'not a valid type' is not valid under any of the given schemas"))
         self.assertTrue(self.browser.is_text_present("Add a new config context schema"))
         self.assertEqual(self.browser.find_by_name("name").first.value, "Integration Schema 2")
 
-    @tag("fix_in_v3")
     def test_validation_tab(self):
         """
         Given a config context schema that is assigned to a config context, and device, and a VM with valid context data
@@ -137,60 +133,65 @@ class ConfigContextSchemaTestCase(SeleniumTestCase, ObjectDetailsMixin, ObjectsL
 
         # Assert Validation states
         self.assertEqual(
-            len(self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")), 3
+            len(self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")), 3
         )  # 3 rows (config context, device, virtual machine)
-        for row in self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr"):
+        for row in self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr"):
             self.assertEqual(
                 row.find_by_tag("td")[-2].html,
-                '<span class="text-success"><i class="mdi mdi-check-bold" title="" data-original-title="Yes"></i></span>',
+                '<span class="text-success"><i class="mdi mdi-check-bold" title="Yes"></i></span>',
             )
 
         # Edit the schema
-        self.browser.links.find_by_partial_text("Edit").click()
+        self.switch_tab("Config Context")
+        self.click_button("#edit-button")
         # Change property "a" to be type string
         self.fill_input(
             "data_schema",
             '{"type": "object", "properties": {"a": {"type": "string"}, "b": {"type": "integer"}, "c": {"type": "integer"}}, "additionalProperties": false}',
         )
-        self.browser.find_by_text("Update").click()
+        self.browser.find_by_xpath("//button[normalize-space()='Update']").click()
 
         # Navigate to ConfigContextSchema Validation tab
-        self.browser.links.find_by_text("Validation").click()
+        self.switch_tab("Validation")
 
         # Assert Validation states
         self.assertEqual(
-            len(self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")), 3
+            len(self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")), 3
         )  # 3 rows (config context, device, virtual machine)
-        for row in self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr"):
+        for row in self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr"):
             self.assertEqual(
                 row.find_by_tag("td")[-2].html,
-                '<span class="text-danger"><i class="mdi mdi-close-thick" title="" data-original-title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
+                '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
             )
 
         # Edit the device local context data and redirect back to the validation tab
-        self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[1].find_by_tag("td")[
-            -1
-        ].find_by_tag("a").click()
+        self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")[1].find_by_tag("td")[-1].find_by_tag(
+            "button"
+        ).click()
+        menu = self.browser.find_by_xpath("//ul[contains(@class, 'dropdown-menu') and contains(@class, 'show')]")
+        menu.is_visible(wait_time=5)
+        menu.find_by_tag("a").click()
+
         # Update the property "a" to be a string
         self.fill_input("local_config_context_data", '{"a": "foo", "b": 456, "c": 777}')
-        self.browser.find_by_text("Update").click()
+        self.browser.find_by_xpath("//button[normalize-space()='Update']").click()
 
         # Assert Validation states
         self.assertEqual(
-            len(self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")), 3
+            len(self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")), 3
         )  # 3 rows (config context, device, virtual machine)
         # Config context still fails
         self.assertEqual(
-            self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[0].find_by_tag("td")[-2].html,
-            '<span class="text-danger"><i class="mdi mdi-close-thick" title="" data-original-title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
+            self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")[0].find_by_tag("td")[-2].html,
+            '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
         )
         # Device now passes
         self.assertEqual(
-            self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[1].find_by_tag("td")[-2].html,
-            '<span class="text-success"><i class="mdi mdi-check-bold" title="" data-original-title="Yes"></i></span>',
+            self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")[1].find_by_tag("td")[-2].html,
+            '<span class="text-success"><i class="mdi mdi-check-bold" title="Yes"></i></span>',
         )
         # Virtual machine still fails
         self.assertEqual(
-            self.browser.find_by_xpath("//div[@class[contains(., 'panel')]]//tbody/tr")[2].find_by_tag("td")[-2].html,
-            '<span class="text-danger"><i class="mdi mdi-close-thick" title="" data-original-title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
+            self.browser.find_by_xpath("//div[@class[contains(., 'card')]]//tbody/tr")[2].find_by_tag("td")[-2].html,
+            '<span class="text-danger"><i class="mdi mdi-close-thick" title="No"></i></span><span class="text-danger">123 is not of type \'string\'</span>',
         )

nautobot/extras/tests/integration/test_customfields.py

@@ -1,5 +1,4 @@
 from django.contrib.contenttypes.models import ContentType
-from django.test import tag
 from django.urls import reverse
 from selenium.webdriver.common.keys import Keys
 
@@ -111,7 +110,11 @@ class CustomFieldTestCase(SeleniumTestCase, ObjectDetailsMixin):
             self.assertEqual(len(table.find_by_css(".formset_row-custom_field_choices")), 5)
 
             # And 6 after clicking "Add another..."
-            self.browser.find_by_css(".add-row").click()
+            self.click_button(".add-row")
+            # Before proceeding with further assertions and interactions, wait for the 6th row to appear in the DOM.
+            self.browser.is_element_present_by_css(
+                "#custom-field-choices .formset_row-custom_field_choices:nth-of-type(6)", wait_time=5
+            )
             rows = table.find_by_css(".formset_row-custom_field_choices")
             self.assertEqual(len(rows), 6)
             self.fill_input("custom_field_choices-5-value", "choice3")
@@ -157,7 +160,6 @@ class CustomFieldTestCase(SeleniumTestCase, ObjectDetailsMixin):
         self.assertTrue(self.browser.is_text_present("Modified custom field"))
         self.assertTrue(self.browser.is_text_present("new_choice"))
 
-    @tag("fix_in_v3")
     def test_update_type_select_create_delete_choices(self):
         """
         Test edit existing field, deleting first choice, adding a new row and saving that as a new choice.
@@ -172,13 +174,13 @@ class CustomFieldTestCase(SeleniumTestCase, ObjectDetailsMixin):
 
         # Gather the rows, delete the first one, add a new one.
         table = self.browser.find_by_id("custom-field-choices")
-        self.browser.find_by_css(".add-row").click()  # Add a new row
+        self.click_button(".add-row")  # Add a new row
         rows = table.find_by_css(".formset_row-custom_field_choices")
         rows.first.find_by_css(".delete-row").click()  # Delete first row
 
         # Fill the new row, save it, assert correctness.
         self.fill_input("custom_field_choices-5-value", "new_choice")  # Fill the last row
-        self.browser.find_by_text("Update").click()
+        self.browser.find_by_xpath("//button[normalize-space()='Update']").click()
         self.assertEqual(self.browser.url, detail_url)
         self.assertTrue(self.browser.is_text_present("Modified custom field"))
         self.assertTrue(self.browser.is_text_present("new_choice"))
@@ -252,7 +254,6 @@ class CustomFieldTestCase(SeleniumTestCase, ObjectDetailsMixin):
         # Confirm the JSON data is visible
         self.assertTrue(self.browser.is_text_present("Test JSON Value"))
 
-    @tag("fix_in_v3")
     def test_json_type_with_invalid_json(self):
         """
         This test creates a custom field with a type of "json".
@@ -274,7 +275,7 @@ class CustomFieldTestCase(SeleniumTestCase, ObjectDetailsMixin):
         active_web_element = self.browser.driver.switch_to.active_element
         # Type invalid JSON data into the form
         active_web_element.send_keys('{test_json_key: "Test Invalid JSON Value"}')
-        self.browser.find_by_xpath(".//button[contains(text(), 'Update')]").click()
+        self.browser.find_by_xpath("//button[normalize-space()='Update']").click()
         self.assertTrue(self.browser.is_text_present("Enter a valid JSON"))
 
     def test_saving_object_after_its_custom_field_deleted(self):
@@ -303,9 +304,7 @@ class CustomFieldTestCase(SeleniumTestCase, ObjectDetailsMixin):
         # Visit the device edit page
         self.browser.visit(f"{self.live_server_url}{reverse('dcim:device_edit', kwargs={'pk': device.pk})}")
         # Get the first item selected on the custom field
-        self.browser.execute_script(
-            'document.querySelector(\'label:has(+ * [name="cf_test_selection_field"])\').scrollIntoView({ behavior: "instant" });'
-        )
+        self.scroll_element_into_view(css='label:has(+ * [name="cf_test_selection_field"])')
         self.browser.find_by_xpath(".//label[contains(text(), 'Device Selection Field')]").click()
         active_web_element = self.browser.driver.switch_to.active_element
         active_web_element.send_keys(Keys.ENTER)

nautobot/extras/tests/integration/test_dynamicgroups.py

@@ -1,16 +1,15 @@
 from django.contrib.contenttypes.models import ContentType
-from django.test import tag
 from django.urls import reverse
 from selenium.webdriver.common.keys import Keys
 
-from nautobot.core.testing.integration import SeleniumTestCase
+from nautobot.core.testing.integration import ObjectsListMixin, SeleniumTestCase
 from nautobot.dcim.models import Device
 from nautobot.extras.models import DynamicGroup
 
 from . import create_test_device
 
 
-class DynamicGroupTestCase(SeleniumTestCase):
+class DynamicGroupTestCase(SeleniumTestCase, ObjectsListMixin):
     """
     Integration test to check nautobot.extras.models.DynamicGroup add/edit functionality.
     """
@@ -19,7 +18,6 @@ class DynamicGroupTestCase(SeleniumTestCase):
         super().setUp()
         self.login_as_superuser()
 
-    @tag("fix_in_v3")
     def test_create_and_update(self):
         """
         Test initial add and then update of a new DynamicGroup
@@ -32,7 +30,7 @@ class DynamicGroupTestCase(SeleniumTestCase):
         self.click_navbar_entry("Organization", "Dynamic Groups")
 
         # Click add button
-        self.browser.find_by_id("add-button").click()
+        self.click_add_item()
 
         # Fill out the form.
         name = "devices-active"
@@ -40,19 +38,20 @@ class DynamicGroupTestCase(SeleniumTestCase):
         self.browser.select("content_type", ct_label)
 
         # Click that "Create" button
-        self.browser.find_by_text("Create").click()
+        self.click_edit_form_create_button()
 
         # Verify form redirect and presence of content.
         self.assertTrue(self.browser.is_text_present(f"Created dynamic group {name}"))
         self.assertTrue(self.browser.is_text_present("Edit"))
 
         # Edit the newly created DynamicGroup (Click that "Edit" button)
-        self.browser.find_by_id("edit-button").click()
+        self.click_button("#edit-button")
 
         # Find the "Status" dynamic multi-select and type into it. Xpath is used
         # to find the next "input" after the "status" select field.
         status_field = self.browser.find_by_name("filter-status").first
         status_input = status_field.find_by_xpath("./following::input[1]").first
+        self.scroll_element_into_view(element=status_input)
         status_input.click()  # Force focus on the input field to bring it on-screen
 
         # Fill in "Status: Active".
@@ -61,7 +60,7 @@ class DynamicGroupTestCase(SeleniumTestCase):
         status_input.type(Keys.ENTER)
 
         # Click that "Update" button
-        self.browser.find_by_text("Update").click()
+        self.browser.find_by_xpath("//button[normalize-space()='Update']").click()
 
         # Verify form redirect and presence of content.
         self.assertTrue(self.browser.is_text_present(f"Modified dynamic group {name}"))
@@ -69,8 +68,12 @@ class DynamicGroupTestCase(SeleniumTestCase):
 
         # And just a cursory check to make sure that the filter worked.
         group = DynamicGroup.objects.get(name=name)
-        self.assertEqual(group.count, Device.objects.filter(status__name="Active").count())
         self.assertEqual(group.filter, {"status": ["Active"]})
+        # Because we don't auto-refresh the members on UI create/update any more:
+        # TODO: a more complete integration test could click the "Refresh Members" JobButton, wait until the job completes,
+        #       and so forth, rather than doing so programmatically here:
+        group.update_cached_members()
+        self.assertEqual(group.count, Device.objects.filter(status__name="Active").count())
 
         # Verify dynamic group shows up on device detail tab
         self.browser.visit(

nautobot/extras/tests/integration/test_plugin_banner.py

@@ -1,6 +1,9 @@
+from django.test import tag
+
 from nautobot.core.testing.integration import SeleniumTestCase
 
 
+@tag("example_app")
 class PluginBannerTestCase(SeleniumTestCase):
     """Integration test for rendering of plugin-injected banner content."""
 

nautobot/extras/tests/integration/test_plugins.py

@@ -3,7 +3,7 @@ import os
 import tempfile
 
 from django.contrib.contenttypes.models import ContentType
-from django.test import override_settings
+from django.test import override_settings, tag
 from django.urls import reverse
 
 from nautobot.circuits.models import (
@@ -18,9 +18,8 @@ from nautobot.extras.choices import WebhookHttpMethodChoices
 from nautobot.extras.context_managers import web_request_context
 from nautobot.extras.models import Status, Webhook
 
-from example_app.models import ExampleModel
-
 
+@tag("example_app")
 class AppWebhookTest(SeleniumTestCase):
     """
     This test case proves that Apps can use the webhook functions when making changes on a model.
@@ -28,6 +27,9 @@ class AppWebhookTest(SeleniumTestCase):
 
     def setUp(self):
         super().setUp()
+
+        from example_app.models import ExampleModel
+
         tempdir = tempfile.gettempdir()
         for f in os.listdir(tempdir):
             if f.startswith("test_app_webhook_"):
@@ -61,6 +63,8 @@ class AppWebhookTest(SeleniumTestCase):
         """
         Test that webhooks are correctly triggered by an App model create.
         """
+        from example_app.models import ExampleModel
+
         self.update_headers("test_app_webhook_create")
         # Make change to model
         with web_request_context(self.user):
@@ -73,6 +77,8 @@ class AppWebhookTest(SeleniumTestCase):
         """
         Test that webhooks are correctly triggered by an App model update.
         """
+        from example_app.models import ExampleModel
+
         self.update_headers("test_app_webhook_update")
         obj = ExampleModel.objects.create(name="foo", number=100)
 
@@ -88,6 +94,8 @@ class AppWebhookTest(SeleniumTestCase):
         """
         Test that webhooks are correctly triggered by an App model delete.
         """
+        from example_app.models import ExampleModel
+
         self.update_headers(os.path.join(tempfile.gettempdir(), "test_app_webhook_delete"))
         obj = ExampleModel.objects.create(name="foo", number=100)
 
@@ -102,6 +110,8 @@ class AppWebhookTest(SeleniumTestCase):
         """
         Verify that webhook body_template is correctly used.
         """
+        from example_app.models import ExampleModel
+
         self.update_headers("test_app_webhook_with_body")
 
         self.webhook.body_template = '{"message": "{{ event }}"}'
@@ -117,6 +127,7 @@ class AppWebhookTest(SeleniumTestCase):
         os.remove(os.path.join(tempfile.gettempdir(), "test_app_webhook_with_body"))
 
 
+@tag("example_app")
 class AppDocumentationTest(SeleniumTestCase):
     """
     Integration tests for ensuring App provided docs are supported.
@@ -129,16 +140,16 @@ class AppDocumentationTest(SeleniumTestCase):
     def test_object_edit_help_provided(self):
         """The ExampleModel object provides model documentation, this test ensures the help link is rendered."""
         self.browser.visit(f"{self.live_server_url}{reverse('plugins:example_app:examplemodel_add')}")
-
-        self.assertTrue(self.browser.links.find_by_partial_href("example_app/docs/models/examplemodel.html"))
+        self.assertTrue(self.browser.links.find_by_partial_href("docs/example-app/models/examplemodel.html"))
 
     def test_object_edit_help_not_provided(self):
         """The AnotherExampleModel object doesn't provide model documentation, this test ensures no help link is provided."""
         self.browser.visit(f"{self.live_server_url}{reverse('plugins:example_app:anotherexamplemodel_add')}")
 
-        self.assertFalse(self.browser.links.find_by_partial_href("example_app/docs/models/anotherexamplemodel.html"))
+        self.assertFalse(self.browser.links.find_by_partial_href("/docs/example-app/models/anotherexamplemodel.html"))
 
 
+@tag("example_app")
 class AppReturnUrlTestCase(SeleniumTestCase):
     """
     Integration tests for reversing App return urls.
@@ -159,6 +170,7 @@ class AppReturnUrlTestCase(SeleniumTestCase):
         self.assertEqual(element["href"], f"{self.live_server_url}{reverse('plugins:example_app:examplemodel_list')}")
 
 
+@tag("example_app")
 class AppTabsTestCase(SeleniumTestCase, ObjectDetailsMixin):
     """
     Integration tests for extra object detail UI tabs.

nautobot/extras/tests/integration/test_relationships.py

@@ -1,5 +1,4 @@
 from django.contrib.contenttypes.models import ContentType
-from django.test import tag
 from django.urls import reverse
 
 from nautobot.core.testing.integration import ObjectDetailsMixin, SeleniumTestCase
@@ -19,7 +18,6 @@ class RelationshipsTestCase(SeleniumTestCase, ObjectDetailsMixin):
         super().setUp()
         self.login_as_superuser()
 
-    @tag("fix_in_v3")
     def test_relationship_advanced_ui(self):
         """
         This test creates a device and a relationship for that device.

nautobot/extras/tests/test_api.py

@@ -10,7 +10,7 @@ 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
+from django.test import override_settings, tag
 from django.urls import reverse
 from django.utils.timezone import make_aware, now
 from rest_framework import status
@@ -144,7 +144,7 @@ class ApprovalWorkflowStageTest(
 
         cls.approval_workflow_definitions = [
             ApprovalWorkflowDefinition.objects.create(
-                name=f"Test Approval Workflow {i}", model_content_type=cls.scheduledjob_ct, priority=i
+                name=f"Test Approval Workflow {i}", model_content_type=cls.scheduledjob_ct, weight=i
             )
             for i in range(4)
         ]
@@ -160,7 +160,7 @@ class ApprovalWorkflowStageTest(
         cls.approval_workflow_stage_definitions = [
             ApprovalWorkflowStageDefinition.objects.create(
                 approval_workflow_definition=cls.approval_workflow_definitions[i],
-                weight=i * 100,
+                sequence=i * 100,
                 name=f"Test Approval Workflow Stage {i} Definition",
                 min_approvers=1,
                 denial_message="Stage Denial Message",
@@ -403,7 +403,7 @@ class ApprovalWorkflowStageTest(
 
                 approval_workflow_stage_definition_2 = ApprovalWorkflowStageDefinition.objects.create(
                     approval_workflow_definition=approval_workflow.approval_workflow_definition,
-                    weight=200,
+                    sequence=200,
                     name="Approval Workflow Stage Definition 2",
                     min_approvers=1,
                     denial_message="Stage 2 Denial Message",
@@ -496,7 +496,7 @@ class ApprovalWorkflowStageTest(
 
                 approval_workflow_stage_definition_2 = ApprovalWorkflowStageDefinition.objects.create(
                     approval_workflow_definition=approval_workflow.approval_workflow_definition,
-                    weight=200,
+                    sequence=200,
                     name="Approval Workflow Stage Definition 2",
                     min_approvers=1,
                     denial_message="Stage 2 Denial Message",
@@ -645,7 +645,7 @@ class ApprovalWorkflowStageTest(
         approver_group_2 = Group.objects.create(name="Approver Group 2")
         approval_workflow_stage_definition_approver_group_2 = ApprovalWorkflowStageDefinition.objects.create(
             approval_workflow_definition=self.approval_workflow_definitions[3],
-            weight=100,
+            sequence=100,
             name="Test Approval Workflow Stage 1 Definition",
             min_approvers=1,
             denial_message="Stage Denial Message",
@@ -986,6 +986,9 @@ class ContactTest(APIViewTestCases.APIViewTestCase):
     bulk_update_data = {
         "address": "Carnegie Hall, New York, NY",
     }
+    validation_excluded_fields = [
+        "teams",  # M2M field, excluded by default
+    ]
 
     @classmethod
     def setUpTestData(cls):
@@ -1793,6 +1796,7 @@ class GitRepositoryTest(APIViewTestCases.APIViewTestCase):
         self.assertEqual(response.data["message"], f"Repository {self.repos[0].name} sync job added to queue.")
         self.assertIsInstance(response.data["job_result"], dict)
 
+    @tag("example_app")
     def test_create_with_app_provided_contents(self):
         """Test that `provided_contents` published by an App works."""
         self.add_permissions("extras.add_gitrepository")
@@ -2215,7 +2219,7 @@ class JobTest(
         ApprovalWorkflowDefinition.objects.create(
             name="Test Approval Workflow Definition 1",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
 
         # Do the stuff.
@@ -2248,6 +2252,69 @@ class JobTest(
         self.assertTrue(schedule.approval_required)
         self.assertEqual(schedule.kwargs["var4"], str(device_role.pk))
 
+    @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
+    @mock.patch("nautobot.extras.api.views.get_worker_count")
+    @mock.patch("nautobot.extras.models.jobs.JobResult.enqueue_job")
+    def test_run_job_filtered_approval(self, mock_enqueue_job, mock_get_worker_count):
+        """
+        Run a job with a defined approval workflow whose filter should or should not include it.
+        """
+        workflow = ApprovalWorkflowDefinition(
+            name="Test Approval Workflow Definition 1",
+            model_content_type=ContentType.objects.get_for_model(ScheduledJob),
+            weight=0,
+            model_constraints={"job_model__job_class_name": "APITestJob"},
+        )
+        workflow.validated_save()
+
+        # Do the stuff.
+        mock_get_worker_count.return_value = 1
+        self.add_permissions("extras.run_job")
+        device_role = Role.objects.get_for_model(Device).first()
+        job_data = {
+            "var1": "FooBar",
+            "var2": 123,
+            "var3": False,
+            "var4": device_role.pk,
+        }
+
+        data = {
+            "data": job_data,
+            # schedule is omitted
+        }
+
+        url = self.get_run_url()
+        response = self.client.post(url, data, format="json", **self.header)
+        self.assertHttpStatus(response, self.run_success_response_status)
+
+        # Assert that a JobResult for this job was NOT created.
+        self.assertFalse(JobResult.objects.filter(name=self.job_model.name).exists())
+
+        # Assert that we have an immediate ScheduledJob and that it matches the job_model.
+        schedule = ScheduledJob.objects.last()
+        self.assertIsNotNone(schedule)
+        self.assertEqual(schedule.interval, JobExecutionType.TYPE_FUTURE)
+        self.assertTrue(schedule.approval_required)
+        self.assertEqual(schedule.kwargs["var4"], str(device_role.pk))
+        mock_enqueue_job.assert_not_called()
+
+        # Change the workflow definition so that it no longer applies to this job model
+        workflow.model_constraints = {"job_model__job_class_name__istartswith": "SomeOtherJob"}
+        workflow.validated_save()
+
+        mock_enqueue_job.return_value = None
+        deserialized_data = self.job_class.deserialize_data(job_data)
+        response = self.client.post(url, data, format="json", **self.header)
+        self.assertHttpStatus(response, self.run_success_response_status)
+        expected_enqueue_job_args = (self.job_model, self.user)
+        expected_enqueue_job_kwargs = {
+            "job_queue": self.job_model.default_job_queue,
+            **self.job_class.serialize_data(deserialized_data),
+        }
+        mock_enqueue_job.assert_called_with(*expected_enqueue_job_args, **expected_enqueue_job_kwargs)
+        # No new scheduled job should be created
+        self.assertEqual(schedule, ScheduledJob.objects.last())
+
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     @mock.patch("nautobot.extras.api.views.get_worker_count")
     @mock.patch("nautobot.extras.models.jobs.JobResult.enqueue_job")
@@ -2481,13 +2548,14 @@ class JobTest(
             "Unable to schedule job: Job may have sensitive input variables",
         )
 
+    @tag("example_app")
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     @mock.patch("nautobot.extras.api.views.get_worker_count")
     def test_run_a_job_with_sensitive_variables_when_approval_workflow_defined(self, mock_get_worker_count):
         ApprovalWorkflowDefinition.objects.create(
             name="Test Approval Workflow Definition 1",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
 
         mock_get_worker_count.return_value = 1
@@ -2702,7 +2770,7 @@ class JobTest(
         ApprovalWorkflowDefinition.objects.create(
             name="Test Approval Workflow Definition 1",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
 
         mock_get_worker_count.return_value = 1
@@ -2802,7 +2870,7 @@ class JobTest(
         ApprovalWorkflowDefinition.objects.create(
             name="Approval Definition",
             model_content_type=ContentType.objects.get_for_model(ScheduledJob),
-            priority=0,
+            weight=0,
         )
 
         start_time = now() + timedelta(minutes=1)
@@ -3274,6 +3342,7 @@ class UserSavedViewAssociationTest(APIViewTestCases.APIViewTestCase):
 class ScheduledJobTest(
     APIViewTestCases.GetObjectViewTestCase,
     APIViewTestCases.ListObjectsViewTestCase,
+    APIViewTestCases.DeleteObjectViewTestCase,
 ):
     model = ScheduledJob
     choices_fields = []
@@ -4744,9 +4813,9 @@ class TagTest(APIViewTestCases.APIViewTestCase):
         data = {**self.create_data[0], "content_types": [Manufacturer._meta.label_lower]}
         response = self.client.post(self._get_list_url(), data, format="json", **self.header)
 
-        tag = Tag.objects.filter(name=data["name"])
+        tags = Tag.objects.filter(name=data["name"])
         self.assertHttpStatus(response, 400)
-        self.assertFalse(tag.exists())
+        self.assertFalse(tags.exists())
         self.assertIn(f"Invalid content type: {Manufacturer._meta.label_lower}", response.data["content_types"])
 
     def test_create_tags_without_content_types(self):
@@ -4783,9 +4852,9 @@ class TagTest(APIViewTestCases.APIViewTestCase):
         """Test updating a tag without changing its content-types."""
         self.add_permissions("extras.change_tag")
 
-        tag = Tag.objects.exclude(content_types=ContentType.objects.get_for_model(Location)).first()
-        tag_content_types = list(tag.content_types.all())
-        url = self._get_detail_url(tag)
+        tag_instance = Tag.objects.exclude(content_types=ContentType.objects.get_for_model(Location)).first()
+        tag_content_types = list(tag_instance.content_types.all())
+        url = self._get_detail_url(tag_instance)
         data = {"color": ColorChoices.COLOR_LIME}
 
         response = self.client.patch(url, data, format="json", **self.header)
@@ -4795,9 +4864,9 @@ class TagTest(APIViewTestCases.APIViewTestCase):
             sorted(response.data["content_types"]), sorted([f"{ct.app_label}.{ct.model}" for ct in tag_content_types])
         )
 
-        tag.refresh_from_db()
-        self.assertEqual(tag.color, ColorChoices.COLOR_LIME)
-        self.assertEqual(list(tag.content_types.all()), tag_content_types)
+        tag_instance.refresh_from_db()
+        self.assertEqual(tag_instance.color, ColorChoices.COLOR_LIME)
+        self.assertEqual(list(tag_instance.content_types.all()), tag_content_types)
 
 
 #
@@ -4810,6 +4879,9 @@ class TeamTest(APIViewTestCases.APIViewTestCase):
     bulk_update_data = {
         "address": "Carnegie Hall, New York, NY",
     }
+    validation_excluded_fields = [
+        "contacts",  # M2M field, excluded by default
+    ]
 
     @classmethod
     def setUpTestData(cls):