From a9ce58538daba6f29eba9eec4eaf7e56f24edf44 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Thu, 20 Oct 2022 17:58:54 -0700
Subject: [PATCH] 7961 update tests

---
 netbox/circuits/tests/test_views.py | 28 ++++++++++++++++++++++++++++
 netbox/utilities/testing/views.py   | 10 +++-------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/netbox/circuits/tests/test_views.py b/netbox/circuits/tests/test_views.py
index 9644c0b02..afb16ddc7 100644
--- a/netbox/circuits/tests/test_views.py
+++ b/netbox/circuits/tests/test_views.py
@@ -50,6 +50,13 @@ class ProviderTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "Provider 6,provider-6",
         )
 
+        cls.csv_update_data = (
+            "name,comments",
+            "Provider 7,New comment7",
+            "Provider 8,New comment8",
+            "Provider 9,New comment9",
+        )
+
         cls.bulk_edit_data = {
             'account': '5678',
             'comments': 'New comments',
@@ -84,6 +91,13 @@ class CircuitTypeTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
             "Circuit Type 6,circuit-type-6",
         )
 
+        cls.csv_update_data = (
+            "name,description",
+            "Circuit Type 7,New description7",
+            "Circuit Type 8,New description8",
+            "Circuit Type 9,New description9",
+        )
+
         cls.bulk_edit_data = {
             'description': 'Foo',
         }
@@ -136,6 +150,13 @@ class CircuitTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "Circuit 6,Provider 1,Circuit Type 1,active",
         )
 
+        cls.csv_update_data = (
+            f"cid,description,status",
+            f"Circuit 7,New description7,{CircuitStatusChoices.STATUS_DECOMMISSIONED}",
+            f"Circuit 8,New description8,{CircuitStatusChoices.STATUS_DECOMMISSIONED}",
+            f"Circuit 9,New description9,{CircuitStatusChoices.STATUS_DECOMMISSIONED}",
+        )
+
         cls.bulk_edit_data = {
             'provider': providers[1].pk,
             'type': circuittypes[1].pk,
@@ -182,6 +203,13 @@ class ProviderNetworkTestCase(ViewTestCases.PrimaryObjectViewTestCase):
             "Provider Network 6,Provider 1,Baz",
         )
 
+        cls.csv_update_data = (
+            "name,description",
+            "Provider Network 7,New description7",
+            "Provider Network 8,New description8",
+            "Provider Network 9,New description9",
+        )
+
         cls.bulk_edit_data = {
             'provider': providers[1].pk,
             'description': 'New description',
diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py
index e66adf348..1617e7a97 100644
--- a/netbox/utilities/testing/views.py
+++ b/netbox/utilities/testing/views.py
@@ -549,17 +549,13 @@ class ViewTestCases:
             return '\n'.join(self.csv_data)
 
         def _get_update_csv_data(self, start):
-            # bulk_edit_data is dict, convert to comma-separated string
-            header = ",".join(self.bulk_edit_data.keys())
-            update_line = ",".join(self.bulk_edit_data.values())
-
             # pre-pend id into data
             csv_data = []
-            for idx, line in enumerate(self.csv_data, start=start):
+            for idx, line in enumerate(self.csv_update_data, start=start):
                 if idx == start:
-                    csv_data.append("id," + header)
+                    csv_data.append("id," + line)
                 else:
-                    csv_data.append(f"{idx-1}," + update_line)
+                    csv_data.append(f"{idx-1}," + line)
 
             return csv_data, '\n'.join(csv_data)