cypress 15.1.0 → 15.2.0

package/lib/exec/versions.js

@@ -1,53 +1,61 @@
 "use strict";
-
-const Promise = require('bluebird');
-const debug = require('debug')('cypress:cli');
-const path = require('path');
-const util = require('../util');
-const state = require('../tasks/state');
-const {
-  throwFormErrorText,
-  errors
-} = require('../errors');
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const bluebird_1 = __importDefault(require("bluebird"));
+const debug_1 = __importDefault(require("debug"));
+const path_1 = __importDefault(require("path"));
+const util_1 = __importDefault(require("../util"));
+const state_1 = __importDefault(require("../tasks/state"));
+const errors_1 = require("../errors");
+const debug = (0, debug_1.default)('cypress:cli');
 const getVersions = () => {
-  return Promise.try(() => {
-    if (util.getEnv('CYPRESS_RUN_BINARY')) {
-      let envBinaryPath = path.resolve(util.getEnv('CYPRESS_RUN_BINARY'));
-      return state.parseRealPlatformBinaryFolderAsync(envBinaryPath).then(envBinaryDir => {
-        if (!envBinaryDir) {
-          return throwFormErrorText(errors.CYPRESS_RUN_BINARY.notValid(envBinaryPath))();
+    return bluebird_1.default.try(() => {
+        if (util_1.default.getEnv('CYPRESS_RUN_BINARY')) {
+            let envBinaryPath = path_1.default.resolve(util_1.default.getEnv('CYPRESS_RUN_BINARY'));
+            return state_1.default.parseRealPlatformBinaryFolderAsync(envBinaryPath)
+                .then((envBinaryDir) => {
+                if (!envBinaryDir) {
+                    return (0, errors_1.throwFormErrorText)(errors_1.errors.CYPRESS_RUN_BINARY.notValid(envBinaryPath))();
+                }
+                debug('CYPRESS_RUN_BINARY has binaryDir:', envBinaryDir);
+                return envBinaryDir;
+            })
+                .catch({ code: 'ENOENT' }, (err) => {
+                return (0, errors_1.throwFormErrorText)(errors_1.errors.CYPRESS_RUN_BINARY.notValid(envBinaryPath))(err.message);
+            });
         }
-        debug('CYPRESS_RUN_BINARY has binaryDir:', envBinaryDir);
-        return envBinaryDir;
-      }).catch({
-        code: 'ENOENT'
-      }, err => {
-        return throwFormErrorText(errors.CYPRESS_RUN_BINARY.notValid(envBinaryPath))(err.message);
-      });
-    }
-    return state.getBinaryDir();
-  }).then(state.getBinaryPkgAsync).then(pkg => {
-    const versions = {
-      binary: state.getBinaryPkgVersion(pkg),
-      electronVersion: state.getBinaryElectronVersion(pkg),
-      electronNodeVersion: state.getBinaryElectronNodeVersion(pkg)
-    };
-    debug('binary versions %o', versions);
-    return versions;
-  }).then(binaryVersions => {
-    const buildInfo = util.pkgBuildInfo();
-    let packageVersion = util.pkgVersion();
-    if (!buildInfo) packageVersion += ' (development)';else if (!buildInfo.stable) packageVersion += ' (pre-release)';
-    const versions = {
-      package: packageVersion,
-      binary: binaryVersions.binary || 'not installed',
-      electronVersion: binaryVersions.electronVersion || 'not found',
-      electronNodeVersion: binaryVersions.electronNodeVersion || 'not found'
-    };
-    debug('combined versions %o', versions);
-    return versions;
-  });
+        return state_1.default.getBinaryDir();
+    })
+        .then(state_1.default.getBinaryPkgAsync)
+        .then((pkg) => {
+        const versions = {
+            binary: state_1.default.getBinaryPkgVersion(pkg),
+            electronVersion: state_1.default.getBinaryElectronVersion(pkg),
+            electronNodeVersion: state_1.default.getBinaryElectronNodeVersion(pkg),
+        };
+        debug('binary versions %o', versions);
+        return versions;
+    })
+        .then((binaryVersions) => {
+        const buildInfo = util_1.default.pkgBuildInfo();
+        let packageVersion = util_1.default.pkgVersion();
+        if (!buildInfo)
+            packageVersion += ' (development)';
+        else if (!buildInfo.stable)
+            packageVersion += ' (pre-release)';
+        const versions = {
+            package: packageVersion,
+            binary: binaryVersions.binary || 'not installed',
+            electronVersion: binaryVersions.electronVersion || 'not found',
+            electronNodeVersion: binaryVersions.electronNodeVersion || 'not found',
+        };
+        debug('combined versions %o', versions);
+        return versions;
+    });
+};
+const versionsModule = {
+    getVersions,
 };
-module.exports = {
-  getVersions
-};
+exports.default = versionsModule;

package/lib/exec/xvfb.js

@@ -1,72 +1,66 @@
 "use strict";
-
-const os = require('os');
-const Promise = require('bluebird');
-const Xvfb = require('@cypress/xvfb');
-const {
-  stripIndent
-} = require('common-tags');
-const Debug = require('debug');
-const {
-  throwFormErrorText,
-  errors
-} = require('../errors');
-const util = require('../util');
-const debug = Debug('cypress:cli');
-const debugXvfb = Debug('cypress:xvfb');
-debug.Debug = debugXvfb.Debug = Debug;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const os_1 = __importDefault(require("os"));
+const bluebird_1 = __importDefault(require("bluebird"));
+const xvfb_1 = __importDefault(require("@cypress/xvfb"));
+const common_tags_1 = require("common-tags");
+const debug_1 = __importDefault(require("debug"));
+const errors_1 = require("../errors");
+const util_1 = __importDefault(require("../util"));
+const debug = (0, debug_1.default)('cypress:cli');
+const debugXvfb = (0, debug_1.default)('cypress:xvfb');
+debug.Debug = debugXvfb.Debug = debug_1.default;
 const xvfbOptions = {
-  displayNum: process.env.XVFB_DISPLAY_NUM,
-  timeout: 30000,
-  // milliseconds
-  // need to explicitly define screen otherwise electron will crash
-  // https://github.com/cypress-io/cypress/issues/6184
-  xvfb_args: ['-screen', '0', '1280x1024x24'],
-  onStderrData(data) {
-    if (debugXvfb.enabled) {
-      debugXvfb(data.toString());
-    }
-  }
+    displayNum: process.env.XVFB_DISPLAY_NUM,
+    timeout: 30000, // milliseconds
+    // need to explicitly define screen otherwise electron will crash
+    // https://github.com/cypress-io/cypress/issues/6184
+    xvfb_args: ['-screen', '0', '1280x1024x24'],
+    onStderrData(data) {
+        if (debugXvfb.enabled) {
+            debugXvfb(data.toString());
+        }
+    },
 };
-const xvfb = Promise.promisifyAll(new Xvfb(xvfbOptions));
-module.exports = {
-  _debugXvfb: debugXvfb,
-  // expose for testing
-
-  _xvfb: xvfb,
-  // expose for testing
-
-  _xvfbOptions: xvfbOptions,
-  // expose for testing
-
-  start() {
-    debug('Starting Xvfb');
-    return xvfb.startAsync().return(null).catch({
-      nonZeroExitCode: true
-    }, throwFormErrorText(errors.nonZeroExitCodeXvfb)).catch(err => {
-      if (err.known) {
-        throw err;
-      }
-      return throwFormErrorText(errors.missingXvfb)(err);
-    });
-  },
-  stop() {
-    debug('Stopping Xvfb');
-    return xvfb.stopAsync().return(null).catch(() => {
-      // noop
-    });
-  },
-  isNeeded() {
-    if (process.env.ELECTRON_RUN_AS_NODE) {
-      debug('Environment variable ELECTRON_RUN_AS_NODE detected, xvfb is not needed');
-      return false; // xvfb required for electron processes only.
-    }
-    if (os.platform() !== 'linux') {
-      return false;
-    }
-    if (process.env.DISPLAY) {
-      const issueUrl = util.getGitHubIssueUrl(4034);
-      const message = stripIndent`
+const xvfb = bluebird_1.default.promisifyAll(new xvfb_1.default(xvfbOptions));
+const xvfbModule = {
+    _debugXvfb: debugXvfb, // expose for testing
+    _xvfb: xvfb, // expose for testing
+    _xvfbOptions: xvfbOptions, // expose for testing
+    start() {
+        debug('Starting Xvfb');
+        return xvfb.startAsync()
+            .return(null)
+            .catch({ nonZeroExitCode: true }, (0, errors_1.throwFormErrorText)(errors_1.errors.nonZeroExitCodeXvfb))
+            .catch((err) => {
+            if (err.known) {
+                throw err;
+            }
+            return (0, errors_1.throwFormErrorText)(errors_1.errors.missingXvfb)(err);
+        });
+    },
+    stop() {
+        debug('Stopping Xvfb');
+        return xvfb.stopAsync()
+            .return(null)
+            .catch(() => {
+            // noop
+        });
+    },
+    isNeeded() {
+        if (process.env.ELECTRON_RUN_AS_NODE) {
+            debug('Environment variable ELECTRON_RUN_AS_NODE detected, xvfb is not needed');
+            return false; // xvfb required for electron processes only.
+        }
+        if (os_1.default.platform() !== 'linux') {
+            return false;
+        }
+        if (process.env.DISPLAY) {
+            const issueUrl = util_1.default.getGitHubIssueUrl(4034);
+            const message = (0, common_tags_1.stripIndent) `
         DISPLAY environment variable is set to ${process.env.DISPLAY} on Linux
         Assuming this DISPLAY points at working X11 server,
         Cypress will not spawn own Xvfb
@@ -76,18 +70,22 @@ module.exports = {
         Solution: Unset the DISPLAY variable and try again:
           DISPLAY= npx cypress run ...
       `;
-      debug(message);
-      return false;
-    }
-    debug('undefined DISPLAY environment variable');
-    debug('Cypress will spawn its own Xvfb');
-    return true;
-  },
-  // async method, resolved with Boolean
-  verify() {
-    return xvfb.startAsync().return(true).catch(err => {
-      debug('Could not verify xvfb: %s', err.message);
-      return false;
-    }).finally(xvfb.stopAsync);
-  }
-};
+            debug(message);
+            return false;
+        }
+        debug('undefined DISPLAY environment variable');
+        debug('Cypress will spawn its own Xvfb');
+        return true;
+    },
+    // async method, resolved with Boolean
+    verify() {
+        return xvfb.startAsync()
+            .return(true)
+            .catch((err) => {
+            debug('Could not verify xvfb: %s', err.message);
+            return false;
+        })
+            .finally(xvfb.stopAsync);
+    },
+};
+exports.default = xvfbModule;

package/lib/fs.js

@@ -1,4 +1,8 @@
 "use strict";
-
-const Promise = require('bluebird');
-module.exports = Promise.promisifyAll(require('fs-extra'));
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const bluebird_1 = __importDefault(require("bluebird"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+exports.default = bluebird_1.default.promisifyAll(fs_extra_1.default);

package/lib/logger.js

@@ -1,50 +1,55 @@
 "use strict";
-
-const chalk = require('chalk');
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
 let logs = [];
 const logLevel = () => {
-  return process.env.npm_config_loglevel || 'notice';
+    return (process.env.npm_config_loglevel || 'notice');
 };
 const error = (...messages) => {
-  logs.push(messages.join(' '));
-  console.log(chalk.red(...messages)); // eslint-disable-line no-console
+    logs.push(messages.join(' '));
+    console.log(chalk_1.default.red(...messages)); // eslint-disable-line no-console
 };
 const warn = (...messages) => {
-  if (logLevel() === 'silent') return;
-  logs.push(messages.join(' '));
-  console.log(chalk.yellow(...messages)); // eslint-disable-line no-console
+    if (logLevel() === 'silent')
+        return;
+    logs.push(messages.join(' '));
+    console.log(chalk_1.default.yellow(...messages)); // eslint-disable-line no-console
 };
 const log = (...messages) => {
-  if (logLevel() === 'silent' || logLevel() === 'warn') return;
-  logs.push(messages.join(' '));
-  console.log(...messages); // eslint-disable-line no-console
+    if (logLevel() === 'silent' || logLevel() === 'warn')
+        return;
+    logs.push(messages.join(' '));
+    console.log(...messages); // eslint-disable-line no-console
 };
 const always = (...messages) => {
-  logs.push(messages.join(' '));
-  console.log(...messages); // eslint-disable-line no-console
+    logs.push(messages.join(' '));
+    console.log(...messages); // eslint-disable-line no-console
 };
-
 // splits long text into lines and calls log()
 // on each one to allow easy unit testing for specific message
-const logLines = text => {
-  const lines = text.split('\n');
-  for (const line of lines) {
-    log(line);
-  }
+const logLines = (text) => {
+    const lines = text.split('\n');
+    for (const line of lines) {
+        log(line);
+    }
 };
 const print = () => {
-  return logs.join('\n');
+    return logs.join('\n');
 };
 const reset = () => {
-  logs = [];
-};
-module.exports = {
-  log,
-  warn,
-  error,
-  always,
-  logLines,
-  print,
-  reset,
-  logLevel
-};
+    logs = [];
+};
+const loggerModule = {
+    log,
+    warn,
+    error,
+    always,
+    logLines,
+    print,
+    reset,
+    logLevel,
+};
+exports.default = loggerModule;

package/lib/tasks/cache.js

@@ -1,132 +1,147 @@
 "use strict";
-
-const state = require('./state');
-const logger = require('../logger');
-const fs = require('../fs');
-const util = require('../util');
-const {
-  join
-} = require('path');
-const Table = require('cli-table3');
-const dayjs = require('dayjs');
-const relativeTime = require('dayjs/plugin/relativeTime');
-const chalk = require('chalk');
-const _ = require('lodash');
-const getFolderSize = require('./get-folder-size');
-const Bluebird = require('bluebird');
-dayjs.extend(relativeTime);
-
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const state_1 = __importDefault(require("./state"));
+const logger_1 = __importDefault(require("../logger"));
+const fs_1 = __importDefault(require("../fs"));
+const util_1 = __importDefault(require("../util"));
+const path_1 = require("path");
+const cli_table3_1 = __importDefault(require("cli-table3"));
+const dayjs_1 = __importDefault(require("dayjs"));
+const relativeTime_1 = __importDefault(require("dayjs/plugin/relativeTime"));
+const chalk_1 = __importDefault(require("chalk"));
+const lodash_1 = __importDefault(require("lodash"));
+const get_folder_size_1 = __importDefault(require("./get-folder-size"));
+dayjs_1.default.extend(relativeTime_1.default);
 // output colors for the table
 const colors = {
-  titles: chalk.white,
-  dates: chalk.cyan,
-  values: chalk.green,
-  size: chalk.gray
+    titles: chalk_1.default.white,
+    dates: chalk_1.default.cyan,
+    values: chalk_1.default.green,
+    size: chalk_1.default.gray,
 };
 const logCachePath = () => {
-  logger.always(state.getCacheDir());
-  return undefined;
+    logger_1.default.always(state_1.default.getCacheDir());
+    return undefined;
 };
 const clear = () => {
-  return fs.removeAsync(state.getCacheDir());
+    return fs_1.default.removeAsync(state_1.default.getCacheDir());
 };
-const prune = () => {
-  const cacheDir = state.getCacheDir();
-  const checkedInBinaryVersion = util.pkgVersion();
-  let deletedBinary = false;
-  return fs.readdirAsync(cacheDir).then(versions => {
-    return Bluebird.all(versions.map(version => {
-      if (version !== checkedInBinaryVersion) {
-        deletedBinary = true;
-        const versionDir = join(cacheDir, version);
-        return fs.removeAsync(versionDir);
-      }
-    }));
-  }).then(() => {
-    if (deletedBinary) {
-      logger.always(`Deleted all binary caches except for the ${checkedInBinaryVersion} binary cache.`);
-    } else {
-      logger.always(`No binary caches found to prune.`);
+const prune = () => __awaiter(void 0, void 0, void 0, function* () {
+    const cacheDir = state_1.default.getCacheDir();
+    const checkedInBinaryVersion = util_1.default.pkgVersion();
+    let deletedBinary = false;
+    try {
+        const versions = yield fs_1.default.readdirAsync(cacheDir);
+        for (const version of versions) {
+            if (version !== checkedInBinaryVersion) {
+                deletedBinary = true;
+                const versionDir = (0, path_1.join)(cacheDir, version);
+                yield fs_1.default.removeAsync(versionDir);
+            }
+        }
+        if (deletedBinary) {
+            logger_1.default.always(`Deleted all binary caches except for the ${checkedInBinaryVersion} binary cache.`);
+        }
+        else {
+            logger_1.default.always(`No binary caches found to prune.`);
+        }
     }
-  }).catch({
-    code: 'ENOENT'
-  }, () => {
-    logger.always(`No Cypress cache was found at ${cacheDir}. Nothing to prune.`);
-  });
-};
-const fileSizeInMB = size => {
-  return `${(size / 1024 / 1024).toFixed(1)}MB`;
+    catch (e) {
+        if (e.code === 'ENOENT') {
+            logger_1.default.always(`No Cypress cache was found at ${cacheDir}. Nothing to prune.`);
+            return;
+        }
+        throw e;
+    }
+});
+const fileSizeInMB = (size) => {
+    return `${(size / 1024 / 1024).toFixed(1)}MB`;
 };
-
 /**
  * Collects all cached versions, finds when each was used
  * and prints a table with results to the terminal
  */
-const list = showSize => {
-  return getCachedVersions(showSize).then(binaries => {
-    const head = [colors.titles('version'), colors.titles('last used')];
-    if (showSize) {
-      head.push(colors.titles('size'));
-    }
-    const table = new Table({
-      head
-    });
-    binaries.forEach(binary => {
-      const versionString = colors.values(binary.version);
-      const lastUsed = binary.accessed ? colors.dates(binary.accessed) : 'unknown';
-      const row = [versionString, lastUsed];
-      if (showSize) {
-        const size = colors.size(fileSizeInMB(binary.size));
-        row.push(size);
-      }
-      return table.push(row);
+const list = (showSize = false) => {
+    return getCachedVersions(showSize)
+        .then((binaries) => {
+        const head = [colors.titles('version'), colors.titles('last used')];
+        if (showSize) {
+            head.push(colors.titles('size'));
+        }
+        const table = new cli_table3_1.default({
+            head,
+        });
+        binaries.forEach((binary) => {
+            const versionString = colors.values(binary.version);
+            const lastUsed = binary.accessed ? colors.dates(binary.accessed) : 'unknown';
+            const row = [versionString, lastUsed];
+            if (showSize) {
+                const size = colors.size(fileSizeInMB(binary.size));
+                row.push(size);
+            }
+            return table.push(row);
+        });
+        logger_1.default.always(table.toString());
     });
-    logger.always(table.toString());
-  });
 };
-const getCachedVersions = showSize => {
-  const cacheDir = state.getCacheDir();
-  return fs.readdirAsync(cacheDir).filter(util.isSemver).map(version => {
-    return {
-      version,
-      folderPath: join(cacheDir, version)
-    };
-  }).mapSeries(binary => {
-    // last access time on the folder is different from last access time
-    // on the Cypress binary
-    const binaryDir = state.getBinaryDir(binary.version);
-    const executable = state.getPathToExecutable(binaryDir);
-    return fs.statAsync(executable).then(stat => {
-      const lastAccessedTime = _.get(stat, 'atime');
-      if (!lastAccessedTime) {
-        // the test runner has never been opened
-        // or could be a test simulating missing timestamp
-        return binary;
-      }
-      const accessed = dayjs(lastAccessedTime).fromNow();
-      binary.accessed = accessed;
-      return binary;
-    }, e => {
-      // could not find the binary or gets its stats
-      return binary;
-    });
-  }).mapSeries(binary => {
-    if (showSize) {
-      const binaryDir = state.getBinaryDir(binary.version);
-      return getFolderSize(binaryDir).then(size => {
+const getCachedVersions = (showSize) => {
+    const cacheDir = state_1.default.getCacheDir();
+    return fs_1.default
+        .readdirAsync(cacheDir)
+        .filter(util_1.default.isSemver)
+        .map((version) => {
         return {
-          ...binary,
-          size
+            version,
+            folderPath: (0, path_1.join)(cacheDir, version),
         };
-      });
-    }
-    return binary;
-  });
+    })
+        .mapSeries((binary) => {
+        // last access time on the folder is different from last access time
+        // on the Cypress binary
+        const binaryDir = state_1.default.getBinaryDir(binary.version);
+        const executable = state_1.default.getPathToExecutable(binaryDir);
+        return fs_1.default.statAsync(executable).then((stat) => {
+            const lastAccessedTime = lodash_1.default.get(stat, 'atime');
+            if (!lastAccessedTime) {
+                // the test runner has never been opened
+                // or could be a test simulating missing timestamp
+                return binary;
+            }
+            const accessed = (0, dayjs_1.default)(lastAccessedTime).fromNow();
+            binary.accessed = accessed;
+            return binary;
+        }, (e) => {
+            // could not find the binary or gets its stats
+            return binary;
+        });
+    })
+        .mapSeries((binary) => {
+        if (showSize) {
+            const binaryDir = state_1.default.getBinaryDir(binary.version);
+            return (0, get_folder_size_1.default)(binaryDir).then((size) => {
+                return Object.assign(Object.assign({}, binary), { size });
+            });
+        }
+        return binary;
+    });
+};
+const cacheModule = {
+    path: logCachePath,
+    clear,
+    prune,
+    list,
+    getCachedVersions,
 };
-module.exports = {
-  path: logCachePath,
-  clear,
-  prune,
-  list,
-  getCachedVersions
-};
+exports.default = cacheModule;