Merge branch 'django' into django+add-logs-api

1 files changed, 21 insertions, 12 deletions

diff --git a/api/tests/test_models.py b/api/tests/test_models.py
index 968f003e..1fe60c0d 100644
--- a/api/tests/test_models.py
+++ b/api/tests/test_models.py
@@ -1,15 +1,15 @@
-from datetime import datetime
+from datetime import datetime as dt, timezone
 
 from django.test import SimpleTestCase
 
 from ..models import (
     DeletedMessage, DocumentationLink,
-    Message, MessageDeletionContext,
-    ModelReprMixin, OffTopicChannelName,
-    Role, SnakeFact,
-    SnakeIdiom, SnakeName,
-    SpecialSnake, Tag,
-    User
+    Infraction, Message,
+    MessageDeletionContext, ModelReprMixin,
+    OffTopicChannelName, Role,
+    SnakeFact, SnakeIdiom,
+    SnakeName, SpecialSnake,
+    Tag, User
 )
 
 
@@ -43,7 +43,7 @@ class StringDunderMethodTests(SimpleTestCase):
                         id=5555, name='shawn',
                         discriminator=555, avatar_hash=None
                     ),
-                    creation=datetime.utcnow()
+                    creation=dt.utcnow()
                 ),
                 embeds=[]
             ),
@@ -77,15 +77,24 @@ class StringDunderMethodTests(SimpleTestCase):
                     id=5555, name='shawn',
                     discriminator=555, avatar_hash=None
                 ),
-                creation=datetime.utcnow()
+                creation=dt.utcnow()
+            ),
+            Tag(
+                title='bob',
+                embed={'content': "the builder"}
             ),
             User(
                 id=5, name='bob',
                 discriminator=1, avatar_hash=None
             ),
-            Tag(
-                title='bob',
-                embed={'content': "the builder"}
+            Infraction(
+                user_id=5, actor_id=5,
+                type='kick', reason='He terk my jerb!'
+            ),
+            Infraction(
+                user_id=5, actor_id=5, hidden=True,
+                type='kick', reason='He terk my jerb!',
+                expires_at=dt(5018, 11, 20, 15, 52, tzinfo=timezone.utc)
             )
         )