ignore area concat added

Author: pashidlos

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

@@ -491,7 +491,7 @@ describe('TestRunsService', () => {
       baseline,
       image,
       testRun.diffTollerancePercent,
-      testVariation.ignoreAreas
+      JSON.parse(testVariation.ignoreAreas)
     );
     expect(getImageMock).toHaveBeenNthCalledWith(1, testVariation.baselineName);
     expect(getImageMock).toHaveBeenNthCalledWith(2, imageName);
@@ -523,7 +523,12 @@ describe('TestRunsService', () => {
         status: TestStatus.new,
       },
     });
-    expect(getDiffMock).toHaveBeenCalledWith(baseline, image, testRun.diffTollerancePercent, testRun.ignoreAreas);
+    expect(getDiffMock).toHaveBeenCalledWith(
+      baseline,
+      image,
+      testRun.diffTollerancePercent,
+      JSON.parse(testRun.ignoreAreas)
+    );
     expect(saveDiffResultMock).toHaveBeenCalledWith(testRun.id, diffResult);
     expect(eventTestRunCreatedMock).toHaveBeenCalledWith(testRunWithResult);
     expect(result).toBe(testRunWithResult);
@@ -538,7 +543,7 @@ describe('TestRunsService', () => {
       });
       service = await initService({});
 
-      const result = service.getDiff(baseline, image, 0, '[]');
+      const result = service.getDiff(baseline, image, 0, []);
 
       expect(result).toStrictEqual({
         status: undefined,
@@ -560,7 +565,7 @@ describe('TestRunsService', () => {
       });
       service = await initService({});
 
-      const result = service.getDiff(baseline, image, 0, '[]');
+      const result = service.getDiff(baseline, image, 0, []);
 
       expect(result).toStrictEqual({
         status: TestStatus.unresolved,
@@ -583,7 +588,7 @@ describe('TestRunsService', () => {
       service = await initService({});
       mocked(Pixelmatch).mockReturnValueOnce(0);
 
-      const result = service.getDiff(baseline, image, 0, '[]');
+      const result = service.getDiff(baseline, image, 0, []);
 
       expect(result).toStrictEqual({
         status: TestStatus.ok,
@@ -608,7 +613,7 @@ describe('TestRunsService', () => {
       const pixelMisMatchCount = 150;
       mocked(Pixelmatch).mockReturnValueOnce(pixelMisMatchCount);
 
-      const result = service.getDiff(baseline, image, 1.5, '[]');
+      const result = service.getDiff(baseline, image, 1.5, []);
 
       expect(saveImageMock).toHaveBeenCalledTimes(0);
       expect(result).toStrictEqual({
@@ -637,7 +642,7 @@ describe('TestRunsService', () => {
         saveImageMock,
       });
 
-      const result = service.getDiff(baseline, image, 1, '[]');
+      const result = service.getDiff(baseline, image, 1, []);
 
       expect(saveImageMock).toHaveBeenCalledTimes(1);
       expect(result).toStrictEqual({
@@ -689,7 +694,7 @@ describe('TestRunsService', () => {
       baselineMock,
       imageeMock,
       testRun.diffTollerancePercent,
-      testRun.ignoreAreas
+      JSON.parse(testRun.ignoreAreas)
     );
     expect(service.emitUpdateBuildEvent).toBeCalledWith(testRun.buildId);
   });

src/test-runs/test-runs.service.ts

@@ -184,7 +184,7 @@ export class TestRunsService {
     const image = this.staticService.getImage(testRun.imageName);
     await this.staticService.deleteImage(testRun.diffName);
 
-    const diffResult = this.getDiff(baseline, image, testRun.diffTollerancePercent, testRun.ignoreAreas);
+    const diffResult = this.getDiff(baseline, image, testRun.diffTollerancePercent, JSON.parse(testRun.ignoreAreas));
     const updatedTestRun = await this.saveDiffResult(id, diffResult);
     this.emitUpdateBuildEvent(testRun.buildId);
     return updatedTestRun;
@@ -227,7 +227,14 @@ export class TestRunsService {
     const baseline = this.staticService.getImage(testRun.baselineName);
     const image = this.staticService.getImage(imageName);
 
-    const diffResult = this.getDiff(baseline, image, testRun.diffTollerancePercent, testVariation.ignoreAreas);
+    let ignoreAreas: IgnoreAreaDto[] = [];
+    if (!!testVariation.ignoreAreas) {
+      ignoreAreas = ignoreAreas.concat(JSON.parse(testVariation.ignoreAreas));
+    }
+    if (createTestRequestDto.ignoreAreas?.length > 0) {
+      ignoreAreas = ignoreAreas.concat(createTestRequestDto.ignoreAreas);
+    }
+    const diffResult = this.getDiff(baseline, image, testRun.diffTollerancePercent, ignoreAreas);
 
     const testRunWithResult = await this.saveDiffResult(testRun.id, diffResult);
     this.eventsGateway.testRunCreated(testRunWithResult);
@@ -267,7 +274,7 @@ export class TestRunsService {
     });
   }
 
-  getDiff(baseline: PNG, image: PNG, diffTollerancePercent: number, ignoreAreas: string): DiffResult {
+  getDiff(baseline: PNG, image: PNG, diffTollerancePercent: number, ignoreAreas: IgnoreAreaDto[]): DiffResult {
     const result: DiffResult = {
       status: undefined,
       diffName: null,
@@ -287,8 +294,8 @@ export class TestRunsService {
 
         // compare
         result.pixelMisMatchCount = Pixelmatch(
-          this.applyIgnoreAreas(baseline, JSON.parse(ignoreAreas)),
-          this.applyIgnoreAreas(image, JSON.parse(ignoreAreas)),
+          this.applyIgnoreAreas(baseline, ignoreAreas),
+          this.applyIgnoreAreas(image, ignoreAreas),
           diff.data,
           baseline.width,
           baseline.height,

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

@@ -454,13 +454,15 @@ describe('TestVariationsService', () => {
       imageBase64: PNG.sync.write(image).toString('base64'),
       diffTollerancePercent: 0,
       merge: true,
+      ignoreAreas: JSON.parse(testVariation.ignoreAreas),
     });
     expect(testRunCreateMock).toHaveBeenNthCalledWith(2, testVariationMainBranch, {
       ...testVariationSecond,
       buildId: build.id,
       imageBase64: PNG.sync.write(image).toString('base64'),
       diffTollerancePercent: 0,
       merge: true,
+      ignoreAreas: JSON.parse(testVariationSecond.ignoreAreas),
     });
     expect(testRunCreateMock).toHaveBeenCalledTimes(2);
     expect(buildStopMock).toHaveBeenCalledWith(build.id);