@brillout/test-e2e 0.6.14 → 0.6.15-commit-acebd7f

package/dist/Logs/isTolerateError.d.ts

@@ -1,7 +1,14 @@
 export { isTolerateError };
+export type { TolerateError };
+import { type TestInfo } from '../getCurrentTest.js';
 import type { LogSource } from '../Logs.js';
 type LogData = {
     logSource: LogSource;
     logText: string;
 };
+type TolerateError = true | ((args: {
+    logSource: LogSource;
+    logText: string;
+    testInfo: null | TestInfo;
+}) => boolean | undefined);
 declare function isTolerateError({ logSource, logText }: LogData): boolean;

package/dist/Logs/isTolerateError.js

@@ -8,13 +8,18 @@ function isTolerateError({ logSource, logText }) {
         return true;
     }
     const testInfo = getCurrentTestOptional();
+    const isTolerated = (tolerateError) => {
+        if (tolerateError === true)
+            return true;
+        if (tolerateError?.({ logSource, logText, testInfo })) {
+            return true;
+        }
+    };
     const config = getConfig();
-    const { tolerateError } = config;
-    if (tolerateError === true)
+    if (isTolerated(config.tolerateError))
         return true;
-    if (tolerateError?.({ logSource, logText, testInfo })) {
+    if (isTolerated(testInfo?.runInfo?.tolerateError))
         return true;
-    }
     return false;
 }
 function tolerateErrorBuiltIn({ logSource, logText }) {

package/dist/fetch.d.ts

@@ -1,5 +1,4 @@
-export { fetch };
+export { fetchAndLogError as fetch };
 export { fetchHtml };
-import type { RequestInfo, RequestInit, Response } from 'node-fetch';
 declare function fetchHtml(pathname: string): Promise<string>;
-declare function fetch(url: RequestInfo, init?: RequestInit): Promise<Response>;
+declare function fetchAndLogError(...args: Parameters<typeof fetch>): Promise<Response>;

package/dist/fetch.js

@@ -1,33 +1,22 @@
-export { fetch };
+export { fetchAndLogError as fetch };
 export { fetchHtml };
 import { getServerUrl } from './getCurrentTest.js';
-import fetch_ from 'node-fetch';
 import { Logs } from './Logs.js';
 async function fetchHtml(pathname) {
-    const response = await fetch(getServerUrl() + pathname);
+    const response = await fetchAndLogError(getServerUrl() + pathname);
     const html = await response.text();
     return html;
 }
-async function fetch(url, init) {
+async function fetchAndLogError(...args) {
     try {
-        // @ts-ignore
-        //
-        // I don't know why but [transition to ESM](https://github.com/brillout/test-e2e/commit/9b0822a4f5bf787de5a150173f3eeffcfa7ebc5c) broke the default importing of the node-fetch types.
-        //
-        // The following used to work but doens't anymore:
-        //  ```js
-        //  async function fetch(...args: Parameters<typeof fetch_>) {
-        //    // ...
-        //  }
-        //  ```
-        return await fetch_(url, init);
+        return await fetch(...args);
     }
     catch (err) {
+        const url = args[0];
+        const init = args[1];
         Logs.add({
             logSource: 'Connection Error',
-            logText: `Couldn't connect to \`${url}\`. Args: \`${JSON.stringify(init)}\`. Err: \`${
-            // @ts-ignore
-            err.message}\``,
+            logText: `Couldn't connect to \`${url}\`. Args: \`${JSON.stringify(init)}\`. Err: \`${err.message}\``,
         });
         throw new Error("Couldn't connect to server. See `Connection Error` log for more details.");
     }

package/dist/getConfig.d.ts

@@ -1,8 +1,9 @@
 export { getConfig };
 export { loadConfig };
 import type { LaunchOptions } from 'playwright-chromium';
+import type { TolerateError } from './Logs/isTolerateError.js';
 type Config = {
-    tolerateError?: Function | true;
+    tolerateError?: TolerateError;
     ci?: never;
     chromiumLaunchOptions?: LaunchOptions;
 };

package/dist/getCurrentTest.d.ts

@@ -7,6 +7,7 @@ export { getCwd };
 export { getServerUrl };
 export type { TestInfo };
 import type { Page } from 'playwright-chromium';
+import type { TolerateError } from './Logs/isTolerateError.js';
 type TestInfo = {
     testFile: string;
     testName: string;
@@ -16,14 +17,14 @@ type TestInfo = {
         testFn: Function;
     }[];
     testOptions?: {
-        doNotFailOnWarning: boolean;
+        tolerateError?: TolerateError;
         testFunctionTimeout: number;
         isFlaky: boolean;
     };
     runInfo?: {
         cmd: string;
         serverUrl: string;
-        doNotFailOnWarning: boolean;
+        tolerateError?: TolerateError;
         testFunctionTimeout: number;
         isFlaky: boolean;
         isRunCommandThatTerminates: boolean;
@@ -44,16 +45,16 @@ declare function setCurrentTest(testFile: null | string): void;
 declare function getRunInfo(): {
     cmd: string;
     serverUrl: string;
-    doNotFailOnWarning: boolean;
+    tolerateError?: TolerateError | undefined;
     testFunctionTimeout: number;
     isFlaky: boolean;
     isRunCommandThatTerminates: boolean;
 };
-declare function setRunInfo({ cmd, serverUrl, additionalTimeout, doNotFailOnWarning, isFlaky, isRunCommandThatTerminates, }: {
+declare function setRunInfo({ cmd, serverUrl, additionalTimeout, tolerateError, isFlaky, isRunCommandThatTerminates, }: {
     cmd: string;
     serverUrl?: string;
     additionalTimeout?: number;
-    doNotFailOnWarning?: boolean;
+    tolerateError?: TolerateError;
     isFlaky?: boolean;
     isRunCommandThatTerminates?: boolean;
 }): void;

package/dist/getCurrentTest.js

@@ -48,14 +48,14 @@ function getRunInfo() {
     return testInfo.runInfo;
 }
 const serverUrlDefault = 'http://localhost:3000';
-function setRunInfo({ cmd, serverUrl = serverUrlDefault, additionalTimeout = 0, doNotFailOnWarning = false, isFlaky = false, isRunCommandThatTerminates = false, }) {
+function setRunInfo({ cmd, serverUrl = serverUrlDefault, additionalTimeout = 0, tolerateError, isFlaky = false, isRunCommandThatTerminates = false, }) {
     const testInfo = getCurrentTest();
     const testFunctionTimeout = TIMEOUT_TEST_FUNCTION + additionalTimeout;
     testInfo.runInfo = {
         cmd,
         serverUrl,
         testFunctionTimeout,
-        doNotFailOnWarning,
+        tolerateError,
         isFlaky,
         isRunCommandThatTerminates,
     };

package/dist/index.d.ts

@@ -13,3 +13,4 @@ export { skip } from './skip.js';
 export { isMinNodeVersion, isCI, isLinux, isWindows, isMac, sleep } from './utils.js';
 export { getServerUrl } from './getCurrentTest.js';
 export { runCommandThatTerminates } from './runCommandThatTerminates.js';
+export type { TolerateError } from './Logs/isTolerateError.js';

package/dist/run.d.ts

@@ -1,12 +1,13 @@
 export { run };
-declare function run(cmd: string, { additionalTimeout, serverIsReadyMessage, serverIsReadyDelay, inspect, cwd, doNotFailOnWarning, serverUrl, isFlaky, }?: {
+import type { TolerateError } from './Logs/isTolerateError.js';
+declare function run(cmd: string, { additionalTimeout, serverIsReadyMessage, serverIsReadyDelay, inspect, cwd, tolerateError, serverUrl, isFlaky, }?: {
     additionalTimeout?: number;
     serverIsReadyMessage?: string | ((log: string) => boolean);
     serverIsReadyDelay?: number;
     inspect?: boolean;
     /** deprecated */
     cwd?: string;
-    doNotFailOnWarning?: boolean;
+    tolerateError?: TolerateError;
     serverUrl?: string;
     isFlaky?: boolean;
 }): void;

package/dist/run.js

@@ -8,14 +8,14 @@ import { page } from './page.js';
 import { TIMEOUT_NPM_SCRIPT, TIMEOUT_PLAYWRIGHT, TIMEOUT_PROCESS_TERMINATION } from './TIMEOUTS.js';
 function run(cmd, { 
 //baseUrl = '',
-additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect = cliOptions.inspect, cwd, doNotFailOnWarning, serverUrl, isFlaky, } = {}) {
+additionalTimeout = 0, serverIsReadyMessage, serverIsReadyDelay = 1000, inspect = cliOptions.inspect, cwd, tolerateError, serverUrl, isFlaky, } = {}) {
     assert(cwd === undefined);
     additionalTimeout += serverIsReadyDelay;
     setRunInfo({
         cmd,
         serverUrl,
         additionalTimeout,
-        doNotFailOnWarning,
+        tolerateError,
         isFlaky,
     });
     if (inspect) {

package/dist/runAll.js

@@ -184,10 +184,9 @@ async function runTests(testInfo, isFinalAttempt) {
         done(!!err);
         testInfo.afterEach(!!err);
         {
-            const failOnWarning = !testInfo.runInfo.doNotFailOnWarning;
             const isFailureFromLogs = Logs.hasFailureLog({
-                includeBrowserWarnings: failOnWarning,
-                includeStderr: failOnWarning,
+                includeBrowserWarnings: true,
+                includeStderr: true,
             });
             const isFailure = err || isFailureFromLogs;
             if (isFailure) {
@@ -208,7 +207,8 @@ async function runTests(testInfo, isFinalAttempt) {
                     logFailure(err, `the test "${testDesc}" threw an error`, isFinalAttempt);
                 }
                 else {
-                    assert(Logs.hasFailureLog({ includeBrowserWarnings: failOnWarning, includeStderr: true }));
+                    assert(Logs.hasFailureLog({ includeBrowserWarnings: true, includeStderr: true }));
+                    const failOnWarning = testInfo.runInfo.tolerateError !== true;
                     logFailure(null, `${getErrorType(failOnWarning)} occurred while running the test "${testDesc}"`, isFinalAttempt);
                 }
                 return false;

package/dist/utils/runCommand.js

@@ -1,4 +1,5 @@
 export { runCommand };
+// TO-DO/eventually: use @brillout/shell
 import { exec } from 'child_process';
 import { genPromise } from './genPromise.js';
 import { humanizeTime } from './humanizeTime.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/test-e2e",
-  "version": "0.6.14",
+  "version": "0.6.15-commit-acebd7f",
   "bin": "./bin.js",
   "main": "./dist/index.js",
   "type": "module",
@@ -10,7 +10,6 @@
     "chai": "^4.3.6",
     "esbuild": "^0.23.0",
     "fast-glob": "^3.2.12",
-    "node-fetch": "^2.6.1",
     "pixelmatch": "^5.3.0",
     "playwright-chromium": "^1.22.2",
     "pngjs": "^6.0.0",
@@ -22,7 +21,6 @@
     "@brillout/release-me": "^0.4.3",
     "@types/chai": "^4.3.3",
     "@types/node": "^15.6.1",
-    "@types/node-fetch": "^2.5.12",
     "@types/pixelmatch": "^5.2.4",
     "@types/pngjs": "^6.0.1",
     "@types/source-map-support": "^0.5.6",