Merged in feature/cypress-fix (pull request #337)
Fix failing dueDates.cy.js test Approved-by: Christian Cueni
This commit is contained in:
commit
a14a09f1ca
|
|
@ -1,6 +1,7 @@
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
import djclick as click
|
import djclick as click
|
||||||
|
from dateutil.relativedelta import relativedelta, TU
|
||||||
from django.contrib.auth.hashers import make_password
|
from django.contrib.auth.hashers import make_password
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
|
|
@ -362,21 +363,42 @@ def command(
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
attendance_course = CourseSessionAttendanceCourse.objects.get(
|
csac = CourseSessionAttendanceCourse.objects.get(
|
||||||
course_session=course_session,
|
course_session=course_session,
|
||||||
learning_content=LearningContentAttendanceCourse.objects.get(
|
learning_content=LearningContentAttendanceCourse.objects.get(
|
||||||
slug="test-lehrgang-lp-circle-fahrzeug-lc-präsenzkurs-fahrzeug"
|
slug="test-lehrgang-lp-circle-fahrzeug-lc-präsenzkurs-fahrzeug"
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
attendance_course.attendance_user_list = attendance_user_list
|
csac.attendance_user_list = attendance_user_list
|
||||||
attendance_course.due_date.start = timezone.make_aware(
|
csac.due_date.start = timezone.make_aware(
|
||||||
datetime(year=2000, month=10, day=31, hour=8)
|
datetime(year=2000, month=10, day=31, hour=8)
|
||||||
)
|
)
|
||||||
attendance_course.due_date.end = timezone.make_aware(
|
csac.due_date.end = timezone.make_aware(
|
||||||
datetime(year=2000, month=10, day=31, hour=11)
|
datetime(year=2000, month=10, day=31, hour=11)
|
||||||
)
|
)
|
||||||
attendance_course.save()
|
csac.save()
|
||||||
|
else:
|
||||||
|
# reset attendance day date for other tests
|
||||||
|
course_session = CourseSession.objects.get(id=TEST_COURSE_SESSION_BERN_ID)
|
||||||
|
csac = CourseSessionAttendanceCourse.objects.get(
|
||||||
|
course_session=course_session,
|
||||||
|
learning_content=LearningContentAttendanceCourse.objects.get(
|
||||||
|
slug="test-lehrgang-lp-circle-fahrzeug-lc-präsenzkurs-fahrzeug"
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
wednesday_in_four_weeks = (
|
||||||
|
datetime.now() + relativedelta(weekday=TU) + relativedelta(weeks=1)
|
||||||
|
)
|
||||||
|
csac.due_date.start = timezone.make_aware(
|
||||||
|
wednesday_in_four_weeks.replace(hour=8, minute=30, second=0, microsecond=0)
|
||||||
|
)
|
||||||
|
csac.due_date.end = timezone.make_aware(
|
||||||
|
wednesday_in_four_weeks.replace(hour=17, minute=0, second=0, microsecond=0)
|
||||||
|
)
|
||||||
|
csac.due_date.save()
|
||||||
|
csac.save()
|
||||||
|
|
||||||
if create_learning_mentor:
|
if create_learning_mentor:
|
||||||
cs_bern = CourseSession.objects.get(id=TEST_COURSE_SESSION_BERN_ID)
|
cs_bern = CourseSession.objects.get(id=TEST_COURSE_SESSION_BERN_ID)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue