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

package/lib/cjs/server/telemetry.js

@@ -0,0 +1,167 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sendScreenshotsCount = sendScreenshotsCount;
+var _path = _interopRequireDefault(require("path"));
+var _https = _interopRequireDefault(require("https"));
+var _shelljs = require("shelljs");
+var _qs = require("qs");
+var _lodash = require("lodash");
+var _uuid = require("uuid");
+var _types = require("../types");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const konturGitHost = 'git.skbkontur.ru';
+const trackId = 232; // front_infra
+const origin = 'http://localhost/';
+const category = 'tests_run';
+const action = 'done';
+function buildPathname(label, info) {
+  return `/track-event?${(0, _qs.stringify)({
+    id: trackId,
+    c: category,
+    a: action,
+    l: label,
+    cv: typeof info == 'string' ? info : JSON.stringify(info),
+    ts: new Date().toISOString(),
+    url: origin
+  })}`;
+}
+function sanitizeGridUrl(gridUrl) {
+  const url = new URL(gridUrl);
+  url.username = url.username ? '********' : '';
+  url.password = url.password ? '********' : '';
+  return url.toString();
+}
+function tryGetRepoUrl() {
+  try {
+    const gitRemoteOutput = (0, _shelljs.exec)('git remote -v', {
+      silent: true
+    });
+    const [, repoUrl] = gitRemoteOutput.stdout.match(/origin\s+(.*)\s+\(fetch\)/) ?? [];
+    return [repoUrl, null];
+  } catch (error) {
+    return [undefined, error];
+  }
+}
+function tryGetStorybookVersion() {
+  try {
+    const storybookPackageOutput = (0, _shelljs.exec)(`node -e "console.log(JSON.stringify(require('storybook/package.json')))"`, {
+      silent: true
+    });
+    const storybookPackage = JSON.parse(storybookPackageOutput);
+    return [storybookPackage.version, null];
+  } catch (error) {
+    return [undefined, error];
+  }
+}
+function tryGetCreeveyVersion() {
+  try {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires, node/no-missing-require
+    const creeveyPackage = require('creevey/package.json');
+    return [creeveyPackage.version, null];
+  } catch (error) {
+    return [undefined, error];
+  }
+}
+function sendRequest(options) {
+  return new Promise((resolve, reject) => {
+    const req = _https.default.request(options, res => {
+      if (res.statusCode) {
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+          resolve();
+        } else if (res.statusCode >= 300 && res.statusCode < 400) {
+          reject(new Error(`Redirection error: ${res.statusCode}`));
+        } else if (res.statusCode >= 400 && res.statusCode < 500) {
+          reject(new Error(`Client error: ${res.statusCode}`));
+        } else if (res.statusCode >= 500 && res.statusCode < 600) {
+          reject(new Error(`Server error: ${res.statusCode}`));
+        } else {
+          reject(new Error(`Unexpected status code: ${res.statusCode}`));
+        }
+      } else {
+        reject(new Error('No status code received'));
+      }
+    });
+    req.on('error', reject);
+    req.end();
+  });
+}
+async function sendScreenshotsCount(config, options, status) {
+  var _config$storiesProvid;
+  const [repoUrl] = tryGetRepoUrl();
+  const isKonturRepo = repoUrl === null || repoUrl === void 0 ? void 0 : repoUrl.includes(konturGitHost);
+  if (!isKonturRepo || config.disableTelemetry) return;
+  const uuid = (0, _uuid.v4)();
+  const [creeveyVersion, creeveyVersionError] = tryGetCreeveyVersion();
+  const [storybookVersion, storybookVersionError] = tryGetStorybookVersion();
+  const gridUrl = config.gridUrl ? sanitizeGridUrl(config.gridUrl) : undefined;
+  const configMeta = {
+    runId: uuid,
+    repoUrl: repoUrl ?? 'unknown',
+    creeveyVersion: creeveyVersion ?? 'unknown',
+    storybookVersion: storybookVersion ?? 'unknown',
+    options: options._,
+    gridUrl,
+    screenDir: config.screenDir ? _path.default.relative(process.cwd(), config.screenDir) : undefined,
+    useDocker: config.useDocker,
+    dockerImage: config.dockerImage,
+    maxRetries: config.maxRetries,
+    diffOptions: config.diffOptions,
+    storiesProvider: ((_config$storiesProvid = config.storiesProvider) === null || _config$storiesProvid === void 0 ? void 0 : _config$storiesProvid.providerName) ?? 'unknown',
+    errors: [creeveyVersionError, storybookVersionError].some(Boolean) ? [creeveyVersionError ? `Error while getting creevey version: ${creeveyVersionError.message}` : undefined, storybookVersionError ? `Error while getting storybook version: ${storybookVersionError.message}` : undefined].filter(Boolean) : undefined
+  };
+  const browsersMeta = {
+    runId: uuid,
+    browsers: Object.fromEntries(Object.entries(config.browsers ?? {}).map(([name, browser]) => [name, typeof browser === 'object' ? {
+      name: browser.name,
+      gridUrl: browser.gridUrl ? sanitizeGridUrl(browser.gridUrl) : undefined,
+      browserName: browser.browserName,
+      browserVersion: browser.browserVersion,
+      platformName: browser.platformName,
+      viewport: browser.viewport,
+      limit: browser.limit,
+      dockerImage: browser.dockerImage,
+      'se:teamname': browser['se:teamname']
+    } : browser]))
+  };
+  const tests = {};
+  Object.values((status === null || status === void 0 ? void 0 : status.tests) ?? {}).filter(_types.isDefined).forEach(test => {
+    (0, _lodash.set)(tests, [...test.storyPath, test.testName, test.browser].filter(_types.isDefined), test.id);
+  });
+  const testsMeta = {
+    runId: uuid,
+    tests
+  };
+  const fullPathname = buildPathname('tests', testsMeta);
+  // NOTE: Keep request path shorter than 32k symbols
+  const chunksCount = Math.ceil(fullPathname.length / 32_000);
+  let chunks = [];
+  if (chunksCount > 1) {
+    const testsString = JSON.stringify(tests);
+    const chunkSize = Math.ceil(testsString.length / chunksCount);
+    chunks = Array.from({
+      length: chunksCount
+    }).map((_, chunkIndex) => testsString.slice(chunkIndex * chunkSize, (chunkIndex + 1) * chunkSize)).map((testsPart, seq) => buildPathname('tests', {
+      runId: uuid,
+      tests: testsPart,
+      seq
+    }));
+  } else {
+    chunks = [fullPathname];
+  }
+  await Promise.all([sendRequest({
+    host: 'metrika.kontur.ru',
+    path: buildPathname('config', configMeta),
+    protocol: 'https:'
+  }), sendRequest({
+    host: 'metrika.kontur.ru',
+    path: buildPathname('browsers', browsersMeta),
+    protocol: 'https:'
+  }), ...chunks.map(chunk => sendRequest({
+    host: 'metrika.kontur.ru',
+    path: chunk,
+    protocol: 'https:'
+  }))]);
+}

