diff --git a/webapp/tests/event_fixture.py b/webapp/tests/event_fixture.py index ac5b138..e3aa8cc 100644 --- a/webapp/tests/event_fixture.py +++ b/webapp/tests/event_fixture.py @@ -1,8 +1,9 @@ from django.utils import timezone from webapp.models import Event +from webapp.utils import month_from_now -def createEventObject(name="Testitapahtuma1", visible=True, start_time=timezone.now(), end_time=timezone.now(), tag_id=[], signup_id=[]): +def createEventObject(name="Testitapahtuma1", visible=True, start_time=timezone.now(), end_time=month_from_now(), tag_id=[], signup_id=[]): return Event.objects.create( title_fi=name, title_en=f"title_en {name}", @@ -17,7 +18,7 @@ def createEventObject(name="Testitapahtuma1", visible=True, start_time=timezone. ) -def createEventJSON(name="POST1", visible=True, start_time=timezone.now(), end_time=timezone.now(), tag_id=[], signup_id=[]): +def createEventJSON(name="POST1", visible=True, start_time=timezone.now(), end_time=month_from_now(), tag_id=[], signup_id=[]): return { "tags": tag_id, "tag_id": tag_id, diff --git a/webapp/tests/test_event.py b/webapp/tests/test_event.py index d51763a..a64aa91 100644 --- a/webapp/tests/test_event.py +++ b/webapp/tests/test_event.py @@ -16,14 +16,12 @@ class EventTestCase(APITestCase): # Visible and relevant test1 = createEventObject( "Testitapahtuma1", - start_time=timezone.datetime(2019, 11, 9, 12, 0, 0), - end_time=timezone.datetime(2020, 11, 9, 13, 0, 0)) + start_time=timezone.datetime(2019, 11, 9, 12, 0, 0)) # Invisible but relevant createEventObject( "Testitapahtuma2", visible=False, - start_time=timezone.datetime(2018, 11, 9, 12, 0, 0), - end_time=timezone.datetime(2020, 11, 9, 13, 0, 0)) + start_time=timezone.datetime(2018, 11, 9, 12, 0, 0)) # Visible but unrelevant test2 = createEventObject( "Testitapahtuma3", @@ -34,9 +32,7 @@ class EventTestCase(APITestCase): createEventObject( "Testitapahtuma4", visible=True, - start_time=timezone.datetime(2018, 12, 9, 12, 0, 0), - end_time=timezone.datetime(2020, 12, 9, 13, 0, 0)) - + start_time=timezone.datetime(2018, 12, 9, 12, 0, 0)) # Add some tags tag1 = tagBuilder() tag2 = tagBuilder("testtag2")