diff --git a/webapp/tests/test_event.py b/webapp/tests/test_event.py index b3c33d1..2f094f0 100644 --- a/webapp/tests/test_event.py +++ b/webapp/tests/test_event.py @@ -2,6 +2,7 @@ from django.contrib.auth.models import User, AnonymousUser from django.utils import timezone from rest_framework import status from rest_framework.test import APITestCase, APIRequestFactory +import zoneinfo from webapp.models import Event from webapp.serializers import EventSerializer @@ -14,28 +15,29 @@ URL = "/api/events/" class EventTestCase(APITestCase): def setUp(self): + tz=zoneinfo.ZoneInfo(key='Europe/Helsinki') # Visible and relevant test1 = createEventObject( - "Testitapahtuma1", start_time=timezone.datetime(2019, 11, 9, 12, 0, 0) + "Testitapahtuma1", start_time=timezone.datetime(2019, 11, 9, 12, 0, 0, tzinfo=tz) ) # Invisible but relevant createEventObject( "Testitapahtuma2", visible=False, - start_time=timezone.datetime(2018, 11, 9, 12, 0, 0), + start_time=timezone.datetime(2018, 11, 9, 12, 0, 0, tzinfo=tz), ) # Visible but unrelevant test2 = createEventObject( "Testitapahtuma3", visible=True, - start_time=timezone.datetime(2018, 12, 9, 12, 0, 0), - end_time=timezone.datetime(2018, 12, 9, 13, 0, 0), + start_time=timezone.datetime(2018, 12, 9, 12, 0, 0, tzinfo=tz), + end_time=timezone.datetime(2018, 12, 9, 13, 0, 0, tzinfo=tz), ) # Visible and relevant createEventObject( "Testitapahtuma4", visible=True, - start_time=timezone.datetime(2018, 12, 9, 12, 0, 0), + start_time=timezone.datetime(2018, 12, 9, 12, 0, 0, tzinfo=tz), ) # Add some tags tag1 = tagBuilder() @@ -77,7 +79,7 @@ class EventTestCase(APITestCase): self.assertEqual(response.data["results"], expected) def test_get_events_since(self): - response = self.client.get(f"{URL}?since=2018-01-01", format="json") + response = self.client.get(f"{URL}?since=2018-01-01%2000:00:00%2B0200", format="json") self.assertTrue(response.status_code, status.HTTP_200_OK) self.assertEqual(len(response.data["results"]), 3)