@koenvanbelle/cypress-soft-assertions 2.4.2 → 2.4.3

package/dist/index.js

@@ -161,6 +161,12 @@ function setupSoftAssertions() {
             // Final aggregated error must propagate to fail the test.
             if (String((error === null || error === void 0 ? void 0 : error.name) || '') === 'SoftAssertionError')
                 throw error;
+            const runnable = cy.state('runnable');
+            const retryStatusInfo = getRetryStatusInfo(runnable);
+            if (retryStatusInfo.shouldAttemptsContinue) {
+                abortSoftTest();
+                throw error;
+            }
             // Check if this is an assertion error that was already handled by
             // patchedAssertionAssert (swallowed after timeout). In that case
             // the fail handler should NOT fire. But for non-assertion command
@@ -220,6 +226,41 @@ function abortSoftTest() {
     retryAssertionFailures.clear();
     retryFirstSeen.clear();
 }
+function getRetryStatusInfo(test) {
+    var _a;
+    const currentRetry = typeof (test === null || test === void 0 ? void 0 : test.currentRetry) === 'function'
+        ? test.currentRetry()
+        : typeof Cypress.currentRetry === 'number'
+            ? Cypress.currentRetry
+            : 0;
+    const maxRetries = typeof (test === null || test === void 0 ? void 0 : test.retries) === 'function'
+        ? test.retries()
+        : typeof (test === null || test === void 0 ? void 0 : test._retries) === 'number'
+            ? test._retries
+            : typeof Cypress.getTestRetries === 'function'
+                ? (_a = Cypress.getTestRetries()) !== null && _a !== void 0 ? _a : 0
+                : 0;
+    return {
+        attempts: currentRetry + 1,
+        shouldAttemptsContinue: currentRetry < maxRetries,
+    };
+}
+function finalizeSoftTestInQueue(expectsSoftFailure) {
+    return cy.then(() => {
+        if (!isInSoftTest)
+            return;
+        const finalError = finalizeSoftTest();
+        if (expectsSoftFailure) {
+            if (!finalError) {
+                throw new Error('Expected SoftAssertionError but soft_it.expectFailure test completed without one.');
+            }
+            return;
+        }
+        if (finalError) {
+            throw finalError;
+        }
+    });
+}
 function createSoftIt(baseIt, options) {
     return function (title, fn) {
         return baseIt(title, function () {
@@ -230,7 +271,14 @@ function createSoftIt(baseIt, options) {
             retryFirstSeen.clear();
             setupSoftAssertions();
             try {
-                return fn.call(this);
+                const result = fn.call(this);
+                if (result && typeof result.then === 'function' && !Cypress.isCy(result)) {
+                    return Cypress.Promise.resolve(result).then(() => {
+                        finalizeSoftTestInQueue(expectSoftFailureCurrentSoftTest);
+                    });
+                }
+                finalizeSoftTestInQueue(expectSoftFailureCurrentSoftTest);
+                return result;
             }
             catch (error) {
                 abortSoftTest();
@@ -291,11 +339,15 @@ afterEach(function () {
     if (finalError) {
         const test = this.currentTest;
         if (test) {
+            const retryStatusInfo = getRetryStatusInfo(test);
+            if (retryStatusInfo.shouldAttemptsContinue) {
+                throw finalError;
+            }
             test.err = finalError;
             test._cypressTestStatusInfo = {
                 outerStatus: 'failed',
-                shouldAttemptsContinue: false,
-                attempts: typeof test.currentRetry === 'function' ? test.currentRetry() + 1 : 1,
+                shouldAttemptsContinue: retryStatusInfo.shouldAttemptsContinue,
+                attempts: retryStatusInfo.attempts,
                 strategy: 'detect-flake-and-pass-on-threshold',
             };
             const prevAttempts = Array.isArray(test.prevAttempts) ? test.prevAttempts : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koenvanbelle/cypress-soft-assertions",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "A Cypress plugin that provides soft_it() for soft assertions - all assertions continue on failure and are reported together",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",