refactoring

Author: pashidlos

lib/types/index.ts

@@ -1,5 +1,5 @@
-export * from "./response/buildResponse";
 export * from "./config";
 export * from "./testRun";
+export * from "./response/buildResponse";
 export * from "./response/testRunResponse";
 export * from "./testStatus";

lib/visualRegressionTracker.spec.ts

@@ -1,5 +1,11 @@
 import { VisualRegressionTracker } from "./visualRegressionTracker";
-import { Config, BuildResponse, TestRun, TestRunResponse, TestStatus } from "./types";
+import {
+  Config,
+  BuildResponse,
+  TestRun,
+  TestRunResponse,
+  TestStatus,
+} from "./types";
 import { mocked } from "ts-jest/utils";
 import TestRunResult from "./testRunResult";
 import axios, { AxiosError, AxiosResponse } from "axios";
@@ -137,60 +143,17 @@ describe("VisualRegressionTracker", () => {
       vrt["submitTestResult"] = jest
         .fn()
         .mockResolvedValueOnce(testRunResponse);
+      vrt["processTestRun"] = jest.fn();
 
       await vrt.track(testRun);
 
       expect(vrt["submitTestResult"]).toHaveBeenCalledWith(testRun);
+      expect(vrt["processTestRun"]).toHaveBeenCalledWith(testRunResponse);
       expect(mockedTestRunResult).toHaveBeenCalledWith(
         testRunResponse,
         "http://localhost:4200"
       );
     });
-
-    describe.each<[TestStatus.new | TestStatus.unresolved, string]>([
-      [TestStatus.new, "No baseline: "],
-      [TestStatus.unresolved, "Difference found: "],
-    ])("should track error", (status, expectedMessage) => {
-      const testRunResponseMock: TestRunResponse = {
-        url: "http://foo.bar",
-        status: TestStatus.ok,
-        pixelMisMatchCount: 12,
-        diffPercent: 0.12,
-        diffTollerancePercent: 0,
-        id: "some id",
-        imageName: "imageName",
-        merge: false,
-      };
-
-      beforeEach(() => {
-        testRunResponseMock.status = status;
-      });
-
-      it(`disabled soft assert should throw exception if status ${status}`, async () => {
-        vrt["config"].enableSoftAssert = false;
-        vrt["submitTestResult"] = jest
-          .fn()
-          .mockResolvedValueOnce(testRunResponseMock);
-
-        await expect(vrt.track(testRun)).rejects.toThrowError(
-          new Error(expectedMessage.concat(testRunResponseMock.url))
-        );
-      });
-
-      it(`enabled soft assert should log error if status ${status}`, async () => {
-        console.error = jest.fn();
-        vrt["config"].enableSoftAssert = true;
-        vrt["submitTestResult"] = jest
-          .fn()
-          .mockResolvedValueOnce(testRunResponseMock);
-
-        await vrt.track(testRun);
-
-        expect(console.error).toHaveBeenCalledWith(
-          expectedMessage.concat(testRunResponseMock.url)
-        );
-      });
-    });
   });
 
   describe("start", () => {
@@ -396,4 +359,43 @@ describe("VisualRegressionTracker", () => {
       );
     });
   });
+
+  describe.each<[TestStatus.new | TestStatus.unresolved, string]>([
+    [TestStatus.new, "No baseline: "],
+    [TestStatus.unresolved, "Difference found: "],
+  ])("processTestRun", (status, expectedMessage) => {
+    const testRunResponse: TestRunResponse = {
+      url: "http://foo.bar",
+      status: TestStatus.ok,
+      pixelMisMatchCount: 12,
+      diffPercent: 0.12,
+      diffTollerancePercent: 0,
+      id: "some id",
+      imageName: "imageName",
+      merge: false,
+    };
+
+    beforeEach(() => {
+      testRunResponse.status = status;
+    });
+
+    it(`disabled soft assert should throw exception if status ${status}`, () => {
+      vrt["config"].enableSoftAssert = false;
+
+      expect(() => vrt["processTestRun"](testRunResponse)).toThrowError(
+        new Error(expectedMessage.concat(testRunResponse.url))
+      );
+    });
+
+    it(`enabled soft assert should log error if status ${status}`, () => {
+      console.error = jest.fn();
+      vrt["config"].enableSoftAssert = true;
+
+      vrt["processTestRun"](testRunResponse);
+
+      expect(console.error).toHaveBeenCalledWith(
+        expectedMessage.concat(testRunResponse.url)
+      );
+    });
+  });
 });

lib/visualRegressionTracker.ts

@@ -5,7 +5,7 @@ import {
   TestRunResponse,
   TestStatus,
 } from "./types";
-import TestRunResult from "./testRunResult"
+import TestRunResult from "./testRunResult";
 import axios, { AxiosRequestConfig, AxiosResponse, AxiosError } from "axios";
 
 export class VisualRegressionTracker {
@@ -99,6 +99,12 @@ export class VisualRegressionTracker {
   async track(test: TestRun): Promise<TestRunResult> {
     const testRunResponse = await this.submitTestResult(test);
 
+    this.processTestRun(testRunResponse);
+
+    return new TestRunResult(testRunResponse, this.config.apiUrl);
+  }
+
+  private processTestRun(testRunResponse: TestRunResponse): void {
     let errorMessage: string | undefined;
     switch (testRunResponse.status) {
       case TestStatus.new: {
@@ -107,6 +113,7 @@ export class VisualRegressionTracker {
       }
       case TestStatus.unresolved: {
         errorMessage = `Difference found: ${testRunResponse.url}`;
+        break;
       }
     }
 
@@ -118,7 +125,5 @@ export class VisualRegressionTracker {
         throw new Error(errorMessage);
       }
     }
-
-    return new TestRunResult(testRunResponse, this.config.apiUrl);
   }
 }