cypress 5.1.0 → 5.5.0

package/lib/util.js

@@ -1,90 +1,57 @@
 "use strict";
 
-function _templateObject2() {
-  var data = _taggedTemplateLiteral(["\n        Platform: ", " (", ")\n        Cypress Version: ", "\n      "]);
+const _ = require('lodash');
 
-  _templateObject2 = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n\n    ", " Warning: Cypress failed to start.\n\n    This is likely due to a misconfigured DISPLAY environment variable.\n\n    DISPLAY was set to: \"", "\"\n\n    Cypress will attempt to fix the problem and rerun.\n  "]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
+const R = require('ramda');
 
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+const os = require('os');
 
-var _ = require('lodash');
+const ospath = require('ospath');
 
-var R = require('ramda');
+const crypto = require('crypto');
 
-var os = require('os');
+const la = require('lazy-ass');
 
-var ospath = require('ospath');
+const is = require('check-more-types');
 
-var crypto = require('crypto');
+const tty = require('tty');
 
-var la = require('lazy-ass');
+const path = require('path');
 
-var is = require('check-more-types');
+const isCi = require('is-ci');
 
-var tty = require('tty');
+const execa = require('execa');
 
-var path = require('path');
+const getos = require('getos');
 
-var _isCi = require('is-ci');
+const chalk = require('chalk');
 
-var execa = require('execa');
+const Promise = require('bluebird');
 
-var getos = require('getos');
+const cachedir = require('cachedir');
 
-var chalk = require('chalk');
+const logSymbols = require('log-symbols');
 
-var Promise = require('bluebird');
+const executable = require('executable');
 
-var cachedir = require('cachedir');
+const {
+  stripIndent
+} = require('common-tags');
 
-var logSymbols = require('log-symbols');
+const supportsColor = require('supports-color');
 
-var executable = require('executable');
+const isInstalledGlobally = require('is-installed-globally');
 
-var _require = require('common-tags'),
-    stripIndent = _require.stripIndent;
+const pkg = require(path.join(__dirname, '..', 'package.json'));
 
-var _supportsColor = require('supports-color');
+const logger = require('./logger');
 
-var _isInstalledGlobally = require('is-installed-globally');
+const debug = require('debug')('cypress:cli');
 
-var pkg = require(path.join(__dirname, '..', 'package.json'));
+const fs = require('./fs');
 
-var logger = require('./logger');
-
-var debug = require('debug')('cypress:cli');
-
-var fs = require('./fs');
-
-var issuesUrl = 'https://github.com/cypress-io/cypress/issues';
-var getosAsync = Promise.promisify(getos);
+const issuesUrl = 'https://github.com/cypress-io/cypress/issues';
+const getosAsync = Promise.promisify(getos);
 /**
  * Returns SHA512 of a file
  *
@@ -92,36 +59,35 @@ var getosAsync = Promise.promisify(getos);
  * but without bringing that dependency (since hasha is Node v8+)
  */
 
