Merge branch 'master' into hotfix/lemon/front-page-project-sanity

2 files changed, 35 insertions, 5 deletions

diff --git a/pydis_site/apps/api/tests/test_infractions.py b/pydis_site/apps/api/tests/test_infractions.py
index 93ef8171..82b497aa 100644
--- a/pydis_site/apps/api/tests/test_infractions.py
+++ b/pydis_site/apps/api/tests/test_infractions.py
@@ -512,6 +512,36 @@ class CreationTests(APISubdomainTestCase):
             )
 
 
+class InfractionDeletionTests(APISubdomainTestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.user = User.objects.create(
+            id=9876,
+            name='Unknown user',
+            discriminator=9876,
+        )
+
+        cls.warning = Infraction.objects.create(
+            user_id=cls.user.id,
+            actor_id=cls.user.id,
+            type='warning',
+            active=False
+        )
+
+    def test_delete_unknown_infraction_returns_404(self):
+        url = reverse('bot:infraction-detail', args=('something',), host='api')
+        response = self.client.delete(url)
+
+        self.assertEqual(response.status_code, 404)
+
+    def test_delete_known_infraction_returns_204(self):
+        url = reverse('bot:infraction-detail', args=(self.warning.id,), host='api')
+        response = self.client.delete(url)
+
+        self.assertEqual(response.status_code, 204)
+        self.assertRaises(Infraction.DoesNotExist, Infraction.objects.get, id=self.warning.id)
+
+
 class ExpandedTests(APISubdomainTestCase):
     @classmethod
     def setUpTestData(cls):
diff --git a/pydis_site/apps/api/tests/test_users.py b/pydis_site/apps/api/tests/test_users.py
index c422f895..69bbfefc 100644
--- a/pydis_site/apps/api/tests/test_users.py
+++ b/pydis_site/apps/api/tests/test_users.py
@@ -407,10 +407,10 @@ class UserMetricityTests(APISubdomainTestCase):
 
     def test_get_metricity_data(self):
         # Given
-        verified_at = "foo"
+        joined_at = "foo"
         total_messages = 1
         total_blocks = 1
-        self.mock_metricity_user(verified_at, total_messages, total_blocks)
+        self.mock_metricity_user(joined_at, total_messages, total_blocks)
 
         # When
         url = reverse('bot:user-metricity-data', args=[0], host='api')
@@ -419,7 +419,7 @@ class UserMetricityTests(APISubdomainTestCase):
         # Then
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.json(), {
-            "verified_at": verified_at,
+            "joined_at": joined_at,
             "total_messages": total_messages,
             "voice_banned": False,
             "activity_blocks": total_blocks
@@ -455,12 +455,12 @@ class UserMetricityTests(APISubdomainTestCase):
                     self.assertEqual(response.status_code, 200)
                     self.assertEqual(response.json()["voice_banned"], case["voice_banned"])
 
-    def mock_metricity_user(self, verified_at, total_messages, total_blocks):
+    def mock_metricity_user(self, joined_at, total_messages, total_blocks):
         patcher = patch("pydis_site.apps.api.viewsets.bot.user.Metricity")
         self.metricity = patcher.start()
         self.addCleanup(patcher.stop)
         self.metricity = self.metricity.return_value.__enter__.return_value
-        self.metricity.user.return_value = dict(verified_at=verified_at)
+        self.metricity.user.return_value = dict(joined_at=joined_at)
         self.metricity.total_messages.return_value = total_messages
         self.metricity.total_message_blocks.return_value = total_blocks