@brillout/test-e2e 0.4.14 → 0.4.16

package/dist/getCurrentTest.d.ts

@@ -1,6 +1,7 @@
 export { getCurrentTest };
 export { getCurrentTestOptional };
 export { setCurrentTest };
+export type { TestInfo };
 import type { Page } from 'playwright-chromium';
 declare type TestInfo = {
     testFile: string;

package/dist/runAll.js

@@ -54,13 +54,48 @@ async function buildAndTest(testFile, browser, isSecondAttempt) {
     finally {
         cleanBuild();
     }
-    const { success, clean } = await runTests(browser, isSecondAttempt);
-    await clean();
+    const success = await runServerAndTests(browser, isSecondAttempt);
     (0, getCurrentTest_2.setCurrentTest)(null);
     return success;
 }
-async function runTests(browser, isSecondAttempt) {
+async function runServerAndTests(browser, isSecondAttempt) {
     const testInfo = (0, getCurrentTest_1.getCurrentTest)();
+    // Set when user calls `run()`
+    (0, utils_1.assert)(testInfo.runInfo);
+    (0, utils_1.assert)(testInfo.startServer);
+    (0, utils_1.assert)(testInfo.terminateServer);
+    const isFinalAttempt = isSecondAttempt || !testInfo.runInfo.isFlaky;
+    const page = await browser.newPage();
+    testInfo.page = page;
+    try {
+        await testInfo.startServer();
+    }
+    catch (err) {
+        logFailure(err, 'an error occurred while starting the server', isFinalAttempt);
+        return false;
+    }
+    let success = await runTests(testInfo, isFinalAttempt);
+    await testInfo.terminateServer();
+    await page.close();
+    // Check whether stderr emitted during testInfo.terminateServer()
+    if (success) {
+        const failOnWarning = true;
+        if (Logs_1.Logs.hasFailLogs(failOnWarning) &&
+            // See comments about taskkill in src/setup.ts
+            !(0, utils_1.isWindows)()) {
+            logFailure(null, `${getErrorType(failOnWarning)} occurred during server termination`, isFinalAttempt);
+            success = false;
+        }
+    }
+    if (!success && !testInfo.runInfo.isFlaky)
+        (0, parallel_ci_1.abortIfParallelCI)();
+    if (success) {
+        (0, logTestStatus_1.logPass)();
+    }
+    Logs_1.Logs.clearLogs();
+    return success;
+}
+async function runTests(testInfo, isFinalAttempt) {
     if (utils_1.isTTY) {
         console.log();
         console.log(testInfo.testFile);
@@ -70,37 +105,13 @@ async function runTests(browser, isSecondAttempt) {
         (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 { success: true, clean: async () => { } };
+        return true;
     }
-    const page = await browser.newPage();
-    testInfo.page = page;
     // Set when user calls `run()`
     (0, utils_1.assert)(testInfo.runInfo);
-    (0, utils_1.assert)(testInfo.startServer);
-    (0, utils_1.assert)(testInfo.terminateServer);
     (0, utils_1.assert)(testInfo.afterEach);
     // Set when user calls `test()`
     (0, utils_1.assert)(testInfo.tests);
-    const { isFlaky } = testInfo.runInfo;
-    const isFinalAttempt = isSecondAttempt || !isFlaky;
-    const clean = async () => {
-        await testInfo.terminateServer?.();
-        await page.close();
-    };
-    const failure = () => {
-        if (!isFlaky)
-            (0, parallel_ci_1.abortIfParallelCI)();
-        return { success: false, clean };
-    };
-    try {
-        await testInfo.startServer();
-    }
-    catch (err) {
-        (0, logTestStatus_1.logFail)('an error occurred while starting the server', isFinalAttempt);
-        (0, logError_1.logError)(err);
-        Logs_1.Logs.flushLogs();
-        return failure();
-    }
     for (const { testDesc, testFn } of testInfo.tests) {
         Logs_1.Logs.add({
             logSource: 'test()',
@@ -122,37 +133,28 @@ async function runTests(browser, isSecondAttempt) {
             const isFailure = err || hasErrorLog;
             if (isFailure) {
                 if (err) {
-                    (0, logTestStatus_1.logFail)(`the test "${testDesc}" threw an error`, isFinalAttempt);
-                    (0, logError_1.logError)(err);
+                    logFailure(err, `the test "${testDesc}" threw an error`, isFinalAttempt);
                 }
                 else if (hasErrorLog) {
-                    (0, logTestStatus_1.logFail)(`${getErrorType(failOnWarning)} occurred while running the test "${testDesc}"`, isFinalAttempt);
+                    logFailure(null, `${getErrorType(failOnWarning)} occurred while running the test "${testDesc}"`, isFinalAttempt);
                 }
                 else {
                     (0, utils_1.assert)(false);
                 }
-                Logs_1.Logs.logErrorsAndWarnings();
-                Logs_1.Logs.flushLogs();
-                return failure();
+                return false;
             }
         }
         Logs_1.Logs.clearLogs();
     }
-    // Check whether stderr emitted during testInfo.terminateServer()
-    {
-        const failOnWarning = true;
-        if (Logs_1.Logs.hasFailLogs(failOnWarning) &&
-            // See comments about taskkill in src/setup.ts
-            !(0, utils_1.isWindows)()) {
-            (0, logTestStatus_1.logFail)(`${getErrorType(failOnWarning)} occurred during server termination`, isFinalAttempt);
-            Logs_1.Logs.logErrorsAndWarnings();
-            Logs_1.Logs.flushLogs();
-            return failure();
-        }
+    return true;
+}
+function logFailure(err, reason, isFinalAttempt) {
+    (0, logTestStatus_1.logFail)(reason, isFinalAttempt);
+    if (err) {
+        (0, logError_1.logError)(err);
     }
-    Logs_1.Logs.clearLogs();
-    (0, logTestStatus_1.logPass)();
-    return { success: true, clean };
+    Logs_1.Logs.logErrorsAndWarnings();
+    Logs_1.Logs.flushLogs();
 }
 function getErrorType(failOnWarning) {
     return !failOnWarning ? 'error(s)' : 'error(s)/warning(s)';

package/package.json

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