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

nautobot/extras/tests/test_changelog.py

@@ -1,7 +1,7 @@
 import uuid
 
 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 django.utils.html import escape
 from rest_framework import status
@@ -24,8 +24,6 @@ from nautobot.extras.models import CustomField, CustomFieldChoice, DynamicGroup,
 from nautobot.ipam.models import VLAN, VLANGroup
 from nautobot.virtualization.models import Cluster, ClusterType, VirtualMachine, VMInterface
 
-from example_app.signals import EXAMPLE_APP_CUSTOM_FIELD_DEFAULT, EXAMPLE_APP_CUSTOM_FIELD_NAME
-
 
 class ChangeLogViewTest(ModelViewTestCase):
     model = Location
@@ -288,7 +286,10 @@ class ChangeLogAPITest(APITestCase):
         self.tags = Tag.objects.get_for_model(Location)
         self.statuses = Status.objects.get_for_model(Location)
 
+    @tag("example_app")
     def test_create_object(self):
+        from example_app.signals import EXAMPLE_APP_CUSTOM_FIELD_DEFAULT, EXAMPLE_APP_CUSTOM_FIELD_NAME
+
         location_type = LocationType.objects.get(name="Campus")
         data = {
             "name": "Test Location 1",
@@ -318,8 +319,11 @@ class ChangeLogAPITest(APITestCase):
         self.assertEqual(oc.object_data["tags"], sorted([self.tags[0].name, self.tags[1].name]))
         self.assertEqual(oc.user_id, self.user.pk)
 
+    @tag("example_app")
     def test_update_object(self):
         """Test PUT with changelogs."""
+        from example_app.signals import EXAMPLE_APP_CUSTOM_FIELD_DEFAULT, EXAMPLE_APP_CUSTOM_FIELD_NAME
+
         location_type = LocationType.objects.get(name="Campus")
         location = Location.objects.create(
             name="Test Location 1",
@@ -431,9 +435,9 @@ class ChangeLogAPITest(APITestCase):
         self.assertHttpStatus(new_location_response, status.HTTP_201_CREATED)
 
         gql_payload = '{query: object_changes(q: "") { object_repr } }'
-        resp = execute_query(gql_payload, user=self.user).to_dict()
-        self.assertFalse(resp["data"].get("error"))
-        self.assertEqual(first=location_payload["name"], second=resp["data"]["query"][0].get("object_repr", ""))
+        resp = execute_query(gql_payload, user=self.user)
+        self.assertIsNone(resp.errors)
+        self.assertEqual(first=location_payload["name"], second=resp.data["query"][0].get("object_repr", ""))
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_graphql_object_lte_filter(self):
@@ -451,11 +455,11 @@ class ChangeLogAPITest(APITestCase):
         self.assertHttpStatus(new_location_response, status.HTTP_201_CREATED)
 
         gql_payload = f'{{query: object_changes(time__lte: "{time}") {{ object_repr }} }}'
-        resp = execute_query(gql_payload, user=self.user).to_dict()
-        self.assertFalse(resp["data"].get("error"))
-        self.assertIsInstance(resp["data"].get("query"), list)
+        resp = execute_query(gql_payload, user=self.user)
+        self.assertIsNone(resp.errors)
+        self.assertIsInstance(resp.data.get("query"), list)
         # ObjectChangeFactory creates records in the last year only; there shouldn't be any in this filtered response.
-        self.assertEqual(len(resp["data"].get("query")), 0)
+        self.assertEqual(len(resp.data.get("query")), 0)
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_graphql_object_gte_filter(self):
@@ -473,10 +477,10 @@ class ChangeLogAPITest(APITestCase):
         self.assertHttpStatus(new_location_response, status.HTTP_201_CREATED)
 
         gql_payload = f'{{query: object_changes(time__gte: "{time}") {{ object_repr }} }}'
-        resp = execute_query(gql_payload, user=self.user).to_dict()
-        self.assertFalse(resp["data"].get("error"))
-        self.assertIsInstance(resp["data"].get("query"), list)
-        self.assertEqual(first=location_payload["name"], second=resp["data"]["query"][0].get("object_repr", ""))
+        resp = execute_query(gql_payload, user=self.user)
+        self.assertIsNone(resp.errors)
+        self.assertIsInstance(resp.data.get("query"), list)
+        self.assertEqual(first=location_payload["name"], second=resp.data["query"][0].get("object_repr", ""))
 
     def test_change_context(self):
         location_type = LocationType.objects.get(name="Campus")

nautobot/extras/tests/test_customfields.py

@@ -1,11 +1,11 @@
 import json
 import logging
 
-from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db.models import ProtectedError, QuerySet
 from django.forms import ChoiceField, IntegerField, NumberInput
+from django.test import tag
 from django.urls import reverse
 from rest_framework import status
 
@@ -31,6 +31,7 @@ from nautobot.virtualization.models import VirtualMachine
 # TODO: this needs to be both a BaseModelTestCase (as it tests the model class) and a (views) TestCase,
 #       (due to the test_multi_select_field_value_after_bulk_update() test).
 #       At some point we should probably split this into separate classes.
+@tag("example_app")
 class CustomFieldTest(ModelTestCases.BaseModelTestCase, TestCase):
     model = CustomField
 
@@ -397,6 +398,7 @@ class CustomFieldTest(ModelTestCases.BaseModelTestCase, TestCase):
             self.assertIsInstance(filter_field.widget, NumberInput)
 
 
+@tag("example_app")
 class CustomFieldManagerTest(TestCase):
     def setUp(self):
         self.content_type = ContentType.objects.get_for_model(Location)
@@ -569,6 +571,7 @@ class ComputedFieldManagerTestCase(TestCase):
         self.assertQuerysetEqualAndNotEmpty(qs, listing)
 
 
+@tag("example_app")
 class CustomFieldDataAPITest(APITestCase):
     """
     Check that object representations in the REST API include their custom field data.
@@ -693,9 +696,8 @@ class CustomFieldDataAPITest(APITestCase):
             self.cf_json,
         ]
 
-        if "example_app" in settings.PLUGINS:
-            self.cf_plugin_field = CustomField.objects.get(key="example_app_auto_custom_field")
-            self.all_cfs.append(self.cf_plugin_field)
+        self.cf_plugin_field = CustomField.objects.get(key="example_app_auto_custom_field")
+        self.all_cfs.append(self.cf_plugin_field)
         self.statuses = Status.objects.get_for_model(Location)
 
         # Create some locations
@@ -717,8 +719,7 @@ class CustomFieldDataAPITest(APITestCase):
             self.cf_markdown.key: "### Hello world!\n\n- Item 1\n- Item 2\n- Item 3",
             self.cf_json.key: {"hello": "world"},
         }
-        if "example_app" in settings.PLUGINS:
-            self.locations[1]._custom_field_data[self.cf_plugin_field.key] = "Custom value"
+        self.locations[1]._custom_field_data[self.cf_plugin_field.key] = "Custom value"
         self.locations[1].validated_save()
         self.list_url = reverse("dcim-api:location-list")
         self.detail_url = reverse("dcim-api:location-detail", kwargs={"pk": self.locations[1].pk})
@@ -792,8 +793,7 @@ class CustomFieldDataAPITest(APITestCase):
                 self.cf_json.key: {"foo": "bar"},
             },
         }
-        if "example_app" in settings.PLUGINS:
-            data["custom_fields"]["example_app_auto_custom_field"] = "Custom value"
+        data["custom_fields"]["example_app_auto_custom_field"] = "Custom value"
         response = self.client.post(self.list_url, data, format="json", **self.header)
         self.assertHttpStatus(response, status.HTTP_201_CREATED)
 
@@ -865,9 +865,8 @@ class CustomFieldDataAPITest(APITestCase):
             self.cf_markdown.key: "### Heading",
             self.cf_json.key: {"dict1": {"dict2": {}}},
         }
-        if "example_app" in settings.PLUGINS:
-            self.cf_plugin_field = CustomField.objects.get(key="example_app_auto_custom_field")
-            custom_field_data[self.cf_plugin_field.key] = "Custom Value"
+        self.cf_plugin_field = CustomField.objects.get(key="example_app_auto_custom_field")
+        custom_field_data[self.cf_plugin_field.key] = "Custom Value"
         data = (
             {
                 "name": "Location 3",
@@ -1169,6 +1168,7 @@ class CustomFieldDataAPITest(APITestCase):
         self.assertContains(response, "Invalid choice", status_code=status.HTTP_400_BAD_REQUEST)
 
 
+@tag("example_app")
 class CustomFieldImportTest(TestCase):
     """
     Test importing object custom field data along with the object itself.
@@ -2031,6 +2031,7 @@ class CustomFieldFilterTest(TestCase):
         )
 
 
+@tag("example_app")
 class CustomFieldChoiceTest(ModelTestCases.BaseModelTestCase):
     model = CustomFieldChoice
 
@@ -2367,9 +2368,9 @@ class CustomFieldTableTest(TestCase):
             "boolean_field": '<span class="text-success"><i class="mdi mdi-check-bold" title="Yes"></i></span>',
             "date_field": "2020-01-02",
             "url_field": '<a href="http://example.com/2">http://example.com/2</a>',
-            "choice_field": '<span class="label label-default">Bar</span>',
+            "choice_field": '<span class="badge bg-secondary">Bar</span>',
             "multi_choice_field": (
-                '<span class="label label-default">Bar</span> <span class="label label-default">Baz</span>'
+                '<span class="badge bg-secondary">Bar</span> <span class="badge bg-secondary">Baz</span>'
             ),
         }
 

