From 9e129b0ebfa169f671724bde514191074608d62f Mon Sep 17 00:00:00 2001
From: Daniel Sheppard <dans@dansheps.com>
Date: Wed, 22 Mar 2023 10:03:19 -0500
Subject: [PATCH] #9047 - Fix tests

---
 netbox/circuits/forms/bulk_edit.py       | 13 ++++++++++++-
 netbox/circuits/tests/test_api.py        |  4 ++--
 netbox/circuits/tests/test_filtersets.py | 14 +++++---------
 netbox/circuits/tests/test_views.py      |  2 --
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/netbox/circuits/forms/bulk_edit.py b/netbox/circuits/forms/bulk_edit.py
index eda319e31..7de9fb8d1 100644
--- a/netbox/circuits/forms/bulk_edit.py
+++ b/netbox/circuits/forms/bulk_edit.py
@@ -45,14 +45,25 @@ class ProviderBulkEditForm(NetBoxModelBulkEditForm):
 
 
 class ProviderAccountBulkEditForm(NetBoxModelBulkEditForm):
+    provider = DynamicModelChoiceField(
+        queryset=Provider.objects.all(),
+        required=False
+    )
+    description = forms.CharField(
+        max_length=200,
+        required=False
+    )
     comments = CommentField(
         widget=SmallTextarea,
         label=_('Comments')
     )
 
     model = ProviderAccount
-    fieldsets = ()
+    fieldsets = (
+        (None, ('provider', 'description')),
+    )
     nullable_fields = (
+        'description',
         'comments',
     )
 
diff --git a/netbox/circuits/tests/test_api.py b/netbox/circuits/tests/test_api.py
index 3cbcf0390..efcf59910 100644
--- a/netbox/circuits/tests/test_api.py
+++ b/netbox/circuits/tests/test_api.py
@@ -20,7 +20,7 @@ class ProviderTest(APIViewTestCases.APIViewTestCase):
     model = Provider
     brief_fields = ['circuit_count', 'display', 'id', 'name', 'slug', 'url']
     bulk_update_data = {
-        'account': '1234',
+        'comments': 'New comments',
     }
 
     @classmethod
@@ -199,7 +199,7 @@ class CircuitTerminationTest(APIViewTestCases.APIViewTestCase):
 
 class ProviderAccountTest(APIViewTestCases.APIViewTestCase):
     model = ProviderAccount
-    brief_fields = ['display', 'id', 'name', 'url']
+    brief_fields = ['account', 'display', 'id', 'name', 'url']
 
     @classmethod
     def setUpTestData(cls):
diff --git a/netbox/circuits/tests/test_filtersets.py b/netbox/circuits/tests/test_filtersets.py
index c16b49450..383de9c12 100644
--- a/netbox/circuits/tests/test_filtersets.py
+++ b/netbox/circuits/tests/test_filtersets.py
@@ -25,11 +25,11 @@ class ProviderTestCase(TestCase, ChangeLoggedFilterSetTests):
         ASN.objects.bulk_create(asns)
 
         providers = (
-            Provider(name='Provider 1', slug='provider-1', account='1234'),
-            Provider(name='Provider 2', slug='provider-2', account='2345'),
-            Provider(name='Provider 3', slug='provider-3', account='3456'),
-            Provider(name='Provider 4', slug='provider-4', account='4567'),
-            Provider(name='Provider 5', slug='provider-5', account='5678'),
+            Provider(name='Provider 1', slug='provider-1'),
+            Provider(name='Provider 2', slug='provider-2'),
+            Provider(name='Provider 3', slug='provider-3'),
+            Provider(name='Provider 4', slug='provider-4'),
+            Provider(name='Provider 5', slug='provider-5'),
         )
         Provider.objects.bulk_create(providers)
         providers[0].asns.set([asns[0]])
@@ -87,10 +87,6 @@ class ProviderTestCase(TestCase, ChangeLoggedFilterSetTests):
         params = {'asn_id': [asns[0].pk, asns[1].pk]}
         self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
 
-    def test_account(self):
-        params = {'account': ['1234', '2345']}
-        self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
-
     def test_region(self):
         regions = Region.objects.all()[:2]
         params = {'region_id': [regions[0].pk, regions[1].pk]}
diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py
index 64b475513..735de38a6 100644
--- a/netbox/circuits/tests/test_views.py
+++ b/netbox/circuits/tests/test_views.py
@@ -38,7 +38,6 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             'name': 'Provider X',
             'slug': 'provider-x',
             'asns': [asns[6].pk, asns[7].pk],
-            'account': '1234',
             'comments': 'Another provider',
             'tags': [t.pk for t in tags],
         }
@@ -58,7 +57,6 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
         )
 
         cls.bulk_edit_data = {
-            'account': '5678',
             'comments': 'New comments',
         }