From 4c0d73150e5fc692b25567e77de587e5c9369f8f Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Fri, 26 Apr 2024 11:14:15 +0200 Subject: [PATCH] Fix tests --- cypress/e2e/circle.cy.js | 4 +- .../e2e/competenceNavi/selfEvaluation.cy.js | 4 +- cypress/e2e/dueDates.cy.js | 2 +- .../course/creators/test_course.py | 41 +++++++++++-------- .../vbv_lernwelt/learnpath/tests/test_api.py | 2 +- 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/cypress/e2e/circle.cy.js b/cypress/e2e/circle.cy.js index 3daaf0e6..bf249d5d 100644 --- a/cypress/e2e/circle.cy.js +++ b/cypress/e2e/circle.cy.js @@ -101,7 +101,7 @@ describe("circle.cy.js", () => { .should("contain", "Feedback"); cy.visit("/course/test-lehrgang/learn/reisen"); - cy.get("[data-cy=\"lp-learning-sequence\"]").should("have.length", 3); - cy.get("[data-cy=\"lp-learning-content\"]").should("have.length", 9); + cy.get("[data-cy=\"lp-learning-sequence\"]").should("have.length", 4); + cy.get("[data-cy=\"lp-learning-content\"]").should("have.length", 11); }); }); diff --git a/cypress/e2e/competenceNavi/selfEvaluation.cy.js b/cypress/e2e/competenceNavi/selfEvaluation.cy.js index d926c8bd..2b76664f 100644 --- a/cypress/e2e/competenceNavi/selfEvaluation.cy.js +++ b/cypress/e2e/competenceNavi/selfEvaluation.cy.js @@ -29,9 +29,9 @@ describe("selfEvaluation.cy.js", () => { cy.get("[data-cy=\"self-evaluation-unknown\"]").should("have.text", "4"); - // learning unit id = 687 also known as: + // learning unit id = 692 also known as: // Bedarfsanalyse, Ist- und Soll-Situation <> - const identifier = "self-eval-687" + const identifier = "self-eval-692" // data in KompetenzNavi/Selbsteinschätzungen is correct cy.visit("/course/test-lehrgang/competence/self-evaluation-and-feedback"); diff --git a/cypress/e2e/dueDates.cy.js b/cypress/e2e/dueDates.cy.js index 4e9d3287..71912aff 100644 --- a/cypress/e2e/dueDates.cy.js +++ b/cypress/e2e/dueDates.cy.js @@ -5,7 +5,7 @@ function selectDropboxItem(dropboxSelector, item) { cy.get(dropboxSelector).contains(item).click(); } -describe("appointments.cy.js", () => { +describe("dueDates.cy.js", () => { beforeEach(() => { cy.manageCommand("cypress_reset"); login("test-student2@example.com", "test"); diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py index 59fb6a2e..8120f7bf 100644 --- a/server/vbv_lernwelt/course/creators/test_course.py +++ b/server/vbv_lernwelt/course/creators/test_course.py @@ -175,24 +175,29 @@ def create_test_course( ) csac.due_date.save() - csac = CourseSessionAttendanceCourse.objects.create( - course_session=cs_bern, - learning_content=LearningContentAttendanceCourse.objects.get( - slug="test-lehrgang-lp-circle-reisen-lc-präsenzkurs-reisen" - ), - location="Handelsschule KV Bern, Zimmer 123, Eigerstrasse 16, 3012 Bern", - trainer="Roland Grossenbacher, roland.grossenbacher@helvetia.ch", - ) - wednesday_in_four_weeks = ( - datetime.now() + relativedelta(weekday=TU) + relativedelta(weeks=4) - ) - csac.due_date.start = timezone.make_aware( - wednesday_in_four_weeks.replace(hour=8, minute=15, second=0, microsecond=0) - ) - csac.due_date.end = timezone.make_aware( - wednesday_in_four_weeks.replace(hour=17, minute=30, second=0, microsecond=0) - ) - csac.due_date.save() + if include_vv: + csac = CourseSessionAttendanceCourse.objects.create( + course_session=cs_bern, + learning_content=LearningContentAttendanceCourse.objects.get( + slug="test-lehrgang-lp-circle-reisen-lc-präsenzkurs-reisen" + ), + location="Handelsschule KV Bern, Zimmer 123, Eigerstrasse 16, 3012 Bern", + trainer="Roland Grossenbacher, roland.grossenbacher@helvetia.ch", + ) + wednesday_in_four_weeks = ( + datetime.now() + relativedelta(weekday=TU) + relativedelta(weeks=4) + ) + csac.due_date.start = timezone.make_aware( + wednesday_in_four_weeks.replace( + hour=8, minute=15, second=0, microsecond=0 + ) + ) + csac.due_date.end = timezone.make_aware( + wednesday_in_four_weeks.replace( + hour=17, minute=30, second=0, microsecond=0 + ) + ) + csac.due_date.save() csa = CourseSessionAssignment.objects.create( course_session=cs_bern, diff --git a/server/vbv_lernwelt/learnpath/tests/test_api.py b/server/vbv_lernwelt/learnpath/tests/test_api.py index 96c7dfb2..8f69740d 100644 --- a/server/vbv_lernwelt/learnpath/tests/test_api.py +++ b/server/vbv_lernwelt/learnpath/tests/test_api.py @@ -28,7 +28,7 @@ class TestRetrieveLearingPathContents(APITestCase): # topics and circles self.assertEqual(4, len(data["children"])) # circle "analyse" contents - self.assertEqual(15, len(data["children"][3]["children"])) + self.assertEqual(20, len(data["children"][3]["children"])) def test_normalUser_withoutCourseSession_cannotAccess(self): self.user = User.objects.get(username="student")