nautobot/extras/tests/test_datasources.py

@@ -502,7 +502,7 @@ class GitTest(TransactionTestCase):
                     )
                     failure_logs.get(
                         grouping="graphql queries",
-                        message__contains="Error processing GraphQL query file 'bad_device_names.gql': Syntax Error GraphQL (4:5) Expected Name, found }",
+                        message__contains="Error processing GraphQL query file 'bad_device_names.gql': Syntax Error: Expected Name, found '}'",
                     )
 
                 except (AssertionError, JobLogEntry.DoesNotExist):

nautobot/extras/tests/test_dynamicgroups.py

@@ -4,9 +4,13 @@ from django.apps import apps
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.db.models import ProtectedError, QuerySet
+from django.test import tag
 from django.urls import reverse
 
-from nautobot.core.forms.fields import MultiMatchModelMultipleChoiceField, MultiValueCharField
+from nautobot.core.forms.fields import (
+    DynamicModelMultipleChoiceField,
+    MultiValueCharField,
+)
 from nautobot.core.forms.widgets import APISelectMultiple, MultiValueCharInput
 from nautobot.core.testing import TestCase
 from nautobot.core.testing.filters import FilterTestCases
@@ -542,9 +546,9 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
         # See if a CharField is properly converted to a MultiValueCharField In DynamicGroupEditForm.
         self.assertIsInstance(fields["name"], MultiValueCharField)
         self.assertIsInstance(fields["name"].widget, MultiValueCharInput)
-        # See if a DynamicModelChoiceField is properly converted to a MultiMatchModelMultipleChoiceField
-        self.assertIsInstance(fields["cluster"], MultiMatchModelMultipleChoiceField)
-        self.assertIsInstance(fields["cluster"].widget, APISelectMultiple)
+        # See if a DynamicModelMultipleChoiceField (ManyToMany) remains as DynamicModelMultipleChoiceField
+        self.assertIsInstance(fields["clusters"], DynamicModelMultipleChoiceField)
+        self.assertIsInstance(fields["clusters"].widget, APISelectMultiple)
 
     def test_map_filter_fields_with_custom_filter_method(self):
         """
@@ -1113,6 +1117,7 @@ class DynamicGroupModelTest(DynamicGroupTestBase):  # TODO: BaseModelTestCase mi
         expected = [str(device)]
         self.assertEqual(sorted(dg.members.values_list("name", flat=True)), expected)
 
+    @tag("example_app")
     def test_group_overloaded_filter_form_field(self):
         """FilterForm fields can overload how they pass in the values."""