@brillout/test-e2e 0.1.3 → 0.1.5

package/dist/Logs.js

@@ -9,7 +9,7 @@ exports.Logs = {
     flushEagerly: false,
 };
 const utils_1 = require("./utils");
-const kolorist_1 = require("kolorist");
+const picocolors_1 = require("picocolors");
 let logEntries = [];
 let logEntriesNotPrinted = [];
 function getBrowserErrors() {
@@ -61,9 +61,9 @@ function printLog(logEntry) {
     const { logType, logText, logTimestamp, testContext } = logEntry;
     let prefix = logType;
     if (logType === 'stderr' || logType === 'Browser Error')
-        prefix = (0, kolorist_1.bold)((0, kolorist_1.red)(logType));
+        prefix = (0, picocolors_1.bold)((0, picocolors_1.red)(logType));
     if (logType === 'stdout' || logType === 'Browser Log')
-        prefix = (0, kolorist_1.bold)((0, kolorist_1.blue)(logType));
+        prefix = (0, picocolors_1.bold)((0, picocolors_1.blue)(logType));
     let msg = logText;
     if (!msg)
         msg = ''; // don't know why but sometimes `logText` is `undefined`

package/dist/getBrowser.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBrowser = void 0;
 const playwright_chromium_1 = require("playwright-chromium");
-const logProgress_1 = require("./logProgress");
+const utils_1 = require("./utils");
 let browser;
 async function getBrowser() {
     if (!browser) {
-        const done = (0, logProgress_1.logProgress)('Launch Browser', true);
+        const done = (0, utils_1.logProgress)('Launch Browser');
         browser = await playwright_chromium_1.chromium.launch({ headless: true });
         done();
     }

package/dist/runTestSuites.js

@@ -21,7 +21,6 @@ async function runTestSuites({ filter, debug }) {
         (0, getTestInfo_1.setTestInfo)({ testFile });
         try {
             await import(workaroundBug(testFileJs));
-            await (0, runTests_1.runTests)(browser);
         }
         finally {
             if (!debug) {
@@ -29,6 +28,7 @@ async function runTestSuites({ filter, debug }) {
                 fs_1.default.unlinkSync(`${testFileJs}.map`);
             }
         }
+        await (0, runTests_1.runTests)(browser);
         (0, getTestInfo_1.setTestInfo)(null);
         (0, utils_1.assert)(testFileJs.endsWith('.mjs'));
     }

package/dist/runTests.js

@@ -2,13 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTests = void 0;
 const getTestInfo_1 = require("./getTestInfo");
-const logProgress_1 = require("./logProgress");
 const Logs_1 = require("./Logs");
 const utils_1 = require("./utils");
 const expect_1 = require("./chai/expect");
-const iconWarning = '⚠️';
-const iconSuccess = '✅';
-const iconFailure = '❌';
+const picocolors_1 = require("picocolors");
 async function runTests(browser) {
     const testInfo = (0, getTestInfo_1.getTestInfo)();
     if (utils_1.isTTY) {
@@ -21,7 +18,7 @@ async function runTests(browser) {
     if (testInfo.skipped) {
         (0, utils_1.assertUsage)(!testInfo.runWasCalled, 'You cannot call `run()` after calling `skip()`');
         (0, utils_1.assertUsage)(testInfo.tests === undefined, 'You cannot call `test()` after calling `skip()`');
-        logTestSuiteResult(false);
+        logTestsResult(false);
         return;
     }
     // Set when user calls `run()`
@@ -34,7 +31,7 @@ async function runTests(browser) {
     (0, utils_1.assert)(testInfo.tests);
     await testInfo.beforeAll();
     for (const { testDesc, testFn } of testInfo.tests) {
-        const done = (0, logProgress_1.logProgress)(`[test] ${testDesc}`);
+        const done = (0, utils_1.logProgress)(` | [test] ${testDesc}`);
         let err;
         try {
             await runTest(testFn, testInfo.testTimeout);
@@ -51,7 +48,7 @@ async function runTests(browser) {
         }
         Logs_1.Logs.clear();
         if (isFailure) {
-            logTestSuiteResult(false);
+            logTestsResult(false);
             if (browserErrors.length === 0) {
                 throw err;
             }
@@ -67,7 +64,7 @@ async function runTests(browser) {
     }
     await testInfo.afterAll();
     await page.close();
-    logTestSuiteResult(true);
+    logTestsResult(true);
 }
 exports.runTests = runTests;
 function runTest(testFn, testTimeout) {
@@ -95,17 +92,20 @@ function runTest(testFn, testTimeout) {
     })();
     return promise;
 }
-function logTestSuiteResult(success) {
+function logTestsResult(success) {
     const testInfo = (0, getTestInfo_1.getTestInfo)();
+    const passStyle = (t) => (0, picocolors_1.white)((0, picocolors_1.bgGreen)(t));
+    const failStyle = (t) => (0, picocolors_1.white)((0, picocolors_1.bgRed)(t));
+    const skipStyle = (t) => (0, picocolors_1.white)((0, picocolors_1.bgYellow)(t));
     if (success) {
         (0, utils_1.assert)(!testInfo.skipped);
-        console.log(`${iconSuccess} ${testInfo.testFile} (SUCCESS)`);
+        console.log(`${passStyle('PASS')} ${testInfo.testFile}`);
         return;
     }
     if (testInfo.skipped) {
-        console.log(`${iconWarning} ${testInfo.testFile} (SKIPPED: ${testInfo.skipped})`);
+        console.log(`${skipStyle('SKIP')} ${testInfo.testFile} (${testInfo.skipped})`);
     }
     else {
-        console.log(`${iconFailure} ${testInfo.testFile} (FAILURE)`);
+        console.log(`${failStyle('FAIL')} ${testInfo.testFile}`);
     }
 }

package/dist/setup.js

@@ -15,7 +15,6 @@ const strip_ansi_1 = __importDefault(require("strip-ansi"));
 const editFile_1 = require("./editFile");
 const getTestInfo_1 = require("./getTestInfo");
 const page_1 = require("./page");
-const logProgress_1 = require("./logProgress");
 var part_regex_1 = require("@brillout/part-regex");
 Object.defineProperty(exports, "partRegex", { enumerable: true, get: function () { return part_regex_1.partRegex; } });
 var Logs_2 = require("./Logs");
@@ -189,7 +188,7 @@ async function start(testContext) {
     if (!process.env.CI && isLinux()) {
         await (0, utils_1.runCommand)('fuser -k 3000/tcp', { swallowError: true, timeout: 10 * 1000 });
     }
-    const done = (0, logProgress_1.logProgress)(`[run] ${cmd}`);
+    const done = (0, utils_1.logProgress)(` | [run] ${cmd}`);
     const { terminate } = startScript(cmd, testContext, {
         onError(err) {
             rejectServerStart(err);

package/dist/utils/findFiles.js

@@ -24,7 +24,7 @@ async function filterGitIgnoredFiles(files) {
         //  - In other words, we remove git ignored files. (Staged files are tracked and listed by `$ git ls-files`.)
         //  - `git ls-files --others --exclude-standard` from https://stackoverflow.com/questions/3801321/git-list-only-untracked-files-also-custom-commands/3801554#3801554
         const stdout2 = await (0, runCommand_1.runCommand)('git ls-files --others --exclude-standard', { cwd });
-        gitFiles = [...stdout1.split(' '), ...stdout2.split(' ')].map((filePathRelative) => path_1.default.join(cwd, filePathRelative));
+        gitFiles = [...stdout1.split('\n'), ...stdout2.split('\n')].map((filePathRelative) => path_1.default.join(cwd, filePathRelative));
     }
     const filesFiltered = files.filter((file) => gitFiles.includes(file));
     return filesFiltered;

package/dist/utils/index.d.ts

@@ -4,3 +4,4 @@ export * from './assert';
 export * from './humanizeTime';
 export * from './isTTY';
 export * from './findFiles';
+export * from './logProgress';

package/dist/utils/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./assert"), exports);
 __exportStar(require("./humanizeTime"), exports);
 __exportStar(require("./isTTY"), exports);
 __exportStar(require("./findFiles"), exports);
+__exportStar(require("./logProgress"), exports);

package/dist/utils/logProgress.d.ts

@@ -0,0 +1,2 @@
+export { logProgress };
+declare function logProgress(text: string): (failed?: boolean) => void;

package/dist/{logProgress.js → utils/logProgress.js}

@@ -1,18 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logProgress = void 0;
-const getTestInfo_1 = require("./getTestInfo");
-const utils_1 = require("./utils");
+const isTTY_1 = require("./isTTY");
 const iconSuccess = '🟢';
 const iconPending = '🟠';
 const iconFail = '🔴';
-function logProgress(text, isSetup) {
-    const prefix = getPrefix(isSetup);
-    if (utils_1.isTTY) {
+function logProgress(text) {
+    if (!isTTY_1.isTTY) {
         const done = () => { };
         return done;
     }
-    process.stdout.write(`${prefix}${iconPending} ${text}`);
+    process.stdout.write(`${iconPending} ${text}`);
     let alreadyDone = false;
     const done = (failed) => {
         if (alreadyDone)
@@ -20,20 +18,11 @@ function logProgress(text, isSetup) {
         alreadyDone = true;
         clear();
         const iconDone = failed ? iconFail : iconSuccess;
-        process.stdout.write(`${prefix}${iconDone} ${text}\n`);
+        process.stdout.write(`${iconDone} ${text}\n`);
     };
     return done;
 }
 exports.logProgress = logProgress;
-function getPrefix(isSetup) {
-    if (isSetup) {
-        return '';
-    }
-    if (!(0, getTestInfo_1.getTestInfo)()) {
-        return '';
-    }
-    return ' | ';
-}
 function clear() {
     // @ts-ignore
     process.stdout.clearLine();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/test-e2e",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "bin": "./bin.js",
   "main": "./dist/index.js",
   "scripts": {
@@ -14,17 +14,19 @@
   },
   "dependencies": {
     "@brillout/part-regex": "^0.1.2",
-    "@types/chai": "^4.3.3",
-    "@types/node": "^15.6.1",
-    "@types/node-fetch": "^2.5.12",
     "chai": "^4.3.6",
     "esbuild": "^0.15.9",
     "fast-glob": "^3.2.12",
-    "kolorist": "^1.4.1",
     "node-fetch": "^2.6.1",
+    "picocolors": "^1.0.0",
     "playwright-chromium": "^1.22.2",
     "source-map-support": "^0.5.21",
-    "strip-ansi": "^6.0.1",
+    "strip-ansi": "^6.0.1"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.3.3",
+    "@types/node": "^15.6.1",
+    "@types/node-fetch": "^2.5.12",
     "typescript": "^4.8.3"
   },
   "repository": "github:brillout/test-e2e",

package/dist/logProgress.d.ts

@@ -1,2 +0,0 @@
-export { logProgress };
-declare function logProgress(text: string, isSetup?: true): (failed?: boolean) => void;