test run create now async

Author: pashidlos

src/test-variations/test-variations.service.spec.ts

@@ -407,6 +407,21 @@ describe('TestVariationsService', () => {
       updatedAt: new Date(),
       branchName: mergedBranch,
     };
+    const testVariationSecond: TestVariation = {
+      id: '123',
+      projectId: project.id,
+      name: 'Test name second',
+      baselineName: 'baselineName',
+      os: 'OS',
+      browser: 'browser',
+      viewport: 'viewport',
+      device: 'device',
+      ignoreAreas: '[]',
+      comment: 'some comment',
+      createdAt: new Date(),
+      updatedAt: new Date(),
+      branchName: mergedBranch,
+    };
     const testVariationNoBaseline: TestVariation = {
       id: '123',
       projectId: project.id,
@@ -439,16 +454,22 @@ describe('TestVariationsService', () => {
     };
     const projectFindOneMock = jest.fn().mockResolvedValueOnce(project);
     const buildCreateMock = jest.fn().mockResolvedValueOnce(build);
-    const variationFindManyMock = jest.fn().mockResolvedValueOnce([testVariation, testVariationNoBaseline]);
+    const variationFindManyMock = jest
+      .fn()
+      .mockResolvedValueOnce([testVariation, testVariationSecond, testVariationNoBaseline]);
     const image = new PNG({
       width: 10,
       height: 10,
     });
     const getImageMock = jest
       .fn()
       .mockReturnValueOnce(image)
+      .mockReturnValueOnce(image)
       .mockReturnValueOnce(null);
-    const findOrCreateMock = jest.fn().mockResolvedValueOnce(testVariationMainBranch);
+    const findOrCreateMock = jest
+      .fn()
+      .mockResolvedValueOnce(testVariationMainBranch)
+      .mockResolvedValueOnce(testVariationMainBranch);
     const testRunCreateMock = jest.fn();
     const service = await initModule({
       projectFindOneMock,
@@ -478,12 +499,22 @@ describe('TestVariationsService', () => {
       viewport: testVariation.viewport,
       branchName: project.mainBranchName,
     });
-    expect(testRunCreateMock).toHaveBeenCalledWith(testVariationMainBranch, {
+
+    await new Promise(r => setTimeout(r, 1));
+    expect(testRunCreateMock).toHaveBeenNthCalledWith(1, testVariationMainBranch, {
       ...testVariation,
       buildId: build.id,
       imageBase64: PNG.sync.write(image).toString('base64'),
       diffTollerancePercent: 0,
       merge: true,
     });
+    expect(testRunCreateMock).toHaveBeenNthCalledWith(2, testVariationMainBranch, {
+      ...testVariationSecond,
+      buildId: build.id,
+      imageBase64: PNG.sync.write(image).toString('base64'),
+      diffTollerancePercent: 0,
+      merge: true,
+    });
+    expect(testRunCreateMock).toHaveBeenCalledTimes(2);
   });
 });

src/test-variations/test-variations.service.ts

@@ -134,36 +134,34 @@ export class TestVariationsService {
     });
 
     // compare to main branch variations
-    await Promise.all(
-      testVariations.map(async sideBranchTestVariation => {
-        const baseline = this.staticService.getImage(sideBranchTestVariation.baselineName);
-        if (baseline) {
-          try {
-            let imageBase64 = PNG.sync.write(baseline).toString('base64');
-
-            // get main branch variation
-            const baselineData = convertBaselineDataToQuery({
-              ...sideBranchTestVariation,
-              branchName: project.mainBranchName,
-            });
-            const mainBranchTestVariation = await this.findOrCreate(projectId, baselineData);
-
-            // get side branch request
-            const createTestRequestDto: CreateTestRequestDto = {
-              ...sideBranchTestVariation,
-              buildId: build.id,
-              imageBase64,
-              diffTollerancePercent: 0,
-              merge: true,
-            };
-
-            return this.testRunsService.create(mainBranchTestVariation, createTestRequestDto);
-          } catch (err) {
-            console.log(err);
-          }
+    testVariations.map(async sideBranchTestVariation => {
+      const baseline = this.staticService.getImage(sideBranchTestVariation.baselineName);
+      if (baseline) {
+        try {
+          let imageBase64 = PNG.sync.write(baseline).toString('base64');
+
+          // get main branch variation
+          const baselineData = convertBaselineDataToQuery({
+            ...sideBranchTestVariation,
+            branchName: project.mainBranchName,
+          });
+          const mainBranchTestVariation = await this.findOrCreate(projectId, baselineData);
+
+          // get side branch request
+          const createTestRequestDto: CreateTestRequestDto = {
+            ...sideBranchTestVariation,
+            buildId: build.id,
+            imageBase64,
+            diffTollerancePercent: 0,
+            merge: true,
+          };
+
+          return this.testRunsService.create(mainBranchTestVariation, createTestRequestDto);
+        } catch (err) {
+          console.log(err);
         }
-      })
-    );
+      }
+    });
 
     return build;
   }