Merge branch 'main' into N21-2057-duplicate-emails

hpi-schul-cloud · Jul 18, 2024 · 8124e14 · 8124e14
2 parents 7637c45 + 41b019b
commit 8124e14
Show file tree

Hide file tree

Showing 2 changed files with 531 additions and 1,137 deletions.
diff --git a/apps/server/src/modules/deletion/api/controller/api-test/deletion-executions.api.spec.ts b/apps/server/src/modules/deletion/api/controller/api-test/deletion-executions.api.spec.ts
@@ -35,11 +35,10 @@ describe(`deletionExecution (api)`, () => {
 
 	describe('executeDeletions', () => {
 		describe('when execute deletionRequests with default limit', () => {
-			jest.setTimeout(20000);
 			it('should return status 204', async () => {
 				const response = await testApiClient.post('');
 				expect(response.status).toEqual(204);
-			});
+			}, 20000);
 		});
 
 		describe('without token', () => {