@brillout/test-e2e 0.1.20 → 0.1.21

package/dist/Logs.d.ts

@@ -13,7 +13,7 @@ declare type LogEntry = {
     logTimestamp: string;
     isNotFailure: boolean;
 };
-declare function hasError(onlyFailOnBrowserError: boolean): boolean;
+declare function hasError(onlyFailOnBrowserError?: boolean): boolean;
 declare function clear(): void;
 declare function flush(): void;
 declare function add({ logSource, logText }: {

package/dist/Logs.js

@@ -17,7 +17,7 @@ const getCurrentTest_1 = require("./getCurrentTest");
 const getConfig_1 = require("./getConfig");
 let logEntries = [];
 let logEntriesNotPrinted = [];
-function hasError(onlyFailOnBrowserError) {
+function hasError(onlyFailOnBrowserError = false) {
     const logErrors = logEntries.filter(({ logSource, isNotFailure }) => {
         if (isNotFailure) {
             return;

package/dist/runTests.js

@@ -5,6 +5,7 @@ const getCurrentTest_1 = require("./getCurrentTest");
 const Logs_1 = require("./Logs");
 const utils_1 = require("./utils");
 const picocolors_1 = require("picocolors");
+const logsContainError_errMsg = 'The browser/server threw/logged one or more error/warning, see logs below.';
 async function runTests(browser) {
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
     if (utils_1.isTTY) {
@@ -60,7 +61,7 @@ async function runTests(browser) {
                 console.error(err);
             }
             if (hasErrorLog) {
-                console.log(new Error('The browser/server threw/logged one or more error/warning, see logs below.'));
+                console.log(new Error(logsContainError_errMsg));
             }
             Logs_1.Logs.flush();
             process.exit(1);
@@ -71,6 +72,11 @@ async function runTests(browser) {
     }
     await testInfo.terminateServer();
     await page.close();
+    // Handle case that an error occured during `terminateServer()`
+    if (Logs_1.Logs.hasError()) {
+        console.log(new Error(logsContainError_errMsg));
+        Logs_1.Logs.flush();
+    }
     logTestsResult(true);
 }
 exports.runTests = runTests;
@@ -110,7 +116,7 @@ function logTestsResult(success) {
         return;
     }
     if (testInfo.skipped) {
-        console.log(`${skipStyle('SKIP')} ${testInfo.testFile} (${testInfo.skipped})`);
+        console.log(`${skipStyle('WARN')} ${testInfo.testFile} (${testInfo.skipped})`);
     }
     else {
         console.log(`${failStyle('FAIL')} ${testInfo.testFile}`);

package/dist/setup.js

@@ -25,7 +25,7 @@ exports.urlBaseChange = urlBaseChange;
 var editFile_2 = require("./editFile");
 Object.defineProperty(exports, "editFile", { enumerable: true, get: function () { return editFile_2.editFile; } });
 Object.defineProperty(exports, "editFileRevert", { enumerable: true, get: function () { return editFile_2.editFileRevert; } });
-const TIMEOUT_NPM_SCRIPT = 30 * 1000 * (!isGithubAction() ? 1 : isLinux() ? 1 : isWindows() ? 5 : 4);
+const TIMEOUT_NPM_SCRIPT = 2 * 60 * 1000;
 const TIMEOUT_TEST_FUNCTION = 60 * 1000 * (!isGithubAction() ? 1 : isWindows() ? 5 : 3);
 const TIMEOUT_PROCESS_TERMINATION = 10 * 1000 * (!isGithubAction() ? 1 : isLinux() ? 1 : 4);
 const TIMEOUT_AUTORETRY = TIMEOUT_TEST_FUNCTION / 2;
@@ -79,6 +79,10 @@ additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect
         }
     };
     testInfo.terminateServer = async () => {
+        Logs_1.Logs.add({
+            logSource: 'run()',
+            logText: 'Terminate server.',
+        });
         page_1.page.off('console', onConsole);
         page_1.page.off('pageerror', onPageError);
         // `runProcess` is `undefined` if `start()` failed.
@@ -137,7 +141,7 @@ async function start() {
             (0, utils_2.assert)(getRunInfo().cmd === cmd);
             Logs_1.Logs.add({
                 logSource: 'run()',
-                logText: 'server is ready',
+                logText: 'Server is ready.',
             });
             hasSuccessfullyStarted = true;
             clearTimeout(serverStartTimeout);
@@ -309,6 +313,8 @@ function execRunScript({ onStdout, onFailure, onExit, }) {
             await exitAndFail(new Error('Port conflict? Port already in use EADDRINUSE.'));
         }
     });
+    let exitPromiseResolve;
+    const exitPromise = new Promise((r) => (exitPromiseResolve = r));
     proc.on('exit', (code) => {
         procExited = true;
         (0, utils_2.assert)(getRunInfo().cmd === cmd);
@@ -329,6 +335,7 @@ function execRunScript({ onStdout, onFailure, onExit, }) {
                 logSource: 'run()',
             });
         }
+        exitPromiseResolve();
     });
     return { terminate, processHasExited };
     function processHasExited() {
@@ -365,6 +372,7 @@ function execRunScript({ onStdout, onFailure, onExit, }) {
             });
         }
         clearTimeout(timeout);
+        await exitPromise;
         resolve();
         return promise;
     }

package/package.json

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