fix: fixed test merge errors
This commit is contained in:
		
							parent
							
								
									90f43e74ba
								
							
						
					
					
						commit
						460acb27c4
					
				
					 3 changed files with 3 additions and 3 deletions
				
			
		|  | @ -35,7 +35,7 @@ describe('AssignmentRepository', () => { | ||||||
|         const result = await assignmentRepository.findAllByResponsibleTeacher('testleerkracht1'); |         const result = await assignmentRepository.findAllByResponsibleTeacher('testleerkracht1'); | ||||||
|         const resultIds = result.map((it) => it.id).sort((a, b) => (a ?? 0) - (b ?? 0)); |         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 () => { |     it('should not find removed assignment', async () => { | ||||||
|  |  | ||||||
|  | @ -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 () => { |     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!); |         const result = await submissionRepository.findAllSubmissionsForLearningObjectAndGroup(loId, group!); | ||||||
| 
 | 
 | ||||||
|         expect(result).toHaveLength(1); |         expect(result).toHaveLength(1); | ||||||
|  |  | ||||||
|  | @ -48,7 +48,7 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign | ||||||
| 
 | 
 | ||||||
|     conditionalPathAssignment = em.create(Assignment, { |     conditionalPathAssignment = em.create(Assignment, { | ||||||
|         within: getClassWithTestleerlingAndTestleerkracht(), |         within: getClassWithTestleerlingAndTestleerkracht(), | ||||||
|         id: 1, |         id: 21004, | ||||||
|         title: 'Assignment: Conditional Learning Path', |         title: 'Assignment: Conditional Learning Path', | ||||||
|         description: 'You have to do the testing learning path with a condition.', |         description: 'You have to do the testing learning path with a condition.', | ||||||
|         learningPathHruid: testLearningPathWithConditions.hruid, |         learningPathHruid: testLearningPathWithConditions.hruid, | ||||||
|  |  | ||||||
		Reference in a new issue
	
	 Adriaan Jacquet
						Adriaan Jacquet