From d77dfcb26c5d6366e97e003256183c34abde484e Mon Sep 17 00:00:00 2001 From: Sebastiaan Zeeff <33516116+SebastiaanZ@users.noreply.github.com> Date: Sun, 1 Sep 2019 22:12:30 +0200 Subject: Applying PR Feedback: Colour constants for readability & absolute import --- .../staff/tests/test_deletedmessage_filters.py | 22 +++++++++++++++++----- pydis_site/apps/staff/tests/test_logs_view.py | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) (limited to 'pydis_site/apps/staff/tests') diff --git a/pydis_site/apps/staff/tests/test_deletedmessage_filters.py b/pydis_site/apps/staff/tests/test_deletedmessage_filters.py index d064b8d9..d9179044 100644 --- a/pydis_site/apps/staff/tests/test_deletedmessage_filters.py +++ b/pydis_site/apps/staff/tests/test_deletedmessage_filters.py @@ -1,16 +1,28 @@ +import enum + from django.test import TestCase from django.utils import timezone from ..templatetags import deletedmessage_filters +class Colour(enum.IntEnum): + """Enumeration of integer colour values for readability.""" + + BLACK = 0 + BLUE = 255 + GREEN = 65280 + RED = 16711680 + WHITE = 16777215 + + class DeletedMessageFilterTests(TestCase): def test_hex_colour_filter(self): - self.assertEqual(deletedmessage_filters.hex_colour(0), "#000000") - self.assertEqual(deletedmessage_filters.hex_colour(255), "#0000FF") - self.assertEqual(deletedmessage_filters.hex_colour(65280), "#00FF00") - self.assertEqual(deletedmessage_filters.hex_colour(16711680), "#FF0000") - self.assertEqual(deletedmessage_filters.hex_colour(16777215), "#FFFFFF") + self.assertEqual(deletedmessage_filters.hex_colour(Colour.BLACK), "#000000") + self.assertEqual(deletedmessage_filters.hex_colour(Colour.BLUE), "#0000FF") + self.assertEqual(deletedmessage_filters.hex_colour(Colour.GREEN), "#00FF00") + self.assertEqual(deletedmessage_filters.hex_colour(Colour.RED), "#FF0000") + self.assertEqual(deletedmessage_filters.hex_colour(Colour.WHITE), "#FFFFFF") def test_footer_datetime_filter(self): datetime_aware = timezone.now() diff --git a/pydis_site/apps/staff/tests/test_logs_view.py b/pydis_site/apps/staff/tests/test_logs_view.py index ea6020e1..32cb6bbf 100644 --- a/pydis_site/apps/staff/tests/test_logs_view.py +++ b/pydis_site/apps/staff/tests/test_logs_view.py @@ -3,7 +3,7 @@ from django.utils import timezone from django_hosts.resolvers import reverse, reverse_host from pydis_site.apps.api.models.bot import DeletedMessage, MessageDeletionContext, Role, User -from ..templatetags.deletedmessage_filters import hex_colour +from pydis_site.apps.staff.templatetags.deletedmessage_filters import hex_colour class TestLogsView(TestCase): -- cgit v1.2.3