From 25d523b67117994f5b79e4e074073367814c89c4 Mon Sep 17 00:00:00 2001
From: Arthur Hanson <worldnomad@gmail.com>
Date: Tue, 22 Oct 2024 12:19:48 -0700
Subject: [PATCH] fix tests

---
 netbox/circuits/forms/model_forms.py |  3 +++
 netbox/circuits/tests/test_views.py  | 18 +++++++++++++++---
 netbox/dcim/tests/test_filtersets.py |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/netbox/circuits/forms/model_forms.py b/netbox/circuits/forms/model_forms.py
index 0bd66fbda..9988a6ff1 100644
--- a/netbox/circuits/forms/model_forms.py
+++ b/netbox/circuits/forms/model_forms.py
@@ -1,4 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
+from django.core.exceptions import ObjectDoesNotExist
 from django.utils.translation import gettext_lazy as _
 
 from circuits.choices import CircuitCommitRateChoices, CircuitTerminationPortSpeedChoices
@@ -8,9 +9,11 @@ from dcim.models import Site
 from ipam.models import ASN
 from netbox.forms import NetBoxModelForm
 from tenancy.forms import TenancyForm
+from utilities.forms import get_field_value
 from utilities.forms.fields import CommentField, ContentTypeChoiceField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField
 from utilities.forms.rendering import FieldSet, InlineFields, TabbedGroups
 from utilities.forms.widgets import DatePicker, HTMXSelect, NumberWithOptions
+from utilities.templatetags.builtins.filters import bettertitle
 
 __all__ = (
     'CircuitForm',
diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py
index ec20a5435..fde31e3dd 100644
--- a/netbox/circuits/tests/test_views.py
+++ b/netbox/circuits/tests/test_views.py
@@ -1,5 +1,7 @@
 import datetime
+import json
 
+from django.contrib.contenttypes.models import ContentType
 from django.test import override_settings
 from django.urls import reverse
 
@@ -201,16 +203,25 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase):
                 "terminations": [
                   {
                     "term_side": "A",
-                    "site": "Site 1"
+                    "scope_type": "dcim.site",
+                    "scope_id": "1"
                   },
                   {
                     "term_side": "Z",
-                    "site": "Site 1"
+                    "scope_type": "dcim.site",
+                    "scope_id": "1"
                   }
                 ]
               }
             ]
         """
+
+        # Fix up the scope site id
+        site = Site.objects.first()
+        data = json.loads(json_data)
+        data[0]["terminations"][0]["scope_id"] = data[0]["terminations"][1]["scope_id"] = site.id
+        json_data = json.dumps(data)
+
         initial_count = self._get_queryset().count()
         data = {
             'data': json_data,
@@ -370,7 +381,8 @@ class CircuitTerminationTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         cls.form_data = {
             'circuit': circuits[2].pk,
             'term_side': 'A',
-            'site': sites[2].pk,
+            'scope_type': ContentType.objects.get_for_model(Site).pk,
+            'scope': sites[2].pk,
             'description': 'New description',
         }
 
diff --git a/netbox/dcim/tests/test_filtersets.py b/netbox/dcim/tests/test_filtersets.py
index d19c51564..582086153 100644
--- a/netbox/dcim/tests/test_filtersets.py
+++ b/netbox/dcim/tests/test_filtersets.py
@@ -5117,7 +5117,7 @@ class CableTestCase(TestCase, ChangeLoggedFilterSetTests):
         provider = Provider.objects.create(name='Provider 1', slug='provider-1')
         circuit_type = CircuitType.objects.create(name='Circuit Type 1', slug='circuit-type-1')
         circuit = Circuit.objects.create(cid='Circuit 1', provider=provider, type=circuit_type)
-        circuit_termination = CircuitTermination.objects.create(circuit=circuit, term_side='A', site=sites[0])
+        circuit_termination = CircuitTermination.objects.create(circuit=circuit, term_side='A', scope=sites[0])
 
         # Cables
         cables = (