fix: infinite loop with additional options without rateLimit (#83)

Visual-Regression-Tracker · Mar 8, 2021 · c45a2ff · c45a2ff
1 parent 05e7e20
commit c45a2ff
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,8 +1,6 @@
 name: CI
 
 on:
-  push:
-    branches: [master]
   pull_request:
     branches: [master]
 

diff --git a/cypress/integration/regression.spec.ts b/cypress/integration/regression.spec.ts
@@ -48,9 +48,7 @@ describe("Regression suite", () => {
         cy.stub().as("trackFn").resolves(testRunResponce),
         cy.stub().as("shouldStopFn").returns(false),
         cy.stub().as("checkResult"),
-        {
-          retryLimit: 5,
-        }
+        5
       );
 
       cy.get("@trackFn").should("have.callCount", 6);

diff --git a/lib/commands.ts b/lib/commands.ts
@@ -54,7 +54,7 @@ export const addVrtTrackCommand = () =>
         () => trackImage(subject, name, options),
         (result) => shouldStopRetry(result),
         (result) => checkResult(result),
-        options
+        options.retryLimit
       );
     }
   );
diff --git a/lib/utils.ts b/lib/utils.ts
@@ -13,22 +13,16 @@ export const trackWithRetry = (
   trackFn: () => Cypress.Chainable<TestRunResponse>,
   shouldStopFn: (result: TestRunResponse) => boolean,
   onStopFn: (result: TestRunResponse) => Cypress.Chainable<unknown>,
-  options: {
-    retryLimit: number;
-  } = {
-    retryLimit: 2,
-  }
+  retryLimit: number = 2
 ): Cypress.Chainable<unknown> => {
   return trackFn().then((result) => {
-    if (options.retryLimit <= 0 || shouldStopFn(result)) {
+    if (retryLimit <= 0 || shouldStopFn(result)) {
       onStopFn(result);
       return;
     }
 
-    log(`Diff found... Remaining retry attempts **${options.retryLimit}**`);
-    return trackWithRetry(trackFn, shouldStopFn, onStopFn, {
-      retryLimit: options.retryLimit - 1,
-    });
+    log(`Diff found... Remaining retry attempts **${retryLimit}**`);
+    return trackWithRetry(trackFn, shouldStopFn, onStopFn, retryLimit - 1);
   });
 };