From 005010e642652d623e0eb2bc6f69e38c165ce03b Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Thu, 9 Nov 2023 17:55:30 -0800
Subject: [PATCH] 8356 fix tests

---
 netbox/extras/forms/bulk_edit.py   | 30 ------------------------------
 netbox/extras/forms/bulk_import.py |  2 +-
 netbox/extras/tests/test_api.py    | 13 -------------
 3 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/netbox/extras/forms/bulk_edit.py b/netbox/extras/forms/bulk_edit.py
index ae9c654a4..2c04c929e 100644
--- a/netbox/extras/forms/bulk_edit.py
+++ b/netbox/extras/forms/bulk_edit.py
@@ -174,36 +174,6 @@ class WebhookBulkEditForm(NetBoxModelBulkEditForm):
         queryset=Webhook.objects.all(),
         widget=forms.MultipleHiddenInput
     )
-    enabled = forms.NullBooleanField(
-        label=_('Enabled'),
-        required=False,
-        widget=BulkEditNullBooleanSelect()
-    )
-    type_create = forms.NullBooleanField(
-        label=_('On create'),
-        required=False,
-        widget=BulkEditNullBooleanSelect()
-    )
-    type_update = forms.NullBooleanField(
-        label=_('On update'),
-        required=False,
-        widget=BulkEditNullBooleanSelect()
-    )
-    type_delete = forms.NullBooleanField(
-        label=_('On delete'),
-        required=False,
-        widget=BulkEditNullBooleanSelect()
-    )
-    type_job_start = forms.NullBooleanField(
-        label=_('On job start'),
-        required=False,
-        widget=BulkEditNullBooleanSelect()
-    )
-    type_job_end = forms.NullBooleanField(
-        label=_('On job end'),
-        required=False,
-        widget=BulkEditNullBooleanSelect()
-    )
     http_method = forms.ChoiceField(
         choices=add_blank_choice(WebhookHttpMethodChoices),
         required=False,
diff --git a/netbox/extras/forms/bulk_import.py b/netbox/extras/forms/bulk_import.py
index f1abf5252..b05921175 100644
--- a/netbox/extras/forms/bulk_import.py
+++ b/netbox/extras/forms/bulk_import.py
@@ -151,7 +151,7 @@ class WebhookImportForm(NetBoxModelImportForm):
     class Meta:
         model = Webhook
         fields = (
-            'payload_url', 'http_method', 'http_content_type', 'additional_headers', 'body_template',
+            'name', 'payload_url', 'http_method', 'http_content_type', 'additional_headers', 'body_template',
             'secret', 'ssl_verification', 'ca_file_path', 'tags'
         )
 
diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py
index 5d0bd3797..53b1ab7cf 100644
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -86,21 +86,15 @@ class WebhookTest(APIViewTestCases.APIViewTestCase):
     brief_fields = ['display', 'id', 'name', 'url']
     create_data = [
         {
-            'content_types': ['dcim.device', 'dcim.devicetype'],
             'name': 'Webhook 4',
-            'type_create': True,
             'payload_url': 'http://example.com/?4',
         },
         {
-            'content_types': ['dcim.device', 'dcim.devicetype'],
             'name': 'Webhook 5',
-            'type_update': True,
             'payload_url': 'http://example.com/?5',
         },
         {
-            'content_types': ['dcim.device', 'dcim.devicetype'],
             'name': 'Webhook 6',
-            'type_delete': True,
             'payload_url': 'http://example.com/?6',
         },
     ]
@@ -110,29 +104,22 @@ class WebhookTest(APIViewTestCases.APIViewTestCase):
 
     @classmethod
     def setUpTestData(cls):
-        site_ct = ContentType.objects.get_for_model(Site)
-        rack_ct = ContentType.objects.get_for_model(Rack)
 
         webhooks = (
             Webhook(
                 name='Webhook 1',
-                type_create=True,
                 payload_url='http://example.com/?1',
             ),
             Webhook(
                 name='Webhook 2',
-                type_update=True,
                 payload_url='http://example.com/?1',
             ),
             Webhook(
                 name='Webhook 3',
-                type_delete=True,
                 payload_url='http://example.com/?1',
             ),
         )
         Webhook.objects.bulk_create(webhooks)
-        for webhook in webhooks:
-            webhook.content_types.add(site_ct, rack_ct)
 
 
 class CustomFieldTest(APIViewTestCases.APIViewTestCase):