creevey 0.9.0-beta.2 → 0.9.0-beta.20

package/lib/esm/server/update.js

@@ -2,7 +2,6 @@ import path from 'path';
 import fs, { mkdirSync } from 'fs';
 import micromatch from 'micromatch';
 import { isDefined } from '../types';
-
 function tryToLoadTestsData(filename) {
   try {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -11,22 +10,15 @@ function tryToLoadTestsData(filename) {
     /* noop */
   }
 }
-
 const actualRegex = /^(.*)-actual-(\d+)\.png$/i;
-
 function approve(dirents, srcPath, dstPath, testPaths, isMatch) {
-  dirents.filter(dirent => dirent.isFile()).map(dirent => actualRegex.exec(dirent.name)).filter(isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(path.join(srcPath, fileName))).reduce((images, [, imageName, retry]) => {
-    var _images$get;
-
-    return Number(retry) > ((_images$get = images.get(imageName)) !== null && _images$get !== void 0 ? _images$get : -1) ? images.set(imageName, Number(retry)) : images;
-  }, new Map()).forEach((retry, imageName) => {
+  dirents.filter(dirent => dirent.isFile()).map(dirent => actualRegex.exec(dirent.name)).filter(isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(path.join(srcPath, fileName))).reduce((images, [, imageName, retry]) => Number(retry) > (images.get(imageName) ?? -1) ? images.set(imageName, Number(retry)) : images, new Map()).forEach((retry, imageName) => {
     mkdirSync(dstPath, {
       recursive: true
     });
     fs.copyFileSync(path.join(srcPath, `${imageName}-actual-${retry}.png`), path.join(dstPath, `${imageName}.png`));
   });
 }
-
 function traverse(srcPath, dstPath, testPaths, isMatch) {
   const dirents = fs.readdirSync(srcPath, {
     withFileTypes: true
@@ -34,7 +26,6 @@ function traverse(srcPath, dstPath, testPaths, isMatch) {
   approve(dirents, srcPath, dstPath, testPaths, isMatch);
   dirents.filter(dirent => dirent.isDirectory()).map(dirent => [dirent.name, testPaths === null || testPaths === void 0 ? void 0 : testPaths.map(([token, ...restPath]) => token == dirent.name ? restPath : null).filter(isDefined)]).filter(([, paths]) => !paths || paths.length > 0).forEach(([dirname, paths]) => traverse(path.join(srcPath, dirname), path.join(dstPath, dirname), paths, isMatch));
 }
-
 export default function update(config, grepPattern) {
   const {
     reportDir,
@@ -46,13 +37,11 @@ export default function update(config, grepPattern) {
   const testsMeta = tryToLoadTestsData(`${reportDir}/tests.json`);
   const testsReport = tryToLoadTestsData(`${reportDir}/data`);
   let testPaths = null;
-
   if (testsMeta && testsReport) {
     testPaths = Object.values(testsMeta).filter(isDefined).filter(({
       id
     }) => {
       var _testsReport$id;
-
       return ((_testsReport$id = testsReport[id]) === null || _testsReport$id === void 0 ? void 0 : _testsReport$id.status) == 'failed';
     }).map(({
       storyPath,
@@ -60,6 +49,5 @@ export default function update(config, grepPattern) {
       browser
     }) => [...storyPath, ...(testName ? [testName] : []), browser]);
   }
-
   traverse(reportDir, screenDir, testPaths, value => isMatch(path.relative(reportDir, value)));
 }

package/lib/esm/server/utils.js

@@ -10,48 +10,33 @@ export const isShuttingDown = {
 export const LOCALHOST_REGEXP = /(localhost|127\.0\.0\.1)/i;
 export const extensions = ['.js', '.jsx', '.ts', '.tsx'];
 export const skipOptionKeys = ['in', 'kinds', 'stories', 'tests', 'reason'];
-
 function matchBy(pattern, value) {
   return typeof pattern == 'string' && pattern == value || Array.isArray(pattern) && pattern.includes(value) || pattern instanceof RegExp && pattern.test(value) || !isDefined(pattern);
 }
-
 export function shouldSkip(browser, meta, skipOptions, test) {
   if (typeof skipOptions != 'object') {
     return skipOptions;
   }
-
-  if (Array.isArray(skipOptions)) {
-    for (const skip of skipOptions) {
-      const reason = shouldSkip(browser, meta, skip, test);
-      if (reason) return reason;
-    }
-
-    return false;
-  }
-
-  let hasSkipOptionKeys = false;
-
   for (const skipKey in skipOptions) {
-    if (skipOptionKeys.includes(skipKey)) {
-      hasSkipOptionKeys = true;
-      continue;
-    }
-
-    const reason = shouldSkip(browser, meta, {
-      reason: skipKey,
-      ...skipOptions[skipKey]
-    }, test);
+    const reason = shouldSkipByOption(browser, meta, skipOptions[skipKey], skipKey, test);
     if (reason) return reason;
   }
-
-  if (!hasSkipOptionKeys) return false;
+  return false;
+}
+export function shouldSkipByOption(browser, meta, skipOption, reason, test) {
+  if (Array.isArray(skipOption)) {
+    for (const skip of skipOption) {
+      const result = shouldSkipByOption(browser, meta, skip, reason, test);
+      if (result) return result;
+    }
+    return false;
+  }
   const {
     in: browsers,
     kinds,
     stories,
-    tests,
-    reason = true
-  } = skipOptions;
+    tests
+  } = skipOption;
   const {
     kind,
     story
@@ -64,7 +49,7 @@ export function shouldSkip(browser, meta, skipOptions, test) {
 }
 export async function shutdownWorkers() {
   isShuttingDown.current = true;
-  await Promise.all(Object.values(cluster.workers).filter(isDefined).filter(worker => worker.isConnected()).map(worker => new Promise(resolve => {
+  await Promise.all(Object.values(cluster.workers ?? {}).filter(isDefined).filter(worker => worker.isConnected()).map(worker => new Promise(resolve => {
     const timeout = setTimeout(() => worker.kill(), 10000);
     worker.on('exit', () => {
       clearTimeout(timeout);
@@ -96,27 +81,22 @@ export function testsToImages(tests) {
     storyPath,
     results
   }) => {
-    var _results$slice$0$imag, _results$slice$;
-
-    return Object.keys((_results$slice$0$imag = results === null || results === void 0 ? void 0 : (_results$slice$ = results.slice(-1)[0]) === null || _results$slice$ === void 0 ? void 0 : _results$slice$.images) !== null && _results$slice$0$imag !== void 0 ? _results$slice$0$imag : {}).map(image => `${[...storyPath, testName, browser, browser == image ? undefined : image].filter(isDefined).join('/')}.png`);
+    var _results$slice$;
+    return Object.keys((results === null || results === void 0 || (_results$slice$ = results.slice(-1)[0]) === null || _results$slice$ === void 0 ? void 0 : _results$slice$.images) ?? {}).map(image => `${[...storyPath, testName, browser, browser == image ? undefined : image].filter(isDefined).join('/')}.png`);
   })));
-} // https://tuhrig.de/how-to-know-you-are-inside-a-docker-container/
+}
 
+// https://tuhrig.de/how-to-know-you-are-inside-a-docker-container/
 export const isInsideDocker = existsSync('/proc/1/cgroup') && /docker/.test(readFileSync('/proc/1/cgroup', 'utf8'));
 export const downloadBinary = (downloadUrl, destination) => new Promise((resolve, reject) => get(downloadUrl, response => {
-  var _response$statusCode2;
-
   if (response.statusCode == 302) {
-    var _response$statusCode;
-
     const {
       location
     } = response.headers;
-    if (!location) return reject(new Error(`Couldn't download selenoid. Status code: ${(_response$statusCode = response.statusCode) !== null && _response$statusCode !== void 0 ? _response$statusCode : 'UNKNOWN'}`));
+    if (!location) return reject(new Error(`Couldn't download selenoid. Status code: ${response.statusCode ?? 'UNKNOWN'}`));
     return resolve(downloadBinary(location, destination));
   }
-
-  if (response.statusCode != 200) return reject(new Error(`Couldn't download selenoid. Status code: ${(_response$statusCode2 = response.statusCode) !== null && _response$statusCode2 !== void 0 ? _response$statusCode2 : 'UNKNOWN'}`));
+  if (response.statusCode != 200) return reject(new Error(`Couldn't download selenoid. Status code: ${response.statusCode ?? 'UNKNOWN'}`));
   const fileStream = createWriteStream(destination);
   response.pipe(fileStream);
   fileStream.on('finish', () => {
@@ -130,7 +110,6 @@ export const downloadBinary = (downloadUrl, destination) => new Promise((resolve
 }));
 export function removeProps(obj, propPath) {
   const [prop, ...restPath] = propPath;
-
   if (restPath.length > 0) {
     if (typeof prop == 'string') obj[prop] && removeProps(obj[prop], restPath);
     if (isFunction(prop)) Object.keys(obj).filter(prop).forEach(key => obj[key] && removeProps(obj[key], restPath));

package/lib/esm/server/worker/chai-image.js

@@ -1,13 +1,10 @@
 import { PNG } from 'pngjs';
 import pixelmatch from 'pixelmatch';
-
 function normalizeImageSize(image, width, height) {
   const normalizedImage = Buffer.alloc(4 * width * height);
-
   for (let y = 0; y < height; y++) {
     for (let x = 0; x < width; x++) {
       const i = (y * width + x) * 4;
-
       if (x < image.width && y < image.height) {
         const j = (y * image.width + x) * 4;
         normalizedImage[i + 0] = image.data[j + 0];
@@ -22,18 +19,14 @@ function normalizeImageSize(image, width, height) {
       }
     }
   }
-
   return normalizedImage;
 }
-
 function hasDiffPixels(diff) {
   for (let i = 0; i < diff.length; i += 4) {
     if (diff[i + 0] == 255 && diff[i + 1] == 0 && diff[i + 2] == 0 && diff[i + 3] == 255) return true;
   }
-
   return false;
 }
-
 function compareImages(expect, actual, diffOptions) {
   const expectImage = PNG.sync.read(expect);
   const actualImage = PNG.sync.read(actual);
@@ -44,42 +37,34 @@ function compareImages(expect, actual, diffOptions) {
     height
   });
   let actualImageData = actualImage.data;
-
   if (actualImage.width < width || actualImage.height < height) {
     actualImageData = normalizeImageSize(actualImage, width, height);
   }
-
   let expectImageData = expectImage.data;
-
   if (expectImage.width < width || expectImage.height < height) {
     expectImageData = normalizeImageSize(expectImage, width, height);
   }
-
   pixelmatch(expectImageData, actualImageData, diffImage.data, width, height, diffOptions);
   return {
     isEqual: !hasDiffPixels(diffImage.data),
     diff: PNG.sync.write(diffImage)
   };
 }
-
 export default function (getExpected, diffOptions) {
   return function chaiImage({
     Assertion
   }, utils) {
     async function assertImage(actual, imageName) {
       let onCompare = () => Promise.resolve();
-
       let expected = await getExpected(imageName);
       if (!(expected instanceof Buffer) && expected != null) ({
         expected,
         onCompare
       } = expected);
-
       if (expected == null) {
         await onCompare(actual);
         return imageName ? `Expected image '${imageName}' does not exists` : 'Expected image does not exists';
       }
-
       if (actual.equals(expected)) return await onCompare(actual);
       const {
         isEqual,
@@ -89,11 +74,9 @@ export default function (getExpected, diffOptions) {
       await onCompare(actual, expected, diff);
       return imageName ? `Expected image '${imageName}' to match` : 'Expected image to match';
     }
-
     utils.addMethod(Assertion.prototype, 'matchImage', async function matchImage(imageName) {
       const actual = utils.flag(this, 'object');
       const errorMessage = await assertImage(typeof actual == 'string' ? Buffer.from(actual, 'base64') : actual, imageName);
-
       if (errorMessage) {
         throw createImageError(imageName ? {
           [imageName]: errorMessage
@@ -104,25 +87,21 @@ export default function (getExpected, diffOptions) {
       const errors = {};
       await Promise.all(Object.entries(utils.flag(this, 'object')).map(async ([imageName, imageOrBase64]) => {
         let errorMessage;
-
         try {
           errorMessage = await assertImage(typeof imageOrBase64 == 'string' ? Buffer.from(imageOrBase64, 'base64') : imageOrBase64, imageName);
         } catch (error) {
           errorMessage = error.stack;
         }
-
         if (errorMessage) {
           errors[imageName] = errorMessage;
         }
       }));
-
       if (Object.keys(errors).length > 0) {
         throw createImageError(errors);
       }
     });
   };
 }
-
 function createImageError(imageErrors) {
   const error = new Error('Expected image to match');
   error.images = imageErrors;

package/lib/esm/server/worker/helpers.js

@@ -1,28 +1,23 @@
 import { Suite, Test } from 'mocha';
 import { isDefined } from '../../types';
 import { loadTestsFromStories } from '../stories';
-
 function findOrCreateSuite(name, parent) {
   const suite = parent.suites.find(({
     title
   }) => title == name) || new Suite(name, parent.ctx);
-
   if (!suite.parent) {
     suite.parent = parent;
     parent.addSuite(suite);
   }
-
   return suite;
 }
-
 function createTest(name, fn, skip = false) {
   const test = new Test(name, skip ? undefined : fn);
-  test.pending = Boolean(skip); // NOTE Can't define skip reason in mocha https://github.com/mochajs/mocha/issues/2026
-
+  test.pending = Boolean(skip);
+  // NOTE Can't define skip reason in mocha https://github.com/mochajs/mocha/issues/2026
   test.skipReason = skip;
   return test;
 }
-
 function addTest(rootSuite, test) {
   const [testName, ...suitePath] = [...test.storyPath, test.testName].reverse().filter(isDefined);
   const suite = suitePath.reduceRight((subSuite, suiteName) => findOrCreateSuite(suiteName, subSuite), rootSuite);
@@ -34,7 +29,6 @@ function addTest(rootSuite, test) {
   }, suite.ctx);
   return mochaTest;
 }
-
 function removeTestOrSuite(testOrSuite) {
   const {
     parent
@@ -44,7 +38,6 @@ function removeTestOrSuite(testOrSuite) {
   if (testOrSuite instanceof Suite) parent.suites = parent.suites.filter(suite => suite != testOrSuite);
   if (parent.tests.length == 0 && parent.suites.length == 0) removeTestOrSuite(parent);
 }
-
 export async function addTestsFromStories(rootSuite, config, {
   browser,
   ...options

package/lib/esm/server/worker/reporter.js

@@ -1,5 +1,3 @@
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import chalk from 'chalk';
 import { reporters } from 'mocha';
 import prefix from 'loglevel-plugin-prefix';
@@ -11,6 +9,7 @@ const testLevels = {
   ERROR: chalk.red('FAIL')
 };
 export class CreeveyReporter extends reporters.Base {
+  // TODO Output in better way, like vitest, maybe
   constructor(runner, options) {
     super(runner);
     const {
@@ -22,39 +21,24 @@ export class CreeveyReporter extends reporters.Base {
       format(level) {
         return `${testLevels[level]} => (${topLevelSuite}:${chalk.gray(sessionId)})`;
       }
-
     });
     runner.on('test', test => testLogger.warn(chalk.cyan(test.titlePath().join('/'))));
     runner.on('pass', test => testLogger.info(chalk.cyan(test.titlePath().join('/'))));
-    runner.on('fail', (test, error) => testLogger.error(chalk.cyan(test.titlePath().join('/')), '\n  ', getErrors(error, (error, imageName) => `${chalk.bold(imageName !== null && imageName !== void 0 ? imageName : topLevelSuite)}:${error}`, error => {
-      var _error$stack;
-
-      return `${(_error$stack = error.stack) !== null && _error$stack !== void 0 ? _error$stack : error.message}`;
-    }).join('\n  ')));
+    runner.on('fail', (test, error) => testLogger.error(chalk.cyan(test.titlePath().join('/')), '\n  ', getErrors(error, (error, imageName) => `${chalk.bold(imageName ?? topLevelSuite)}:${error}`, error => `${error.stack ?? error.message}`).join('\n  ')));
   }
-
 }
 export class TeamcityReporter extends reporters.Base {
   constructor(runner, options) {
     super(runner);
-
-    _defineProperty(this, "escape", str => {
-      if (!str) return '';
-      return str.toString() // eslint-disable-next-line no-control-regex
-      .replace(/\x1B.*?m/g, '').replace(/\|/g, '||').replace(/\n/g, '|n').replace(/\r/g, '|r').replace(/\[/g, '|[').replace(/\]/g, '|]').replace(/\u0085/g, '|x').replace(/\u2028/g, '|l').replace(/\u2029/g, '|p').replace(/'/g, "|'");
-    });
-
     const topLevelSuite = this.escape(options.reporterOptions.topLevelSuite);
     const reporterOptions = options.reporterOptions;
     runner.on('suite', suite => suite.root ? console.log(`##teamcity[testSuiteStarted name='${topLevelSuite}' flowId='${process.pid}']`) : console.log(`##teamcity[testSuiteStarted name='${this.escape(suite.title)}' flowId='${process.pid}']`));
     runner.on('test', test => console.log(`##teamcity[testStarted name='${this.escape(test.title)}' flowId='${process.pid}']`));
     runner.on('fail', (test, error) => {
-      var _error$stack2;
-
       Object.entries(reporterOptions.images).forEach(([name, image]) => {
         if (!image) return;
-        const filePath = test.titlePath().concat(name == topLevelSuite ? [] : [topLevelSuite]).map(this.escape).join('/'); // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+        const filePath = test.titlePath().concat(name == topLevelSuite ? [] : [topLevelSuite]).map(this.escape).join('/');
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const {
           error,
           ...rest
@@ -63,22 +47,27 @@ export class TeamcityReporter extends reporters.Base {
           console.log(`##teamcity[publishArtifacts '${reporterOptions.reportDir}/${filePath}/${fileName} => report/${filePath}']`);
           console.log(`##teamcity[testMetadata testName='${this.escape(test.title)}' type='image' value='report/${filePath}/${fileName}' flowId='${process.pid}']`);
         });
-      }); // Output failed test as passed due TC don't support retry mechanic
+      });
+
+      // Output failed test as passed due TC don't support retry mechanic
       // https://teamcity-support.jetbrains.com/hc/en-us/community/posts/207216829-Count-test-as-successful-if-at-least-one-try-is-successful?page=1#community_comment_207394125
 
-      reporterOptions.willRetry ? console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`) : console.log(`##teamcity[testFailed name='${this.escape(test.title)}' message='${this.escape(error.message)}' details='${this.escape((_error$stack2 = error.stack) !== null && _error$stack2 !== void 0 ? _error$stack2 : '')}' flowId='${process.pid}']`);
+      reporterOptions.willRetry ? console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`) : console.log(`##teamcity[testFailed name='${this.escape(test.title)}' message='${this.escape(error.message)}' details='${this.escape(error.stack ?? '')}' flowId='${process.pid}']`);
     });
     runner.on('pending', test => console.log(`##teamcity[testIgnored name='${this.escape(test.title)}' message='${this.escape(typeof test.skipReason == 'boolean' ? test.title : test.skipReason)}' flowId='${process.pid}']`));
     runner.on('test end', test => console.log(`##teamcity[testFinished name='${this.escape(test.title)}' flowId='${process.pid}']`));
     runner.on('suite end', suite => suite.root || console.log(`##teamcity[testSuiteFinished name='${this.escape(suite.title)}' flowId='${process.pid}']`));
     runner.on('end', () => console.log(`##teamcity[testSuiteFinished name='${topLevelSuite}' flowId='${process.pid}']`));
   }
-
+  escape = str => {
+    if (!str) return '';
+    return str.toString()
+    // eslint-disable-next-line no-control-regex
+    .replace(/\x1B.*?m/g, '').replace(/\|/g, '||').replace(/\n/g, '|n').replace(/\r/g, '|r').replace(/\[/g, '|[').replace(/\]/g, '|]').replace(/\u0085/g, '|x').replace(/\u2028/g, '|l').replace(/\u2029/g, '|p').replace(/'/g, "|'");
+  };
 }
-
 function getErrors(error, imageErrorToString, errorToString) {
   const errors = [];
-
   if (!(error instanceof Error)) {
     errors.push(error);
   } else if (!isImageError(error)) {
@@ -88,11 +77,8 @@ function getErrors(error, imageErrorToString, errorToString) {
   } else {
     const imageErrors = error.images;
     Object.keys(imageErrors).forEach(imageName => {
-      var _imageErrors$imageNam;
-
-      errors.push(imageErrorToString((_imageErrors$imageNam = imageErrors[imageName]) !== null && _imageErrors$imageNam !== void 0 ? _imageErrors$imageNam : '', imageName));
+      errors.push(imageErrorToString(imageErrors[imageName] ?? '', imageName));
     });
   }
-
   return errors;
 }

package/lib/esm/server/worker/worker.js

@@ -17,7 +17,6 @@ const readdirAsync = promisify(fs.readdir);
 const readFileAsync = promisify(fs.readFile);
 const writeFileAsync = promisify(fs.writeFile);
 const mkdirAsync = promisify(fs.mkdir);
-
 async function getStat(filePath) {
   try {
     return await statAsync(filePath);
@@ -25,37 +24,28 @@ async function getStat(filePath) {
     if (typeof error == 'object' && error && error.code === 'ENOENT') {
       return null;
     }
-
     throw error;
   }
 }
-
 async function getLastImageNumber(imageDir, imageName) {
   const actualImagesRegexp = new RegExp(`${imageName}-actual-(\\d+)\\.png`);
-
   try {
-    var _await$readdirAsync$m;
-
-    return (_await$readdirAsync$m = (await readdirAsync(imageDir)).map(filename => filename.replace(actualImagesRegexp, '$1')).map(Number).filter(x => !isNaN(x)).sort((a, b) => b - a)[0]) !== null && _await$readdirAsync$m !== void 0 ? _await$readdirAsync$m : 0;
+    return (await readdirAsync(imageDir)).map(filename => filename.replace(actualImagesRegexp, '$1')).map(Number).filter(x => !isNaN(x)).sort((a, b) => b - a)[0] ?? 0;
   } catch (_error) {
     return 0;
   }
-} // FIXME browser options hotfix
-
+}
 
+// FIXME browser options hotfix
 export default async function worker(config, options) {
   var _await$browser$getSes;
-
   let retries = 0;
   let images = {};
   let error = undefined;
   const screenshots = [];
   const testScope = [];
-
   function runHandler(failures) {
     if (failures > 0 && (error || Object.values(images).some(image => (image === null || image === void 0 ? void 0 : image.error) != null))) {
-      var _error2;
-
       const isTimeout = hasTimeout(error) || Object.values(images).some(image => hasTimeout(image === null || image === void 0 ? void 0 : image.error));
       const payload = {
         status: 'failed',
@@ -65,7 +55,7 @@ export default async function worker(config, options) {
       isTimeout ? emitWorkerMessage({
         type: 'error',
         payload: {
-          error: (_error2 = error) !== null && _error2 !== void 0 ? _error2 : 'Unknown error'
+          error: error ?? 'Unknown error'
         }
       }) : emitTestMessage({
         type: 'end',
@@ -81,12 +71,10 @@ export default async function worker(config, options) {
       });
     }
   }
-
   async function saveImages(imageDir, images) {
     await mkdirAsync(imageDir, {
       recursive: true
     });
-
     for (const {
       name,
       data
@@ -94,29 +82,24 @@ export default async function worker(config, options) {
       await writeFileAsync(path.join(imageDir, name), data);
     }
   }
-
   async function getExpected(assertImageName) {
-    var _images$imageName;
-
     // context => [kind, story, test, browser]
     // rootSuite -> kindSuite -> storyTest -> [browsers.png]
     // rootSuite -> kindSuite -> storySuite -> test -> [browsers.png]
     const testPath = [...testScope];
-    const imageName = assertImageName !== null && assertImageName !== void 0 ? assertImageName : testPath.pop();
+    const imageName = assertImageName ?? testPath.pop();
     const imagesMeta = [];
     const reportImageDir = path.join(config.reportDir, ...testPath);
     const imageNumber = (await getLastImageNumber(reportImageDir, imageName)) + 1;
     const actualImageName = `${imageName}-actual-${imageNumber}.png`;
-    const image = images[imageName] = (_images$imageName = images[imageName]) !== null && _images$imageName !== void 0 ? _images$imageName : {
+    const image = images[imageName] = images[imageName] ?? {
       actual: actualImageName
     };
-
     const onCompare = async (actual, expect, diff) => {
       imagesMeta.push({
         name: image.actual,
         data: actual
       });
-
       if (diff && expect) {
         image.expect = `${imageName}-expect-${imageNumber}.png`;
         image.diff = `${imageName}-diff-${imageNumber}.png`;
@@ -129,12 +112,10 @@ export default async function worker(config, options) {
           data: diff
         });
       }
-
       if (options.saveReport) {
         await saveImages(reportImageDir, imagesMeta);
       }
     };
-
     const expectImageDir = path.join(config.screenDir, ...testPath);
     const expectImageStat = await getStat(path.join(expectImageDir, `${imageName}.png`));
     if (!expectImageStat) return {
@@ -147,56 +128,48 @@ export default async function worker(config, options) {
       onCompare
     };
   }
-
   const mochaOptions = {
     timeout: 30000,
     reporter: process.env.TEAMCITY_VERSION ? TeamcityReporter : options.reporter || CreeveyReporter,
     reporterOptions: {
       reportDir: config.reportDir,
       topLevelSuite: options.browser,
-
       get willRetry() {
         return retries < config.maxRetries;
       },
-
       get images() {
         return images;
       },
-
       get sessionId() {
         return sessionId;
       }
-
     }
   };
-  const mocha = new Mocha(mochaOptions); // @ts-expect-error: @types/mocha has out-dated types
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-
+  const mocha = new Mocha(mochaOptions);
   mocha.cleanReferencesAfterRun(false);
   chai.use(chaiImage(getExpected, config.diffOptions));
-  if ((await getBrowser(config, options.browser)) == null) return;
+  if ((await getBrowser(config, options)) == null) return;
   await addTestsFromStories(mocha.suite, config, {
     browser: options.browser,
     watch: options.ui,
     debug: options.debug,
     port: options.port
   });
-
   try {
     var _await$getBrowser;
-
-    await ((_await$getBrowser = await getBrowser(config, options.browser)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
+    await ((_await$getBrowser = await getBrowser(config, options)) === null || _await$getBrowser === void 0 ? void 0 : _await$getBrowser.getCurrentUrl());
   } catch (_) {
     await closeBrowser();
   }
-
-  const browser = await getBrowser(config, options.browser);
+  const browser = await getBrowser(config, options);
   const sessionId = (_await$browser$getSes = await (browser === null || browser === void 0 ? void 0 : browser.getSession())) === null || _await$browser$getSes === void 0 ? void 0 : _await$browser$getSes.getId();
   if (browser == null) return;
-  const interval = setInterval(() => void browser.getCurrentUrl().then(url => {
-    if (options.debug) logger.debug(`${options.browser}:${chalk.gray(sessionId)}`, 'current url', chalk.magenta(url));
-  }), 10 * 1000);
-  subscribeOn('shutdown', () => clearInterval(interval));
+  if (options.debug) {
+    const interval = setInterval(() => void browser.getCurrentUrl().then(url => {
+      logger.debug(`${options.browser}:${chalk.gray(sessionId)}`, 'current url', chalk.magenta(url));
+    }), 10 * 1000);
+    subscribeOn('shutdown', () => clearInterval(interval));
+  }
   mocha.suite.beforeAll(function () {
     this.config = config;
     this.browser = browser;
@@ -208,6 +181,18 @@ export default async function worker(config, options) {
     this.screenshots = screenshots;
   });
   mocha.suite.beforeEach(switchStory);
+  if (options.trace) {
+    mocha.suite.afterEach(async function () {
+      const types = await (browser === null || browser === void 0 ? void 0 : browser.manage().logs().getAvailableLogTypes());
+      for (const type of types ?? []) {
+        const logs = await (browser === null || browser === void 0 ? void 0 : browser.manage().logs().get(type));
+        logs.forEach(log => {
+          var _this$currentTest;
+          return logger.trace(sessionId, (_this$currentTest = this.currentTest) === null || _this$currentTest === void 0 ? void 0 : _this$currentTest.titlePath().join('/'), log.toJSON());
+        });
+      }
+    });
+  }
   subscribeOn('test', message => {
     if (message.type != 'start') return;
     const test = message.payload;
@@ -216,15 +201,14 @@ export default async function worker(config, options) {
     error = undefined;
     retries = test.retries;
     mocha.grep(new RegExp(`^${testPath}$`));
-    const runner = mocha.run(runHandler); // TODO How handle browser corruption?
+    const runner = mocha.run(runHandler);
 
+    // TODO How handle browser corruption?
     runner.on('fail', (_test, reason) => {
       if (!(reason instanceof Error)) {
         error = reason;
       } else if (!isImageError(reason)) {
-        var _reason$stack;
-
-        error = (_reason$stack = reason.stack) !== null && _reason$stack !== void 0 ? _reason$stack : reason.message;
+        error = reason.stack ?? reason.message;
       } else if (typeof reason.images == 'string') {
         const image = images[testScope.slice(-1)[0]];
         if (image) image.error = reason.images;
@@ -242,7 +226,6 @@ export default async function worker(config, options) {
     type: 'ready'
   });
 }
-
 function hasTimeout(str) {
   return str != null && str.toLowerCase().includes('timeout');
 }