Merge remote-tracking branch 'origin/dev' into feat/indieningen-kunnen-posten-en-bekijken-#194
# Conflicts: # backend/tests/setup-tests.ts
This commit is contained in:
		
						commit
						dd2cdf3fe9
					
				
					 46 changed files with 1670 additions and 123 deletions
				
			
		|  | @ -15,7 +15,14 @@ export const TEST_STUDENTS = [ | |||
|     { username: 'testleerling1', firstName: 'Gerald', lastName: 'Schmittinger' }, | ||||
| ]; | ||||
| 
 | ||||
| let testStudents: Student[]; | ||||
| 
 | ||||
| // 🏗️ Functie die ORM entities maakt uit de data array
 | ||||
| export function makeTestStudents(em: EntityManager): Student[] { | ||||
|     return TEST_STUDENTS.map((data) => em.create(Student, data)); | ||||
|     testStudents = TEST_STUDENTS.map((data) => em.create(Student, data)); | ||||
|     return testStudents; | ||||
| } | ||||
| 
 | ||||
| export function getTestleerling1(): Student { | ||||
|     return testStudents.find(it => it.username == "testleerling1"); | ||||
| } | ||||
|  |  | |||
|  | @ -2,37 +2,64 @@ import { Teacher } from '../../../src/entities/users/teacher.entity'; | |||
| import { EntityManager } from '@mikro-orm/core'; | ||||
| 
 | ||||
| export function makeTestTeachers(em: EntityManager): Teacher[] { | ||||
|     const teacher01 = em.create(Teacher, { | ||||
|     teacher01 = em.create(Teacher, { | ||||
|         username: 'FooFighters', | ||||
|         firstName: 'Dave', | ||||
|         lastName: 'Grohl', | ||||
|     }); | ||||
| 
 | ||||
|     const teacher02 = em.create(Teacher, { | ||||
|     teacher02 = em.create(Teacher, { | ||||
|         username: 'LimpBizkit', | ||||
|         firstName: 'Fred', | ||||
|         lastName: 'Durst', | ||||
|     }); | ||||
| 
 | ||||
|     const teacher03 = em.create(Teacher, { | ||||
|     teacher03 = em.create(Teacher, { | ||||
|         username: 'Staind', | ||||
|         firstName: 'Aaron', | ||||
|         lastName: 'Lewis', | ||||
|     }); | ||||
| 
 | ||||
|     // Should not be used, gets deleted in a unit test
 | ||||
|     const teacher04 = em.create(Teacher, { | ||||
|     teacher04 = em.create(Teacher, { | ||||
|         username: 'ZesdeMetaal', | ||||
|         firstName: 'Wannes', | ||||
|         lastName: 'Cappelle', | ||||
|     }); | ||||
| 
 | ||||
|     // Makes sure when logged in as testleerkracht1, there exists a corresponding user
 | ||||
|     const teacher05 = em.create(Teacher, { | ||||
|     testleerkracht1 = em.create(Teacher, { | ||||
|         username: 'testleerkracht1', | ||||
|         firstName: 'Bob', | ||||
|         lastName: 'Dylan', | ||||
|         firstName: 'Kris', | ||||
|         lastName: 'Coolsaet', | ||||
|     }); | ||||
| 
 | ||||
|     return [teacher01, teacher02, teacher03, teacher04, teacher05]; | ||||
|     return [teacher01, teacher02, teacher03, teacher04, testleerkracht1]; | ||||
| } | ||||
| 
 | ||||
| let teacher01: Teacher; | ||||
| let teacher02: Teacher; | ||||
| let teacher03: Teacher; | ||||
| let teacher04: Teacher; | ||||
| let testleerkracht1: Teacher; | ||||
| 
 | ||||
| export function getTeacher01(): Teacher { | ||||
|     return teacher01; | ||||
| } | ||||
| 
 | ||||
| export function getTeacher02(): Teacher { | ||||
|     return teacher02; | ||||
| } | ||||
| 
 | ||||
| export function getTeacher03(): Teacher { | ||||
|     return teacher03; | ||||
| } | ||||
| 
 | ||||
| export function getTeacher04(): Teacher { | ||||
|     return teacher04; | ||||
| } | ||||
| 
 | ||||
| export function getTestleerkracht1(): Teacher { | ||||
|     return testleerkracht1; | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Reference in a new issue
	
	 Gerald Schmittinger
						Gerald Schmittinger