-var getFileChecksum = function getFileChecksum(filename) {
+const getFileChecksum = filename => {
   la(is.unemptyString(filename), 'expected filename', filename);
 
-  var hashStream = function hashStream() {
-    var s = crypto.createHash('sha512');
+  const hashStream = () => {
+    const s = crypto.createHash('sha512');
     s.setEncoding('hex');
     return s;
   };
 
-  return new Promise(function (resolve, reject) {
-    var stream = fs.createReadStream(filename);
+  return new Promise((resolve, reject) => {
+    const stream = fs.createReadStream(filename);
     stream.on('error', reject).pipe(hashStream()).on('error', reject).on('finish', function () {
       resolve(this.read());
     });
   });
 };
 
-var getFileSize = function getFileSize(filename) {
+const getFileSize = filename => {
   la(is.unemptyString(filename), 'expected filename', filename);
   return fs.statAsync(filename).get('size');
 };
 
-var isBrokenGtkDisplayRe = /Gtk: cannot open display/;
+const isBrokenGtkDisplayRe = /Gtk: cannot open display/;
 
-var stringify = function stringify(val) {
+const stringify = val => {
   return _.isObject(val) ? JSON.stringify(val) : val;
 };
 
-function normalizeModuleOptions() {
-  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+function normalizeModuleOptions(options = {}) {
   return _.mapValues(options, stringify);
 }
 /**
@@ -130,7 +96,7 @@ function normalizeModuleOptions() {
  */
 
 
-var isLinux = function isLinux() {
+const isLinux = () => {
   return os.platform() === 'linux';
 };
 /**
@@ -142,24 +108,33 @@ var isLinux = function isLinux() {
    */
 
 
-var isBrokenGtkDisplay = function isBrokenGtkDisplay(str) {
+const isBrokenGtkDisplay = str => {
   return isBrokenGtkDisplayRe.test(str);
 };
 
-var isPossibleLinuxWithIncorrectDisplay = function isPossibleLinuxWithIncorrectDisplay() {
+const isPossibleLinuxWithIncorrectDisplay = () => {
   return isLinux() && process.env.DISPLAY;
 };
 
-var logBrokenGtkDisplayWarning = function logBrokenGtkDisplayWarning() {
+const logBrokenGtkDisplayWarning = () => {
   debug('Cypress exited due to a broken gtk display because of a potential invalid DISPLAY env... retrying after starting Xvfb'); // if we get this error, we are on Linux and DISPLAY is set
 
-  logger.warn(stripIndent(_templateObject(), logSymbols.warning, process.env.DISPLAY));
+  logger.warn(stripIndent`
+
+    ${logSymbols.warning} Warning: Cypress failed to start.
+
+    This is likely due to a misconfigured DISPLAY environment variable.
+
+    DISPLAY was set to: "${process.env.DISPLAY}"
+
+    Cypress will attempt to fix the problem and rerun.
+  `);
   logger.warn();
 };
 
 function stdoutLineMatches(expectedLine, stdout) {
-  var lines = stdout.split('\n').map(R.trim);
-  var lineMatches = R.equals(expectedLine);
+  const lines = stdout.split('\n').map(R.trim);
+  const lineMatches = R.equals(expectedLine);
   return lines.some(lineMatches);
 }
 /**
@@ -178,7 +153,7 @@ function isValidCypressInternalEnvValue(value) {
   } // names of config environments, see "packages/server/config/app.yml"
 
 
-  var names = ['development', 'test', 'staging', 'production'];
+  const names = ['development', 'test', 'staging', 'production'];
   return _.includes(names, value);
 }
 /**
@@ -199,9 +174,7 @@ function isNonProductionCypressInternalEnvValue(value) {
  */
 
 
-function printNodeOptions() {
-  var log = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : debug;
-
+function printNodeOptions(log = debug) {
   if (!log.enabled) {
     return;
   }
@@ -228,7 +201,7 @@ function printNodeOptions() {
  */
 
 
-var dequote = function dequote(str) {
+const dequote = str => {
   la(is.string(str), 'expected a string to remove double quotes', str);
 
   if (str.length > 1 && str[0] === '"' && str[str.length - 1] === '"') {
@@ -238,8 +211,8 @@ var dequote = function dequote(str) {
   return str;
 };
 
-var parseOpts = function parseOpts(opts) {
-  opts = _.pick(opts, 'browser', 'cachePath', 'cacheList', 'cacheClear', 'ciBuildId', 'config', 'configFile', 'cypressVersion', 'destination', 'detached', 'dev', 'exit', 'env', 'force', 'global', 'group', 'headed', 'headless', 'key', 'path', 'parallel', 'port', 'project', 'quiet', 'reporter', 'reporterOptions', 'record', 'spec', 'tag');
+const parseOpts = opts => {
+  opts = _.pick(opts, 'browser', 'cachePath', 'cacheList', 'cacheClear', 'cachePrune', 'ciBuildId', 'config', 'configFile', 'cypressVersion', 'destination', 'detached', 'dev', 'exit', 'env', 'force', 'global', 'group', 'headed', 'headless', 'key', 'path', 'parallel', 'port', 'project', 'quiet', 'reporter', 'reporterOptions', 'record', 'spec', 'tag');
 
   if (opts.exit) {
     opts = _.omit(opts, 'exit');
@@ -247,11 +220,11 @@ var parseOpts = function parseOpts(opts) {
   // remove double quotes from certain options
 
 
-  var removeQuotes = {
+  const removeQuotes = {
     group: dequote,
     ciBuildId: dequote
   };
-  var cleanOpts = R.evolve(removeQuotes, opts);
+  const cleanOpts = R.evolve(removeQuotes, opts);
   debug('parsed cli options %o', cleanOpts);
   return cleanOpts;
 };
@@ -261,41 +234,39 @@ var parseOpts = function parseOpts(opts) {
  */
 
 
-var getApplicationDataFolder = function getApplicationDataFolder() {
-  var _process = process,
-      env = _process.env; // allow overriding the app_data folder
-
-  var folder = env.CYPRESS_KONFIG_ENV || env.CYPRESS_INTERNAL_ENV || 'development';
-  var PRODUCT_NAME = pkg.productName || pkg.name;
-  var OS_DATA_PATH = ospath.data();
-  var ELECTRON_APP_DATA_PATH = path.join(OS_DATA_PATH, PRODUCT_NAME);
-
-  for (var _len = arguments.length, paths = new Array(_len), _key = 0; _key < _len; _key++) {
-    paths[_key] = arguments[_key];
-  }
+const getApplicationDataFolder = (...paths) => {
+  const {
+    env
+  } = process; // allow overriding the app_data folder
 
-  var p = path.join.apply(path, [ELECTRON_APP_DATA_PATH, 'cy', folder].concat(paths));
+  const folder = env.CYPRESS_KONFIG_ENV || env.CYPRESS_INTERNAL_ENV || 'development';
+  const PRODUCT_NAME = pkg.productName || pkg.name;
+  const OS_DATA_PATH = ospath.data();
+  const ELECTRON_APP_DATA_PATH = path.join(OS_DATA_PATH, PRODUCT_NAME);
+  const p = path.join(ELECTRON_APP_DATA_PATH, 'cy', folder, ...paths);
   return p;
 };
 
-var util = {
-  normalizeModuleOptions: normalizeModuleOptions,
-  parseOpts: parseOpts,
-  isValidCypressInternalEnvValue: isValidCypressInternalEnvValue,
-  isNonProductionCypressInternalEnvValue: isNonProductionCypressInternalEnvValue,
-  printNodeOptions: printNodeOptions,
-  isCi: function isCi() {
-    return _isCi;
+const util = {
+  normalizeModuleOptions,
+  parseOpts,
+  isValidCypressInternalEnvValue,
+  isNonProductionCypressInternalEnvValue,
+  printNodeOptions,
+
+  isCi() {
+    return isCi;
   },
-  getEnvOverrides: function getEnvOverrides() {
-    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+  getEnvOverrides(options = {}) {
     return _.chain({}).extend(util.getEnvColors()).extend(util.getForceTty()).omitBy(_.isUndefined) // remove undefined values
-    .mapValues(function (value) {
+    .mapValues(value => {
       // stringify to 1 or 0
       return value ? '1' : '0';
     }).extend(util.getNodeOptions(options)).value();
   },
-  getNodeOptions: function getNodeOptions(options, nodeVersion) {
+
+  getNodeOptions(options, nodeVersion) {
     if (!nodeVersion) {
       nodeVersion = Number(process.versions.node.split('.')[0]);
     }
@@ -307,38 +278,42 @@ var util = {
     } // https://github.com/cypress-io/cypress/issues/5431
 
 
-    var NODE_OPTIONS = "--max-http-header-size=".concat(Math.pow(1024, 2), " --http-parser=legacy");
+    const NODE_OPTIONS = `--max-http-header-size=${1024 ** 2}`;
 
     if (_.isString(process.env.NODE_OPTIONS)) {
       return {
-        NODE_OPTIONS: "".concat(NODE_OPTIONS, " ").concat(process.env.NODE_OPTIONS),
+        NODE_OPTIONS: `${NODE_OPTIONS} ${process.env.NODE_OPTIONS}`,
         ORIGINAL_NODE_OPTIONS: process.env.NODE_OPTIONS || ''
       };
     }
 
     return {
-      NODE_OPTIONS: NODE_OPTIONS
+      NODE_OPTIONS
     };
   },
-  getForceTty: function getForceTty() {
+
+  getForceTty() {
     return {
       FORCE_STDIN_TTY: util.isTty(process.stdin.fd),
       FORCE_STDOUT_TTY: util.isTty(process.stdout.fd),
       FORCE_STDERR_TTY: util.isTty(process.stderr.fd)
     };
   },
-  getEnvColors: function getEnvColors() {
-    var sc = util.supportsColor();
+
+  getEnvColors() {
+    const sc = util.supportsColor();
     return {
       FORCE_COLOR: sc,
       DEBUG_COLORS: sc,
       MOCHA_COLORS: sc ? true : undefined
     };
   },
-  isTty: function isTty(fd) {
+
+  isTty(fd) {
     return tty.isatty(fd);
   },
-  supportsColor: function supportsColor() {
+
+  supportsColor() {
     // if we've been explictly told not to support
     // color then turn this off
     if (process.env.NO_COLOR) {
@@ -352,35 +327,38 @@ var util = {
     } // ensure that both stdout and stderr support color
 
 
-    return Boolean(_supportsColor.stdout) && Boolean(_supportsColor.stderr);
+    return Boolean(supportsColor.stdout) && Boolean(supportsColor.stderr);
   },
-  cwd: function cwd() {
+
+  cwd() {
     return process.cwd();
   },
-  pkgVersion: function pkgVersion() {
+
+  pkgVersion() {
     return pkg.version;
   },
-  exit: function exit(code) {
+
+  exit(code) {
     process.exit(code);
   },
-  logErrorExit1: function logErrorExit1(err) {
+
+  logErrorExit1(err) {
     logger.error(err.message);
     process.exit(1);
   },
-  dequote: dequote,
-  titleize: function titleize() {
-    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-      args[_key2] = arguments[_key2];
-    }
 
+  dequote,
+
+  titleize(...args) {
     // prepend first arg with space
     // and pad so that all messages line up
-    args[0] = _.padEnd(" ".concat(args[0]), 24); // get rid of any falsy values
+    args[0] = _.padEnd(` ${args[0]}`, 24); // get rid of any falsy values
 
     args = _.compact(args);
-    return chalk.blue.apply(chalk, _toConsumableArray(args));
+    return chalk.blue(...args);
   },
-  calculateEta: function calculateEta(percent, elapsed) {
+
+  calculateEta(percent, elapsed) {
     // returns the number of seconds remaining
     // if we're at 100% already just return 0
     if (percent === 100) {
@@ -392,38 +370,46 @@ var util = {
 
     return elapsed * (1 / (percent / 100)) - elapsed;
   },
-  convertPercentToPercentage: function convertPercentToPercentage(num) {
+
+  convertPercentToPercentage(num) {
     // convert a percent with values between 0 and 1
     // with decimals, so that it is between 0 and 100
     // and has no decimal places
     return Math.round(_.isFinite(num) ? num * 100 : 0);
   },
-  secsRemaining: function secsRemaining(eta) {
+
+  secsRemaining(eta) {
     // calculate the seconds reminaing with no decimal places
     return (_.isFinite(eta) ? eta / 1000 : 0).toFixed(0);
   },
-  setTaskTitle: function setTaskTitle(task, title, renderer) {
+
+  setTaskTitle(task, title, renderer) {
     // only update the renderer title when not running in CI
     if (renderer === 'default' && task.title !== title) {
       task.title = title;
     }
   },
-  isInstalledGlobally: function isInstalledGlobally() {
-    return _isInstalledGlobally;
+
+  isInstalledGlobally() {
+    return isInstalledGlobally;
   },
-  isSemver: function isSemver(str) {
+
+  isSemver(str) {
     return /^(\d+\.)?(\d+\.)?(\*|\d+)$/.test(str);
   },
-  isExecutableAsync: function isExecutableAsync(filePath) {
+
+  isExecutableAsync(filePath) {
     return Promise.resolve(executable(filePath));
   },
-  isLinux: isLinux,
-  getOsVersionAsync: function getOsVersionAsync() {
-    return Promise["try"](function () {
+
+  isLinux,
+
+  getOsVersionAsync() {
+    return Promise.try(() => {
       if (isLinux()) {
-        return getosAsync().then(function (osInfo) {
+        return getosAsync().then(osInfo => {
           return [osInfo.dist, osInfo.release].join(' - ');
-        })["catch"](function () {
+        }).catch(() => {
           return os.release();
         });
       }
@@ -431,38 +417,43 @@ var util = {
       return os.release();
     });
   },
-  getPlatformInfo: function getPlatformInfo() {
-    return util.getOsVersionAsync().then(function (version) {
-      return stripIndent(_templateObject2(), os.platform(), version, util.pkgVersion());
+
+  getPlatformInfo() {
+    return util.getOsVersionAsync().then(version => {
+      return stripIndent`
+        Platform: ${os.platform()} (${version})
+        Cypress Version: ${util.pkgVersion()}
+      `;
     });
   },
+
   // attention:
   // when passing relative path to NPM post install hook, the current working
   // directory is set to the `node_modules/cypress` folder
   // the user is probably passing relative path with respect to root package folder
-  formAbsolutePath: function formAbsolutePath(filename) {
+  formAbsolutePath(filename) {
     if (path.isAbsolute(filename)) {
       return filename;
     }
 
     return path.join(process.cwd(), '..', '..', filename);
   },
-  getEnv: function getEnv(varName, trim) {
+
+  getEnv(varName, trim) {
     la(is.unemptyString(varName), 'expected environment variable name, not', varName);
-    var envVar = process.env[varName];
-    var configVar = process.env["npm_config_".concat(varName)];
-    var packageConfigVar = process.env["npm_package_config_".concat(varName)];
-    var result;
-
-    if (envVar) {
-      debug("Using ".concat(varName, " from environment variable"));
-      result = envVar;
-    } else if (configVar) {
-      debug("Using ".concat(varName, " from npm config"));
-      result = configVar;
-    } else if (packageConfigVar) {
-      debug("Using ".concat(varName, " from package.json config"));
-      result = packageConfigVar;
+    const configVarName = `npm_config_${varName}`;
+    const packageConfigVarName = `npm_package_config_${varName}`;
+    let result;
+
+    if (process.env.hasOwnProperty(varName)) {
+      debug(`Using ${varName} from environment variable`);
+      result = process.env[varName];
+    } else if (process.env.hasOwnProperty(configVarName)) {
+      debug(`Using ${varName} from npm config`);
+      result = process.env[configVarName];
+    } else if (process.env.hasOwnProperty(packageConfigVarName)) {
+      debug(`Using ${varName} from package.json config`);
+      result = process.env[packageConfigVarName];
     } // environment variables are often set double quotes to escape characters
     // and on Windows it can lead to weird things: for example
     //  set FOO="C:\foo.txt" && node -e "console.log('>>>%s<<<', process.env.FOO)"
@@ -476,25 +467,30 @@ var util = {
 
     return trim ? dequote(_.trim(result)) : result;
   },
-  getCacheDir: function getCacheDir() {
+
+  getCacheDir() {
     return cachedir('Cypress');
   },
-  isPostInstall: function isPostInstall() {
+
+  isPostInstall() {
     return process.env.npm_lifecycle_event === 'postinstall';
   },
+
   exec: execa,
-  stdoutLineMatches: stdoutLineMatches,
-  issuesUrl: issuesUrl,
-  isBrokenGtkDisplay: isBrokenGtkDisplay,
-  logBrokenGtkDisplayWarning: logBrokenGtkDisplayWarning,
-  isPossibleLinuxWithIncorrectDisplay: isPossibleLinuxWithIncorrectDisplay,
-  getGitHubIssueUrl: function getGitHubIssueUrl(number) {
+  stdoutLineMatches,
+  issuesUrl,
+  isBrokenGtkDisplay,
+  logBrokenGtkDisplayWarning,
+  isPossibleLinuxWithIncorrectDisplay,
+
+  getGitHubIssueUrl(number) {
     la(is.positive(number), 'github issue should be a positive number', number);
     la(_.isInteger(number), 'github issue should be an integer', number);
-    return "".concat(issuesUrl, "/").concat(number);
+    return `${issuesUrl}/${number}`;
   },
-  getFileChecksum: getFileChecksum,
-  getFileSize: getFileSize,
-  getApplicationDataFolder: getApplicationDataFolder
+
+  getFileChecksum,
+  getFileSize,
+  getApplicationDataFolder
 };
 module.exports = util;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "5.1.0",
+  "version": "5.5.0",
   "main": "index.js",
   "scripts": {
     "postinstall": "node index.js --exec install",
@@ -37,10 +37,10 @@
     "minimist": "^1.2.5",
     "moment": "^2.27.0",
     "ospath": "^1.2.2",
-    "pretty-bytes": "^5.3.0",
+    "pretty-bytes": "^5.4.1",
     "ramda": "~0.26.1",
     "request-progress": "^3.0.0",
-    "supports-color": "^7.1.0",
+    "supports-color": "^7.2.0",
     "tmp": "~0.2.1",
     "untildify": "^4.0.0",
     "url": "^0.11.0",