TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use month_from_now utility function in tests

Browse Source
This commit is contained in:
Aarni Halinen
2019-11-10 01:20:14 +02:00
parent 00de36ca44
commit f4b55b7863
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
webapp/tests/event_fixture.py
+3 -2
View File
@@ -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,
webapp/tests/test_event.py
+3 -7
View File
@@ -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")