@brillout/test-e2e 0.5.19 → 0.5.21

package/dist/runAll.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runAll = void 0;
 const getCurrentTest_1 = require("./getCurrentTest");
@@ -12,6 +15,7 @@ const findTestFiles_1 = require("./findTestFiles");
 const getConfig_1 = require("./getConfig");
 const logError_1 = require("./logError");
 const logTestStatus_1 = require("./logTestStatus");
+const picocolors_1 = __importDefault(require("picocolors"));
 async function runAll(filter) {
     await (0, getConfig_1.loadConfig)();
     const testFiles = await (0, findTestFiles_1.findTestFiles)(filter);
@@ -25,10 +29,10 @@ async function runAll(filter) {
         //  - When assert.ts calls logFail() this code block isn't run
         (0, utils_1.assert)(hasFailedTestFile && hasFailLog);
         (0, utils_1.assert)(failedTestFiles.length > 0);
-        throw new Error([
-            'Following test files failed, see logs above for more information (search for [TEST_FAILURE]).',
+        throw new Error(picocolors_1.default.red(picocolors_1.default.bold([
+            'Following test files failed, see logs above for more information (search for [TEST_FAILURE]):',
             ...failedTestFiles.map((testFile) => `  ${testFile}`),
-        ].join('\n'));
+        ].join('\n'))));
     }
 }
 exports.runAll = runAll;
@@ -37,10 +41,10 @@ async function runTestFiles(testFiles, browser) {
     let failedTestFiles = [];
     let doNotRetry = false;
     for (const testFile of testFiles) {
-        const success = await buildAndTest(testFile, browser, false);
+        const { success, isFlaky } = await buildAndTest(testFile, browser, false);
         if (!success) {
             failedTestFiles.push(testFile);
-            if (!isFlaky()) {
+            if (!isFlaky) {
                 doNotRetry = true;
             }
             if (utils_1.cliOptions.bail) {
@@ -57,9 +61,9 @@ async function runTestFiles(testFiles, browser) {
     else {
         // Second & third attempt
         for (let i = 0; i <= 1; i++) {
-            console.log((i === 0 ? 'SECOND' : 'THIRD') + '_ATTEMPT');
+            console.log('[' + (i === 0 ? 'SECOND' : 'THIRD') + '_ATTEMPT]');
             for (const testFile of failedTestFiles) {
-                const success = await buildAndTest(testFile, browser, i === 1);
+                const { success } = await buildAndTest(testFile, browser, i === 1);
                 if (success) {
                     failedTestFiles = failedTestFiles.filter((t) => t !== testFile);
                 }
@@ -68,12 +72,6 @@ async function runTestFiles(testFiles, browser) {
         return failedTestFiles;
     }
 }
-function isFlaky() {
-    const testInfo = (0, getCurrentTest_1.getCurrentTest)();
-    // Set when user calls run()
-    (0, utils_1.assert)(testInfo.runInfo);
-    return testInfo.runInfo.isFlaky;
-}
 async function buildAndTest(testFile, browser, isThirdAttempt) {
     (0, utils_1.assert)(testFile.endsWith('.ts'));
     const testFileJs = testFile.replace('.ts', '.mjs');
@@ -95,35 +93,45 @@ async function buildAndTest(testFile, browser, isThirdAttempt) {
     if (execErr) {
         (0, logTestStatus_1.logFail)(`an error was thrown while executing the file ${testFile}`, true);
         (0, logError_1.logError)(execErr);
-        return false;
+        return {
+            success: false,
+            isFlaky: false,
+        };
     }
     // When user calls skip()
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     if (testInfo.skipped) {
         assertSkipUsage(testInfo);
         (0, logTestStatus_1.logWarn)(testInfo.skipped.reason);
-        return true;
+        return {
+            success: true,
+            isFlaky: false,
+        };
     }
     else {
         // Set when user calls run() or runCommandThatTerminates()
         (0, utils_1.assert)(testInfo.runInfo);
     }
+    const { isFlaky } = testInfo.runInfo;
     // When user calls run runCommandThatTerminates()
     if (testInfo.runInfo.isRunCommandThatTerminates) {
         (0, utils_1.assertUsage)(!testInfo.tests, "Can't call test() when calling runCommandThatTerminates()");
         (0, utils_1.assertUsage)(!testInfo.startServer, "Can't call run() when calling runCommandThatTerminates()");
         (0, logTestStatus_1.logPass)();
-        return true;
+        return {
+            success: true,
+            isFlaky,
+        };
     }
-    const success = await runServerAndTests(browser, isThirdAttempt);
+    const success = await runServerAndTests(browser, isThirdAttempt, isFlaky);
     (0, getCurrentTest_2.setCurrentTest)(null);
-    return success;
+    return { success, isFlaky };
 }
-async function runServerAndTests(browser, isThirdAttempt) {
+async function runServerAndTests(browser, isThirdAttempt, isFlaky) {
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     (0, utils_1.assert)(testInfo.startServer);
     (0, utils_1.assert)(testInfo.terminateServer);
-    const isFinalAttempt = isThirdAttempt || !isFlaky();
+    const isFinalAttempt = isThirdAttempt || !isFlaky;
     const page = await browser.newPage();
     testInfo.page = page;
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/test-e2e",
-  "version": "0.5.19",
+  "version": "0.5.21",
   "bin": "./bin.js",
   "main": "./dist/index.js",
   "scripts": {
@@ -13,7 +13,7 @@
     "release": "npm version patch && npm publish && git push && git push --tags"
   },
   "dependencies": {
-    "@brillout/part-regex": "^0.1.2",
+    "@brillout/part-regex": "^0.1.3",
     "chai": "^4.3.6",
     "esbuild": "^0.16.5",
     "fast-glob": "^3.2.12",