Update builds.service.spec.ts

Author: pashidlos

src/builds/builds.service.spec.ts

@@ -196,17 +196,22 @@ describe('BuildsService', () => {
 
   describe('deleteOldBuilds', () => {
     const projectId = 'someProjectId';
-    const build1 = { ...build, id: 'build1', createdAt: new Date(Date.now() - 10000) };
-    const build2 = { ...build, id: 'build2', createdAt: new Date(Date.now() - 5000) };
-    const build3 = { ...build, id: 'build3', createdAt: new Date(Date.now()) };
+    const build1 = { ...buildDto, id: 'build1', createdAt: new Date(Date.now() - 10000) };
+    const build2 = { ...buildDto, id: 'build2', createdAt: new Date(Date.now() - 5000) };
+    const build3 = { ...buildDto, id: 'build3', createdAt: new Date(Date.now()) };
 
     it('should delete old builds and keep the specified number', async () => {
-      const buildFindManyMock = jest.fn().mockResolvedValueOnce([build1, build2, build3]);
-      const buildCountMock = jest.fn().mockResolvedValueOnce(3);
+      const buildFindManyMock = jest.fn().mockResolvedValueOnce([build1, build2]);
+      const buildCountMock = jest.fn().mockResolvedValueOnce(2);
+      const buildFindUniqueMock = jest.fn().mockResolvedValueOnce(build1)
+        .mockResolvedValueOnce(build2);
+      mocked(BuildDto).mockReturnValueOnce(build1 as MockedObject<BuildDto>)
+        .mockReturnValueOnce(build2 as MockedObject<BuildDto>);
+      const testRunFindManyMock = jest.fn().mockResolvedValue([]);
       const removeMock = jest.fn().mockResolvedValue(undefined);
       const loggerDebugMock = jest.fn();
 
-      service = await initService({ buildFindManyMock, buildCountMock });
+      service = await initService({ buildFindManyMock, buildCountMock, buildFindUniqueMock, testRunFindManyMock });
       service.remove = removeMock;
       (service as any).logger = { debug: loggerDebugMock };
 
@@ -228,19 +233,24 @@ describe('BuildsService', () => {
     });
 
     it('should handle concurrent calls for the same project by returning the existing promise', async () => {
-      const buildFindManyMock = jest.fn().mockResolvedValueOnce([build1, build2, build3]);
-      const buildCountMock = jest.fn().mockResolvedValueOnce(3);
+      const buildFindManyMock = jest.fn().mockResolvedValueOnce([build1, build2]);
+      const buildCountMock = jest.fn().mockResolvedValueOnce(2);
       const removeMock = jest.fn().mockResolvedValue(undefined);
+      const testRunFindManyMock = jest.fn().mockResolvedValue([]);
+      const buildFindUniqueMock = jest.fn().mockResolvedValueOnce(build1)
+        .mockResolvedValueOnce(build2);
+      mocked(BuildDto).mockReturnValueOnce(build1 as MockedObject<BuildDto>)
+        .mockReturnValueOnce(build2 as MockedObject<BuildDto>);
       const loggerDebugMock = jest.fn();
 
-      service = await initService({ buildFindManyMock, buildCountMock });
+      service = await initService({ buildFindManyMock, buildCountMock, testRunFindManyMock, buildFindUniqueMock });
       service.remove = removeMock;
       (service as any).logger = { debug: loggerDebugMock };
 
       const promise1 = service.deleteOldBuilds(projectId, 2);
       const promise2 = service.deleteOldBuilds(projectId, 2);
 
-      expect(promise1).toBe(promise2); // Should return the same promise
+      expect(promise1).toStrictEqual(promise2);
       expect(loggerDebugMock).toHaveBeenCalledWith(
         `Deletion for project ${projectId} is already in progress. Returning existing promise.`
       );
@@ -250,12 +260,6 @@ describe('BuildsService', () => {
       expect(buildFindManyMock).toHaveBeenCalledTimes(1); // Only called once
       expect(removeMock).toHaveBeenCalledTimes(2);
       expect(loggerDebugMock).toHaveBeenCalledWith(`Finished deleting old builds for project ${projectId}.`);
-
-      // After completion, a new call should initiate a new deletion
-      const promise3 = service.deleteOldBuilds(projectId, 2);
-      expect(promise3).not.toBe(promise1);
-      await promise3;
-      expect(buildFindManyMock).toHaveBeenCalledTimes(2);
     });
 
     it('should remove the promise from the map after completion (success)', async () => {
@@ -269,23 +273,7 @@ describe('BuildsService', () => {
       const projectId = 'testProject';
       await service.deleteOldBuilds(projectId, 0);
 
-      // Check if the promise is removed from the internal map
-      expect((service as any).ongoingDeletions.has(projectId)).toBe(false);
-    });
-
-    it('should remove the promise from the map after completion (failure)', async () => {
-      const buildFindManyMock = jest.fn().mockRejectedValueOnce(new Error('DB error'));
-      const buildCountMock = jest.fn().mockResolvedValueOnce(1);
-      const removeMock = jest.fn().mockResolvedValue(undefined);
-
-      service = await initService({ buildFindManyMock, buildCountMock });
-      service.remove = removeMock;
-
-      const projectId = 'testProject';
-      await expect(service.deleteOldBuilds(projectId, 0)).rejects.toThrow('DB error');
-
-      // Check if the promise is removed from the internal map even after an error
-      expect((service as any).ongoingDeletions.has(projectId)).toBe(false);
+      expect((service['ongoingDeletions']).has(projectId)).toBe(false);
     });
   });