revert temporary changes

hpi-schul-cloud · Nov 17, 2023 · 2b678ae · 2b678ae
1 parent 46f1b1e
commit 2b678ae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...ver/src/modules/user-login-migration/controller/api-test/user-login-migration.api.spec.ts b/...ver/src/modules/user-login-migration/controller/api-test/user-login-migration.api.spec.ts
@@ -260,7 +260,7 @@ describe('UserLoginMigrationController (API)', () => {
 				expect(response.status).toEqual(HttpStatus.CREATED);
 			});
 
-			it.only('should return the user login migration', async () => {
+			it('should return the user login migration', async () => {
 				const { loggedInClient, sourceSystem, targetSystem } = await setup();
 
 				const response: Response = await loggedInClient.post(`/start`);

diff --git a/apps/server/src/shared/domain/entity/base.entity.ts b/apps/server/src/shared/domain/entity/base.entity.ts
@@ -35,4 +35,4 @@ export abstract class BaseEntityWithTimestamps implements AuthorizableObject {
 }
 
 // These fields are explicitly ignored when updating an entity. See base.do.repo.ts.
-export const baseEntityProperties = ['updatedAt', 'createdAt'];
+export const baseEntityProperties = ['id', '_id', 'updatedAt', 'createdAt'];
diff --git a/jest.config.ts b/jest.config.ts
@@ -43,7 +43,7 @@ if (!process.env.RUN_WITHOUT_JEST_COVERAGE) {
 			},
 			// add custom paths: './apps/server/path...': { branches: X, functions: ... }
 		},
-		testTimeout: 3600000
+		testTimeout: 5000
 	};
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ if (!process.env.RUN_WITHOUT_JEST_COVERAGE) { @@
     			},
     			// add custom paths: './apps/server/path...': { branches: X, functions: ... }
     		},
-    		testTimeout: 3600000
+    		testTimeout: 5000
     	};
     }
@@ Expand Down @@