package/lib/cjs/server/testsFiles/parser.js

@@ -5,43 +5,32 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = parse;
 exports.test = exports.story = exports.kind = void 0;
-
 var _csf = require("@storybook/csf");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 async function parse(files) {
   result = {};
-  await Promise.all(files.map(async file => Promise.resolve(`${file}`).then(s => _interopRequireWildcard(require(s)))));
+  await Promise.all(files.map(async file => (specifier => new Promise(r => r(`${specifier}`)).then(s => _interopRequireWildcard(require(s))))(file)));
   return result;
 }
-
 let result = {};
 let kindTitle = '';
 let storyTitle = '';
 let storyParams = null;
-
 const setStoryParameters = params => {
   storyParams = params;
 };
-
 const getStoryId = (kindTitle, storyTitle) => {
   return (0, _csf.toId)(kindTitle, (0, _csf.storyNameFromExport)(storyTitle));
 };
-
 const kind = (title, kindFn) => {
   kindTitle = title;
   kindFn();
   kindTitle = '';
 };
-
 exports.kind = kind;
-
 const story = (title, storyFn) => {
   var _result$storyId;
-
   storyTitle = title;
   storyParams = null;
   storyFn({
@@ -54,19 +43,14 @@ const story = (title, storyFn) => {
   storyTitle = '';
   storyParams = null;
 };
-
 exports.story = story;
-
 const test = (title, testFn) => {
   const storyId = getStoryId(kindTitle, storyTitle);
-
   if (!result[storyId]) {
     result[storyId] = {};
   }
-
   result[storyId].tests = Object.assign({}, result[storyId].tests, {
     [title]: testFn
   });
 };
-
 exports.test = test;

package/lib/cjs/server/testsFiles/register.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = register;
-
 var _pirates = require("pirates");
-
 var _getTsconfig = require("get-tsconfig");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 async function register(config) {
   (0, _pirates.addHook)(() => '', {
     exts: ['.jpg', '.jpeg', '.png', '.gif', '.eot', '.otf', '.svg', '.ttf', '.woff', '.woff2', '.css', '.less', '.scss', '.styl'],
@@ -20,8 +15,9 @@ async function register(config) {
   });
   const {
     path: tsConfigPath
-  } = (0, _getTsconfig.getTsconfig)(config.tsConfig) || {}; // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+  } = (0, _getTsconfig.getTsconfig)(config.tsConfig) || {};
 
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
   (await Promise.resolve().then(() => _interopRequireWildcard(require('@babel/register')))).default(config.babelOptions({
     babelrc: false,
     rootMode: 'upward-optional',
@@ -37,12 +33,10 @@ async function register(config) {
       },
       modules: 'commonjs'
     }]],
-    plugins: [['@babel/plugin-transform-runtime'], ['babel-plugin-tsconfig-paths', {
+    plugins: [['@babel/plugin-transform-runtime'], ...(tsConfigPath ? [['babel-plugin-tsconfig-paths', {
       tsconfig: tsConfigPath
-    }]]
+    }]] : [])]
   }));
-  (await Promise.resolve().then(() => _interopRequireWildcard(require('ts-node')))).register({
-    project: tsConfigPath,
-    transpileOnly: true
-  });
+
+  // (await import('ts-node')).register({ project: tsConfigPath, transpileOnly: true });
 }

package/lib/cjs/server/update.js

@@ -4,21 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = update;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _fs = _interopRequireWildcard(require("fs"));
-
 var _micromatch = _interopRequireDefault(require("micromatch"));
-
 var _types = require("../types");
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function tryToLoadTestsData(filename) {
   try {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -27,32 +19,22 @@ 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(_types.isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(_path.default.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(_types.isDefined).filter(([fileName, imageName]) => !testPaths || testPaths.find(([token]) => token == imageName) && isMatch(_path.default.join(srcPath, fileName))).reduce((images, [, imageName, retry]) => Number(retry) > (images.get(imageName) ?? -1) ? images.set(imageName, Number(retry)) : images, new Map()).forEach((retry, imageName) => {
     (0, _fs.mkdirSync)(dstPath, {
       recursive: true
     });
-
     _fs.default.copyFileSync(_path.default.join(srcPath, `${imageName}-actual-${retry}.png`), _path.default.join(dstPath, `${imageName}.png`));
   });
 }
-
 function traverse(srcPath, dstPath, testPaths, isMatch) {
   const dirents = _fs.default.readdirSync(srcPath, {
     withFileTypes: true
   });
-
   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(_types.isDefined)]).filter(([, paths]) => !paths || paths.length > 0).forEach(([dirname, paths]) => traverse(_path.default.join(srcPath, dirname), _path.default.join(dstPath, dirname), paths, isMatch));
 }
-
 function update(config, grepPattern) {
   const {
     reportDir,
@@ -64,13 +46,11 @@ 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(_types.isDefined).filter(({
       id
     }) => {
       var _testsReport$id;
-
       return ((_testsReport$id = testsReport[id]) === null || _testsReport$id === void 0 ? void 0 : _testsReport$id.status) == 'failed';
     }).map(({
       storyPath,
@@ -78,6 +58,5 @@ function update(config, grepPattern) {
       browser
     }) => [...storyPath, ...(testName ? [testName] : []), browser]);
   }
-
   traverse(reportDir, screenDir, testPaths, value => isMatch(_path.default.relative(reportDir, value)));
 }

package/lib/cjs/server/utils.js

@@ -3,82 +3,58 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shouldSkip = shouldSkip;
-exports.shutdownWorkers = shutdownWorkers;
-exports.shutdown = shutdown;
+exports.extensions = exports.downloadBinary = exports.LOCALHOST_REGEXP = void 0;
 exports.getCreeveyCache = getCreeveyCache;
+exports.isShuttingDown = exports.isInsideDocker = void 0;
+exports.readDirRecursive = readDirRecursive;
+exports.removeProps = removeProps;
 exports.runSequence = runSequence;
+exports.shouldSkip = shouldSkip;
+exports.shouldSkipByOption = shouldSkipByOption;
+exports.shutdown = shutdown;
+exports.shutdownWorkers = shutdownWorkers;
+exports.skipOptionKeys = void 0;
 exports.testsToImages = testsToImages;
-exports.removeProps = removeProps;
-exports.readDirRecursive = readDirRecursive;
-exports.downloadBinary = exports.isInsideDocker = exports.skipOptionKeys = exports.extensions = exports.LOCALHOST_REGEXP = exports.isShuttingDown = void 0;
-
 var _fs = require("fs");
-
 var _cluster = _interopRequireDefault(require("cluster"));
-
 var _types = require("../types");
-
 var _messages = require("./messages");
-
 var _findCacheDir = _interopRequireDefault(require("find-cache-dir"));
-
 var _https = require("https");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const isShuttingDown = {
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const isShuttingDown = exports.isShuttingDown = {
   current: false
 };
-exports.isShuttingDown = isShuttingDown;
-const LOCALHOST_REGEXP = /(localhost|127\.0\.0\.1)/i;
-exports.LOCALHOST_REGEXP = LOCALHOST_REGEXP;
-const extensions = ['.js', '.jsx', '.ts', '.tsx'];
-exports.extensions = extensions;
-const skipOptionKeys = ['in', 'kinds', 'stories', 'tests', 'reason'];
-exports.skipOptionKeys = skipOptionKeys;
-
+const LOCALHOST_REGEXP = exports.LOCALHOST_REGEXP = /(localhost|127\.0\.0\.1)/i;
+const extensions = exports.extensions = ['.js', '.jsx', '.ts', '.tsx'];
+const skipOptionKeys = exports.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) || !(0, _types.isDefined)(pattern);
 }
-
 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;
+}
+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
@@ -89,10 +65,9 @@ function shouldSkip(browser, meta, skipOptions, test) {
   const skipByTest = !(0, _types.isDefined)(test) || matchBy(tests, test);
   return skipByBrowser && skipByKind && skipByStory && skipByTest && reason;
 }
-
 async function shutdownWorkers() {
   isShuttingDown.current = true;
-  await Promise.all(Object.values(_cluster.default.workers).filter(_types.isDefined).filter(worker => worker.isConnected()).map(worker => new Promise(resolve => {
+  await Promise.all(Object.values(_cluster.default.workers ?? {}).filter(_types.isDefined).filter(worker => worker.isConnected()).map(worker => new Promise(resolve => {
     const timeout = setTimeout(() => worker.kill(), 10000);
     worker.on('exit', () => {
       clearTimeout(timeout);
@@ -102,25 +77,21 @@ async function shutdownWorkers() {
   })));
   (0, _messages.emitShutdownMessage)();
 }
-
 function shutdown() {
   // eslint-disable-next-line no-process-exit
   process.exit();
 }
-
 function getCreeveyCache() {
   return (0, _findCacheDir.default)({
     name: 'creevey',
     cwd: __dirname
   });
 }
-
 async function runSequence(seq, predicate) {
   for (const fn of seq) {
     if (predicate()) await fn();
   }
 }
-
 function testsToImages(tests) {
   return new Set([].concat(...tests.filter(_types.isDefined).map(({
     browser,
@@ -128,30 +99,22 @@ 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(_types.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(_types.isDefined).join('/')}.png`);
   })));
-} // https://tuhrig.de/how-to-know-you-are-inside-a-docker-container/
-
-
-const isInsideDocker = (0, _fs.existsSync)('/proc/1/cgroup') && /docker/.test((0, _fs.readFileSync)('/proc/1/cgroup', 'utf8'));
-exports.isInsideDocker = isInsideDocker;
+}
 
+// https://tuhrig.de/how-to-know-you-are-inside-a-docker-container/
+const isInsideDocker = exports.isInsideDocker = (0, _fs.existsSync)('/proc/1/cgroup') && /docker/.test((0, _fs.readFileSync)('/proc/1/cgroup', 'utf8'));
 const downloadBinary = (downloadUrl, destination) => new Promise((resolve, reject) => (0, _https.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 = (0, _fs.createWriteStream)(destination);
   response.pipe(fileStream);
   fileStream.on('finish', () => {
@@ -163,12 +126,9 @@ const downloadBinary = (downloadUrl, destination) => new Promise((resolve, rejec
     reject(error);
   });
 }));
-
 exports.downloadBinary = downloadBinary;
-
 function removeProps(obj, propPath) {
   const [prop, ...restPath] = propPath;
-
   if (restPath.length > 0) {
     if (typeof prop == 'string') obj[prop] && removeProps(obj[prop], restPath);
     if ((0, _types.isFunction)(prop)) Object.keys(obj).filter(prop).forEach(key => obj[key] && removeProps(obj[key], restPath));
@@ -177,7 +137,6 @@ function removeProps(obj, propPath) {
     if ((0, _types.isFunction)(prop)) Object.keys(obj).filter(prop).forEach(key => delete obj[key]);
   }
 }
-
 function readDirRecursive(dirPath) {
   return [].concat(...(0, _fs.readdirSync)(dirPath, {
     withFileTypes: true