fixing merge conflicts

hpi-schul-cloud · Dec 11, 2024 · b20cc2d · b20cc2d
1 parent 07a775e
commit b20cc2d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/apps/server/src/modules/video-conference/service/video-conference.service.spec.ts b/apps/server/src/modules/video-conference/service/video-conference.service.spec.ts
@@ -488,6 +488,7 @@ describe(VideoConferenceService.name, () => {
 					id: 'foo',
 					roomId: room.id,
 					members: [{ userId: user.id, roles: [roleEditor] }],
+					schoolId: room.schoolId,
 				});
 				roomService.getSingleRoom.mockResolvedValueOnce(room);
 
@@ -667,11 +668,13 @@ describe(VideoConferenceService.name, () => {
 						id: 'foo',
 						roomId: room.id,
 						members: [{ userId: user.id, roles: [roleViewer] }],
+						schoolId: room.schoolId,
 					})
 					.mockResolvedValueOnce({
 						id: 'foo',
 						roomId: room.id,
 						members: [{ userId: user.id, roles: [roleViewer] }],
+						schoolId: room.schoolId,
 					});
 				roomService.getSingleRoom.mockResolvedValueOnce(room);
 
@@ -793,11 +796,13 @@ describe(VideoConferenceService.name, () => {
 						id: 'foo',
 						roomId: room.id,
 						members: [{ userId: user.id, roles: [] }],
+						schoolId: room.schoolId,
 					})
 					.mockResolvedValueOnce({
 						id: 'foo',
 						roomId: room.id,
 						members: [{ userId: user.id, roles: [] }],
+						schoolId: room.schoolId,
 					});
 				roomService.getSingleRoom.mockResolvedValueOnce(room);
 
@@ -1037,11 +1042,13 @@ describe(VideoConferenceService.name, () => {
 					id: 'foo',
 					roomId: room.id,
 					members: [{ userId: roomUser.id, roles: [roleEditor] }],
+					schoolId: room.schoolId,
 				})
 				.mockResolvedValueOnce({
 					id: 'foo',
 					roomId: room.id,
 					members: [{ userId: roomUser.id, roles: [roleEditor] }],
+					schoolId: room.schoolId,
 				});
 
 			const element = videoConferenceElementFactory.build();