From 460acb27c4fa35e513725bc2fd820c4883f95691 Mon Sep 17 00:00:00 2001 From: Adriaan Jacquet Date: Sat, 19 Apr 2025 13:49:37 +0200 Subject: [PATCH] fix: fixed test merge errors --- backend/tests/data/assignments/assignments.test.ts | 2 +- backend/tests/data/assignments/submissions.test.ts | 2 +- backend/tests/test_assets/assignments/assignments.testdata.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/tests/data/assignments/assignments.test.ts b/backend/tests/data/assignments/assignments.test.ts index af55780d..74c858b3 100644 --- a/backend/tests/data/assignments/assignments.test.ts +++ b/backend/tests/data/assignments/assignments.test.ts @@ -35,7 +35,7 @@ describe('AssignmentRepository', () => { const result = await assignmentRepository.findAllByResponsibleTeacher('testleerkracht1'); const resultIds = result.map((it) => it.id).sort((a, b) => (a ?? 0) - (b ?? 0)); - expect(resultIds).toEqual([21000, 21002, 21003]); + expect(resultIds).toEqual([21000, 21002, 21003, 21004]); }); it('should not find removed assignment', async () => { diff --git a/backend/tests/data/assignments/submissions.test.ts b/backend/tests/data/assignments/submissions.test.ts index 93b3261d..2bbd00dc 100644 --- a/backend/tests/data/assignments/submissions.test.ts +++ b/backend/tests/data/assignments/submissions.test.ts @@ -92,7 +92,7 @@ describe('SubmissionRepository', () => { }); it('should find only the submissions for a certain learning object and assignment made for the given group', async () => { - const group = await groupRepository.findByAssignmentAndGroupNumber(assignment!, 2); + const group = await groupRepository.findByAssignmentAndGroupNumber(assignment!, 21002); const result = await submissionRepository.findAllSubmissionsForLearningObjectAndGroup(loId, group!); expect(result).toHaveLength(1); diff --git a/backend/tests/test_assets/assignments/assignments.testdata.ts b/backend/tests/test_assets/assignments/assignments.testdata.ts index 29fa877e..337ec98f 100644 --- a/backend/tests/test_assets/assignments/assignments.testdata.ts +++ b/backend/tests/test_assets/assignments/assignments.testdata.ts @@ -48,7 +48,7 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign conditionalPathAssignment = em.create(Assignment, { within: getClassWithTestleerlingAndTestleerkracht(), - id: 1, + id: 21004, title: 'Assignment: Conditional Learning Path', description: 'You have to do the testing learning path with a condition.', learningPathHruid: testLearningPathWithConditions.hruid,