Merge pull request #289 from python-discord/admin-api-pages-improvements

Improvements to Admin pages for the API Section

2 files changed, 26 insertions, 1 deletions

diff --git a/pydis_site/apps/api/tests/test_deleted_messages.py b/pydis_site/apps/api/tests/test_deleted_messages.py
index f079a8dd..40450844 100644
--- a/pydis_site/apps/api/tests/test_deleted_messages.py
+++ b/pydis_site/apps/api/tests/test_deleted_messages.py
@@ -1,5 +1,6 @@
 from datetime import datetime
 
+from django.utils import timezone
 from django_hosts.resolvers import reverse
 
 from .base import APISubdomainTestCase
@@ -76,3 +77,23 @@ class DeletedMessagesWithActorTests(APISubdomainTestCase):
         self.assertEqual(response.status_code, 201)
         [context] = MessageDeletionContext.objects.all()
         self.assertEqual(context.actor.id, self.actor.id)
+
+
+class DeletedMessagesLogURLTests(APISubdomainTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.author = cls.actor = User.objects.create(
+            id=324888,
+            name='Black Knight',
+            discriminator=1975,
+        )
+
+        cls.deletion_context = MessageDeletionContext.objects.create(
+            actor=cls.actor,
+            creation=timezone.now()
+        )
+
+    def test_valid_log_url(self):
+        expected_url = reverse('logs', host="staff", args=(1,))
+        [context] = MessageDeletionContext.objects.all()
+        self.assertEqual(context.log_url, expected_url)
diff --git a/pydis_site/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py
index 4c0f6e27..a02fce8a 100644
--- a/pydis_site/apps/api/tests/test_users.py
+++ b/pydis_site/apps/api/tests/test_users.py
@@ -143,7 +143,7 @@ class UserModelTests(APISubdomainTestCase):
         cls.user_with_roles = User.objects.create(
             id=1,
             name="Test User with two roles",
-            discriminator=1111,
+            discriminator=1,
             in_guild=True,
         )
         cls.user_with_roles.roles.extend([cls.role_bottom.id, cls.role_top.id])
@@ -166,3 +166,7 @@ class UserModelTests(APISubdomainTestCase):
         top_role = self.user_without_roles.top_role
         self.assertIsInstance(top_role, Role)
         self.assertEqual(top_role.id, self.developers_role.id)
+
+    def test_correct_username_formatting(self):
+        """Tests the username property with both name and discriminator formatted together."""
+        self.assertEqual(self.user_with_roles.username, "Test User with two roles#0001")