@brillout/test-e2e 0.5.4 → 0.5.6

package/dist/getConfig.d.ts

@@ -2,7 +2,6 @@ export { getConfig };
 export { loadConfig };
 declare type Config = {
     tolerateError?: Function;
-    tolerateSkip?: boolean;
     ci?: never;
 };
 declare function getConfig(): Config;

package/dist/getConfig.js

@@ -30,9 +30,6 @@ function assertConfig(config) {
         if (key === 'tolerateError') {
             (0, utils_1.assertUsage)((0, utils_1.isCallable)(val), `${wrongType} function`);
         }
-        else if (key === 'tolerateSkip') {
-            (0, utils_1.assertUsage)(typeof val === 'boolean', `${wrongType} boolean`);
-        }
         else if (key === 'ci') {
             // Only used by .github/workflows/ci/getTestJobs.mjs
             // https://github.com/brillout/vite-plugin-ssr/blob/4fa329e4081655c39c4c70436ae73e563489439e/.github/workflows/ci/getTestJobs.mjs#L72

package/dist/getCurrentTest.d.ts

@@ -23,7 +23,9 @@ declare type TestInfo = {
         isFlaky: boolean;
     };
     hasStartedRunning?: boolean;
-    skipped?: string;
+    skipped?: {
+        reason: string;
+    };
     startServer?: () => Promise<void>;
     terminateServer?: () => Promise<void>;
     afterEach?: (hasFailed: boolean) => void;

package/dist/runAll.js

@@ -17,6 +17,18 @@ async function runAll(filter) {
     await (0, getConfig_1.loadConfig)();
     const testFiles = await (0, findTestFiles_1.findTestFiles)(filter);
     const browser = await (0, getBrowser_1.getBrowser)();
+    const hasFailedTestFile = await runTestFiles(testFiles, browser);
+    await browser.close();
+    const hasFailLog = (0, logTestStatus_1.hasFail)();
+    if (hasFailedTestFile || hasFailLog) {
+        // hasFailedTestFile and hasFailLog are redundant
+        //  - When assert.ts calls logFail() this code block isn't run
+        (0, utils_1.assert)(hasFailedTestFile && hasFailLog);
+        throw new Error('Following tests failed, see logs above for more information.');
+    }
+}
+exports.runAll = runAll;
+async function runTestFiles(testFiles, browser) {
     const failedFirstAttempt = [];
     for (const testFile of testFiles) {
         const success = await buildAndTest(testFile, browser, false);
@@ -24,6 +36,9 @@ async function runAll(filter) {
             failedFirstAttempt.push(testFile);
         }
     }
+    if (!(0, utils_1.isCI)()) {
+        return failedFirstAttempt.length > 0;
+    }
     const failedSecondAttempt = [];
     for (const testFile of failedFirstAttempt) {
         const success = await buildAndTest(testFile, browser, true);
@@ -31,17 +46,8 @@ async function runAll(filter) {
             failedSecondAttempt.push(testFile);
         }
     }
-    await browser.close();
-    const hasFailLog = (0, logTestStatus_1.hasFail)();
-    const hasFailedTestFile = failedSecondAttempt.length > 0;
-    if (hasFailedTestFile || hasFailLog) {
-        // hasFailedTestFile and hasFailLog are redundant
-        //  - When assert.ts calls logFail() this code block isn't run
-        (0, utils_1.assert)(hasFailedTestFile && hasFailLog);
-        throw new Error('Following tests failed, see logs above for more information.');
-    }
+    return failedSecondAttempt.length > 0;
 }
-exports.runAll = runAll;
 async function buildAndTest(testFile, browser, isSecondAttempt) {
     (0, utils_1.assert)(testFile.endsWith('.ts'));
     const testFileJs = testFile.replace('.ts', '.mjs');
@@ -63,7 +69,7 @@ async function runServerAndTests(browser, isSecondAttempt) {
     // Set when user calls `skip()`
     if (testInfo.skipped) {
         assertSkipUsage(testInfo);
-        (0, logTestStatus_1.logWarn)(testInfo.skipped);
+        (0, logTestStatus_1.logWarn)(testInfo.skipped.reason);
         return true;
     }
     // Set when user calls `run()`
@@ -191,6 +197,7 @@ function runTest(testFn, testFunctionTimeout) {
     return promise;
 }
 function assertSkipUsage(testInfo) {
+    (0, utils_1.assert)(testInfo.skipped);
     {
         const err = 'You cannot call run() after calling skip()';
         (0, utils_1.assertUsage)(testInfo.runInfo === undefined, err);
@@ -199,13 +206,4 @@ function assertSkipUsage(testInfo) {
         const err = 'You cannot call test() after calling skip()';
         (0, utils_1.assertUsage)(testInfo.tests === undefined, err);
     }
-    const config = (0, getConfig_1.getConfig)();
-    {
-        const err = 'Using skip() while config tolerateSkip is set to false';
-        (0, utils_1.assertUsage)(config.tolerateSkip !== false, err);
-    }
-    {
-        const err = 'Using skip() while config tolerateSkip is set to undefined and tests are running in a parallel CI';
-        (0, utils_1.assertUsage)(!(config.tolerateSkip === undefined && (0, parallel_ci_1.isParallelCI)()), err);
-    }
 }

package/dist/setup.js

@@ -31,7 +31,7 @@ const TIMEOUT_AUTORETRY = TIMEOUT_TEST_FUNCTION / 2;
 const TIMEOUT_PLAYWRIGHT = TIMEOUT_TEST_FUNCTION / 2;
 function skip(reason) {
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
-    testInfo.skipped = reason;
+    testInfo.skipped = { reason };
 }
 exports.skip = skip;
 function run(cmd, { 

package/dist/utils/assert.js

@@ -81,7 +81,7 @@ function logDebugInfo() {
     (0, logSection_1.logSection)('DEBUG INFO');
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     console.log('testInfo.hasStartedRunning', testInfo.hasStartedRunning);
-    console.log('testInfo.skipped', testInfo.skipped);
+    console.log('testInfo.skipped?.reason', testInfo.skipped?.reason);
     console.log('testInfo.runInfo', testInfo.runInfo);
     console.log('testInfo.testFile', testInfo.testFile);
     console.log('testInfo.testName', testInfo.testName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/test-e2e",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "bin": "./bin.js",
   "main": "./dist/index.js",
   "scripts": {