Merge branch 'feature' into fix-testing

Author: bctiemann

.github/workflows/lint-tests.yaml

@@ -69,6 +69,7 @@ jobs:
         with:
           repository: "netbox-community/netbox"
           path: netbox
+          ref: feature
       - name: Install netbox-custom-objects
         working-directory: netbox-custom-objects
         run: |

netbox_custom_objects/tests/base.py

@@ -1,6 +1,6 @@
 # Test utilities for netbox_custom_objects plugin
-from django.contrib.contenttypes.models import ContentType
 from django.test import Client
+from core.models import ObjectType
 from extras.models import CustomFieldChoiceSet
 from utilities.testing import create_test_user
 
@@ -61,14 +61,14 @@ def create_choice_set(cls, **kwargs):
         return CustomFieldChoiceSet.objects.create(**defaults)
 
     @classmethod
-    def get_device_content_type(cls):
+    def get_device_object_type(cls):
         """Get the device content type for object field testing."""
-        return ContentType.objects.get(app_label='dcim', model='device')
+        return ObjectType.objects.get(app_label='dcim', model='device')
 
     @classmethod
-    def get_site_content_type(cls):
+    def get_site_object_type(cls):
         """Get the site content type for object field testing."""
-        return ContentType.objects.get(app_label='dcim', model='site')
+        return ObjectType.objects.get(app_label='dcim', model='site')
 
     def create_simple_custom_object_type(self, **kwargs):
         """Create a simple custom object type with basic fields."""
@@ -99,7 +99,7 @@ def create_complex_custom_object_type(self, **kwargs):
         """Create a complex custom object type with various field types."""
         custom_object_type = CustomObjectsTestCase.create_custom_object_type(**kwargs)
         choice_set = CustomObjectsTestCase.create_choice_set()
-        device_content_type = CustomObjectsTestCase.get_device_content_type()
+        device_object_type = CustomObjectsTestCase.get_device_object_type()
 
         # Primary text field
         CustomObjectsTestCase.create_custom_object_type_field(
@@ -145,7 +145,7 @@ def create_complex_custom_object_type(self, **kwargs):
             name="device",
             label="Device",
             type="object",
-            related_object_type=device_content_type
+            related_object_type=device_object_type
         )
 
         return custom_object_type
@@ -169,8 +169,8 @@ def create_self_referential_custom_object_type(self, **kwargs):
     def create_multi_object_custom_object_type(self, **kwargs):
         """Create a custom object type with multi-object fields."""
         custom_object_type = CustomObjectsTestCase.create_custom_object_type(**kwargs)
-        device_content_type = CustomObjectsTestCase.get_device_content_type()
-        site_content_type = CustomObjectsTestCase.get_site_content_type()
+        device_object_type = CustomObjectsTestCase.get_device_object_type()
+        site_object_type = CustomObjectsTestCase.get_site_object_type()
 
         # Primary text field
         CustomObjectsTestCase.create_custom_object_type_field(
@@ -188,7 +188,7 @@ def create_multi_object_custom_object_type(self, **kwargs):
             name="devices",
             label="Devices",
             type="multiobject",
-            related_object_type=device_content_type
+            related_object_type=device_object_type
         )
 
         # Multi-object field (sites)
@@ -197,7 +197,7 @@ def create_multi_object_custom_object_type(self, **kwargs):
             name="sites",
             label="Sites",
             type="multiobject",
-            related_object_type=site_content_type
+            related_object_type=site_object_type
         )
 
         return custom_object_type

netbox_custom_objects/tests/test_field_types.py

@@ -602,7 +602,7 @@ class ObjectFieldTypeTestCase(FieldTypeTestCase):
     def setUp(self):
         """Set up test data."""
         super().setUp()
-        self.device_content_type = self.get_device_content_type()
+        self.device_object_type = self.get_device_object_type()
 
     def test_object_field_creation(self):
         """Test creating an object field."""
@@ -611,11 +611,11 @@ def test_object_field_creation(self):
             name="device",
             label="Device",
             type="object",
-            related_object_type=self.device_content_type
+            related_object_type=self.device_object_type
         )
 
         self.assertEqual(field.type, "object")
-        self.assertEqual(field.related_object_type, self.device_content_type)
+        self.assertEqual(field.related_object_type, self.device_object_type)
 
     def test_object_field_model_generation(self):
         """Test object field model generation."""
@@ -624,7 +624,7 @@ def test_object_field_model_generation(self):
             name="device",
             label="Device",
             type="object",
-            related_object_type=self.device_content_type
+            related_object_type=self.device_object_type
         )
         field  # To silence ruff error
 
@@ -661,7 +661,7 @@ class MultiObjectFieldTypeTestCase(FieldTypeTestCase):
     def setUp(self):
         """Set up test data."""
         super().setUp()
-        self.device_content_type = self.get_device_content_type()
+        self.device_object_type = self.get_device_object_type()
 
     def test_multiobject_field_creation(self):
         """Test creating a multiobject field."""
@@ -670,11 +670,11 @@ def test_multiobject_field_creation(self):
             name="devices",
             label="Devices",
             type="multiobject",
-            related_object_type=self.device_content_type
+            related_object_type=self.device_object_type
         )
 
         self.assertEqual(field.type, "multiobject")
-        self.assertEqual(field.related_object_type, self.device_content_type)
+        self.assertEqual(field.related_object_type, self.device_object_type)
 
     def test_multiobject_field_model_generation(self):
         """Test multiobject field model generation."""
@@ -683,7 +683,7 @@ def test_multiobject_field_model_generation(self):
             name="devices",
             label="Devices",
             type="multiobject",
-            related_object_type=self.device_content_type
+            related_object_type=self.device_object_type
         )
         field  # To silence ruff error
 

netbox_custom_objects/tests/test_models.py

@@ -303,7 +303,7 @@ def test_custom_object_type_field_object_type_validation(self):
             field.full_clean()
 
         # Should not allow related_object_type for non-object field
-        device_ct = self.get_device_content_type()
+        device_ct = self.get_device_object_type()
         with self.assertRaises(ValidationError):
             field = CustomObjectTypeField(
                 custom_object_type=self.custom_object_type,
@@ -463,7 +463,7 @@ def setUpTestData(cls):
             choice_set=choice_set,
         )
 
-        site_ct = cls.get_site_content_type()
+        site_ct = cls.get_site_object_type()
         cls.create_custom_object_type_field(
             cls.custom_object_type,
             name="site",
@@ -472,7 +472,7 @@ def setUpTestData(cls):
             related_object_type=site_ct,
         )
 
-        site_ct = cls.get_site_content_type()
+        site_ct = cls.get_site_object_type()
         cls.create_custom_object_type_field(
             cls.custom_object_type,
             name="sites",
@@ -492,7 +492,7 @@ def setUp(self):
     def test_custom_object_creation(self):
         """Test creating a custom object instance."""
         now = timezone.now()
-        site_ct = self.get_site_content_type()
+        site_ct = self.get_site_object_type()
         site = site_ct.model_class().objects.create()
 
         instance = self.model.objects.create(