From 5131cc92f061a943c938b4cf255d600f6856905c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 11 Jul 2024 09:55:16 -0400 Subject: [PATCH] Fix tests --- netbox/extras/api/serializers_/notifications.py | 2 +- netbox/extras/tests/test_event_rules.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/extras/api/serializers_/notifications.py b/netbox/extras/api/serializers_/notifications.py index 95eea2bbb..62e1a8d63 100644 --- a/netbox/extras/api/serializers_/notifications.py +++ b/netbox/extras/api/serializers_/notifications.py @@ -56,7 +56,7 @@ class NotificationGroupSerializer(ValidatedModelSerializer): class Meta: model = NotificationGroup fields = [ - 'id', 'url', 'display', 'name', 'description', 'groups', 'users', + 'id', 'url', 'display', 'display_url', 'name', 'description', 'groups', 'users', ] brief_fields = ('id', 'url', 'display', 'name', 'description') diff --git a/netbox/extras/tests/test_event_rules.py b/netbox/extras/tests/test_event_rules.py index 2b4a05177..ac36ef1d9 100644 --- a/netbox/extras/tests/test_event_rules.py +++ b/netbox/extras/tests/test_event_rules.py @@ -399,7 +399,7 @@ class EventRuleTest(APITestCase): site.save() self.assertEqual(self.queue.count, 1, msg="Duplicate jobs found in queue") job = self.queue.get_jobs()[0] - self.assertEqual(job.kwargs['event'], ObjectChangeActionChoices.ACTION_CREATE) + self.assertEqual(job.kwargs['event_type'], OBJECT_CREATED) self.queue.empty() # Test multiple updates @@ -411,7 +411,7 @@ class EventRuleTest(APITestCase): site.save() self.assertEqual(self.queue.count, 1, msg="Duplicate jobs found in queue") job = self.queue.get_jobs()[0] - self.assertEqual(job.kwargs['event'], ObjectChangeActionChoices.ACTION_UPDATE) + self.assertEqual(job.kwargs['event_type'], OBJECT_UPDATED) self.queue.empty() # Test update & delete @@ -422,5 +422,5 @@ class EventRuleTest(APITestCase): site.delete() self.assertEqual(self.queue.count, 1, msg="Duplicate jobs found in queue") job = self.queue.get_jobs()[0] - self.assertEqual(job.kwargs['event'], ObjectChangeActionChoices.ACTION_DELETE) + self.assertEqual(job.kwargs['event_type'], OBJECT_DELETED) self.queue.empty()