@brillout/test-e2e 0.4.16 → 0.5.0

package/dist/getConfig.d.ts

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

package/dist/getConfig.js

@@ -8,7 +8,6 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("./utils");
 const configFileName = 'test-e2e.config.mjs';
-const errPrefix = `Config file \`${configFileName}\` `;
 let config = null;
 function getConfig() {
     (0, utils_1.assert)(config);
@@ -17,18 +16,27 @@ function getConfig() {
 exports.getConfig = getConfig;
 async function loadConfig() {
     const configFilePath = find();
-    (0, utils_1.assertUsage)(configFilePath, errPrefix + 'not found');
+    (0, utils_1.assertUsage)(configFilePath, `${configFileName} not found`);
     const configFileExports = (await import((0, utils_1.fsWindowsBugWorkaround)(configFilePath)));
-    (0, utils_1.assertUsage)('default' in configFileExports, errPrefix + 'should have a default export');
+    (0, utils_1.assertUsage)('default' in configFileExports, `${configFileName} should have a default export`);
     assertConfig(configFileExports.default);
     config = configFileExports.default;
 }
 exports.loadConfig = loadConfig;
 function assertConfig(config) {
-    (0, utils_1.assertUsage)((0, utils_1.isObject)(config), errPrefix + 'default export should be an object');
-    if ('tolerateError' in config) {
-        (0, utils_1.assertUsage)((0, utils_1.isCallable)(config.tolerateError), errPrefix + '`tolerateError` should be a function');
-    }
+    (0, utils_1.assertUsage)((0, utils_1.isObject)(config), `${configFileName} default export should be an object`);
+    Object.entries(config).forEach(([key, val]) => {
+        const wrongType = `${configFileName} export default { ${key} } should be a`;
+        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 {
+            (0, utils_1.assertUsage)(false, `${configFileName} unknown config ${key}`);
+        }
+    });
 }
 function find() {
     let dir = process.cwd();

package/dist/parallel-ci.d.ts

@@ -1,4 +1,6 @@
+export { isParallelCI };
 export { abortIfParallelCI };
 export { getTestFilesForCurrentJob };
 declare function abortIfParallelCI(): void;
+declare function isParallelCI(): boolean;
 declare function getTestFilesForCurrentJob(): null | string[];

package/dist/parallel-ci.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTestFilesForCurrentJob = exports.abortIfParallelCI = void 0;
+exports.getTestFilesForCurrentJob = exports.abortIfParallelCI = exports.isParallelCI = void 0;
 const utils_1 = require("./utils");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -17,6 +17,7 @@ exports.abortIfParallelCI = abortIfParallelCI;
 function isParallelCI() {
     return getTestFilesForCurrentJob() !== null;
 }
+exports.isParallelCI = isParallelCI;
 function getTestFilesForCurrentJob() {
     if (!('TEST_FILES' in process.env))
         return null;

package/dist/runAll.js

@@ -60,6 +60,12 @@ async function buildAndTest(testFile, browser, isSecondAttempt) {
 }
 async function runServerAndTests(browser, isSecondAttempt) {
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
+    // Set when user calls `skip()`
+    if (testInfo.skipped) {
+        assertSkipUsage(testInfo);
+        (0, logTestStatus_1.logWarn)(testInfo.skipped);
+        return true;
+    }
     // Set when user calls `run()`
     (0, utils_1.assert)(testInfo.runInfo);
     (0, utils_1.assert)(testInfo.startServer);
@@ -100,13 +106,6 @@ async function runTests(testInfo, isFinalAttempt) {
         console.log();
         console.log(testInfo.testFile);
     }
-    // Set when user calls `skip()`
-    if (testInfo.skipped) {
-        (0, logTestStatus_1.logWarn)(testInfo.skipped);
-        (0, utils_1.assertUsage)(!testInfo.runInfo, 'You cannot call `run()` after calling `skip()`');
-        (0, utils_1.assertUsage)(testInfo.tests === undefined, 'You cannot call `test()` after calling `skip()`');
-        return true;
-    }
     // Set when user calls `run()`
     (0, utils_1.assert)(testInfo.runInfo);
     (0, utils_1.assert)(testInfo.afterEach);
@@ -184,3 +183,22 @@ function runTest(testFn, testFunctionTimeout) {
     })();
     return promise;
 }
+function assertSkipUsage(testInfo) {
+    {
+        const err = 'You cannot call run() after calling skip()';
+        (0, utils_1.assertUsage)(testInfo.runInfo === undefined, err);
+    }
+    {
+        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/package.json

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