diff options
| author |  Hassan Abouelela <[email protected]> | 2022-08-23 12:52:41 +0400 |
|---|---|---|
| committer | Hassan Abouelela <[email protected]> | 2022-08-23 12:52:41 +0400 |
| commit | f200c60ba865f2569383010b2386b50f7e0ae0a2 (patch) | |
| tree | 8bc8d4638578383590fcc39e78138a5100d0b11d /pydis_site | |
| parent | Clarify Tag Model Docstring (diff) | |
| parent | Merge pull request #764 from python-discord/fix-infraction-tests (diff) | |
Merge branch 'main' into bot-tags
Diffstat (limited to 'pydis_site')
| -rw-r--r-- | pydis_site/apps/api/tests/test_infractions.py | 15 | ||||
| -rw-r--r-- | pydis_site/templates/events/pages/code-jams/9/_index.html | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pydis_site/apps/api/tests/test_infractions.py b/pydis_site/apps/api/tests/test_infractions.py index f1107734..89ee4e23 100644 --- a/pydis_site/apps/api/tests/test_infractions.py +++ b/pydis_site/apps/api/tests/test_infractions.py @@ -56,15 +56,17 @@ class InfractionTests(AuthenticatedAPITestCase): type='ban', reason='He terk my jerb!', hidden=True, + inserted_at=dt(2020, 10, 10, 0, 0, 0, tzinfo=timezone.utc), expires_at=dt(5018, 11, 20, 15, 52, tzinfo=timezone.utc), - active=True + active=True, ) cls.ban_inactive = Infraction.objects.create( user_id=cls.user.id, actor_id=cls.user.id, type='ban', reason='James is an ass, and we won\'t be working with him again.', - active=False + active=False, + inserted_at=dt(2020, 10, 10, 0, 1, 0, tzinfo=timezone.utc), ) cls.mute_permanent = Infraction.objects.create( user_id=cls.user.id, @@ -72,7 +74,8 @@ class InfractionTests(AuthenticatedAPITestCase): type='mute', reason='He has a filthy mouth and I am his soap.', active=True, - expires_at=None + inserted_at=dt(2020, 10, 10, 0, 2, 0, tzinfo=timezone.utc), + expires_at=None, ) cls.superstar_expires_soon = Infraction.objects.create( user_id=cls.user.id, @@ -80,7 +83,8 @@ class InfractionTests(AuthenticatedAPITestCase): type='superstar', reason='This one doesn\'t matter anymore.', active=True, - expires_at=dt.now(timezone.utc) + datetime.timedelta(hours=5) + inserted_at=dt(2020, 10, 10, 0, 3, 0, tzinfo=timezone.utc), + expires_at=dt.now(timezone.utc) + datetime.timedelta(hours=5), ) cls.voiceban_expires_later = Infraction.objects.create( user_id=cls.user.id, @@ -88,7 +92,8 @@ class InfractionTests(AuthenticatedAPITestCase): type='voice_ban', reason='Jet engine mic', active=True, - expires_at=dt.now(timezone.utc) + datetime.timedelta(days=5) + inserted_at=dt(2020, 10, 10, 0, 4, 0, tzinfo=timezone.utc), + expires_at=dt.now(timezone.utc) + datetime.timedelta(days=5), ) def test_list_all(self): diff --git a/pydis_site/templates/events/pages/code-jams/9/_index.html b/pydis_site/templates/events/pages/code-jams/9/_index.html index 7c2617d7..ca7c4f90 100644 --- a/pydis_site/templates/events/pages/code-jams/9/_index.html +++ b/pydis_site/templates/events/pages/code-jams/9/_index.html @@ -27,8 +27,8 @@ <li><strike>Wednesday, July 6 - Voting for the theme opens</strike></li> <li><strike>Wednesday, July 13 - The Qualifier closes</strike></li> <li><strike>Thursday, July 21 - Code Jam Begins</strike></li> - <li>Sunday, July 31 - Coding portion of the jam ends</li> - <li>Sunday, August 4 - Code Jam submissions are closed</li> + <li><strike>Sunday, July 31 - Coding portion of the jam ends</strike></li> + <li><strike>Sunday, August 4 - Code Jam submissions are closed</strike></li> </ul> <h3 id="qualifier"><a href="#how-to-join">The Qualifier</a></h3> |