Merge branch 'bugfix' into renovate_help

Author: rossops

dojo/fixtures/dojo_testdata.json

@@ -227,7 +227,7 @@
       "url_prefix": "",
       "enable_slack_notifications": false,
       "enable_mail_notifications": false,
-      "enable_webhooks_notifications": true,
+      "enable_webhooks_notifications": false,
       "email_from": "no-reply@example.com",
       "false_positive_history": false,
       "msteams_url": "",

unittests/test_importers_deduplication.py

@@ -41,7 +41,6 @@ def setUp(self):
         # Authenticate API client as admin for import endpoints
         self.login_as_admin()
 
-        self.system_settings(enable_webhooks_notifications=False)
         self.system_settings(enable_product_grade=False)
         self.system_settings(enable_github=False)
         self.system_settings(enable_deduplication=True)

unittests/test_importers_performance.py

@@ -43,7 +43,6 @@ def setUp(self):
         testuser = User.objects.create(username="admin")
         UserContactInfo.objects.create(user=testuser, block_execution=False)
 
-        self.system_settings(enable_webhooks_notifications=False)
         self.system_settings(enable_product_grade=False)
         self.system_settings(enable_github=False)
         self.system_settings(enable_deduplication=True)

unittests/test_jira_import_and_pushing_api.py

@@ -70,6 +70,7 @@ def _get_vcr(self, **kwargs):
     def setUp(self):
         super().setUp()
         self.system_settings(enable_jira=True)
+        self.system_settings(enable_webhooks_notifications=True)
         self.testuser = User.objects.get(username="admin")
         self.testuser.usercontactinfo.block_execution = True
         self.testuser.usercontactinfo.save()

unittests/test_notifications.py

@@ -428,6 +428,7 @@ def run(self, result=None):
             super().run(result)
 
     def setUp(self):
+        self.system_settings(enable_webhooks_notifications=True)
         self.sys_wh = Notification_Webhooks.objects.filter(owner=None).first()
         self.url_base = "http://webhook.endpoint:8080"
 

unittests/test_watson_async_search_index.py

@@ -21,7 +21,6 @@ def setUp(self):
         self.testuser = User.objects.create(username="admin", is_staff=True, is_superuser=True)
         UserContactInfo.objects.create(user=self.testuser, block_execution=True)
 
-        self.system_settings(enable_webhooks_notifications=False)
         self.system_settings(enable_product_grade=False)
         self.system_settings(enable_github=False)