feat: handle soft asserts, fix video attachment on pass, address #108, …

…#109
Shelex · Dec 8, 2021 · 57d5b23 · 57d5b23
1 parent 9c3fd40
commit 57d5b23
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 13 deletions.
diff --git a/reporter/allure-cypress/AllureInterface.js b/reporter/allure-cypress/AllureInterface.js
@@ -76,9 +76,11 @@ Allure.prototype.stepEnd = function () {
     // just find the last user created step and finish it
     const step = this.reporter.popStep();
     if (step) {
-        const status = getStatus(this);
+        if (step.status !== Status.FAILED) {
+            const status = getStatus(this);
+            step.stepResult.status = status;
+        }
         step.stepResult.stage = Stage.FINISHED;
-        step.stepResult.status = status;
         step.endStep();
     }
 };

diff --git a/reporter/allure-cypress/AllureReporter.js b/reporter/allure-cypress/AllureReporter.js
@@ -318,17 +318,28 @@ module.exports = class AllureReporter {
     }
 
     finishRemainingSteps(status = Status.PASSED) {
+        const alreadyHasFailedStep =
+            this.currentTest &&
+            this.currentTest.info &&
+            this.currentTest.info.steps.some(
+                (step) => step.status === Status.FAILED
+            );
+
         this.steps.forEach((step) => {
             step.info.stage = Stage.FINISHED;
-            if (step.info.steps.length) {
-                step.info.status = step.info.steps.some(
-                    (step) => step.status === Status.FAILED
-                )
-                    ? Status.FAILED
-                    : Status.PASSED;
-            } else {
-                step.info.status = status;
+
+            if (!alreadyHasFailedStep) {
+                if (step.info.steps.length) {
+                    step.info.status = step.info.steps.some(
+                        (step) => step.status === Status.FAILED
+                    )
+                        ? Status.FAILED
+                        : Status.PASSED;
+                } else {
+                    step.info.status = status;
+                }
             }
+
             step.endStep();
         });
         this.steps = [];

diff --git a/reporter/index.js b/reporter/index.js
@@ -167,6 +167,19 @@ class CypressAllureReporter {
                 this.reporter.cy.finished(command.attributes);
             }
         });
+
+        Cypress.on('log:added', (log) => {
+            if (log.state === 'failed') {
+                logger.cy('found failed log:added %O', log);
+
+                if (
+                    this.reporter.currentExecutable &&
+                    this.reporter.currentExecutable.info
+                ) {
+                    this.reporter.currentExecutable.info.status = 'failed';
+                }
+            }
+        });
     }
 }
 

diff --git a/writer.js b/writer.js
@@ -29,7 +29,7 @@ function allureWriter(on, config) {
             try {
                 results.error
                     ? handleCrash(results)
-                    : attachScreenshotsAndVideo(allureMapping, results);
+                    : attachScreenshotsAndVideo(allureMapping, results, config);
             } catch (e) {
                 logger.writer(
                     'failed to add attachments in "after:spec" due to: %O',

diff --git a/writer/attachments.js b/writer/attachments.js
@@ -6,7 +6,7 @@ const logger = require('../reporter/debug');
 const videoContentType = 'video/mp4';
 const imageContentType = 'image/png';
 
-const attachScreenshotsAndVideo = (allureMapping, results) => {
+const attachScreenshotsAndVideo = (allureMapping, results, config) => {
     if (!allureMapping) {
         logger.writer('not found mapping of mocha test id to allure test ids');
         return;
@@ -16,6 +16,8 @@ const attachScreenshotsAndVideo = (allureMapping, results) => {
         results.video &&
         `${uuid.v4()}-attachment${path.extname(results.video)}`;
 
+    const shouldAddVideoOnPass = config.env.allureAddVideoOnPass !== false;
+
     const needVideo = results.tests.filter((test) => {
         const allureId = allureMapping[test.testId];
         if (!allureId) {
@@ -72,7 +74,11 @@ const attachScreenshotsAndVideo = (allureMapping, results) => {
             });
         });
 
-        if (results.video) {
+        if (
+            results.video &&
+            // attach video for not passed tests or for every in case "allureAddVideoOnPass" enabled
+            (allureTest.status !== 'passed' || shouldAddVideoOnPass)
+        ) {
             logger.writer('going to attach video for "%s"', allureId);
             const existingVideoIndex = allureTest.attachments.findIndex(
                 (attach) => attach.type === videoContentType