cypress 4.3.0 → 4.6.0

package/lib/exec/spawn.js

@@ -1,23 +1,32 @@
-'use strict';
+"use strict";
 
 var _ = require('lodash');
+
 var os = require('os');
+
 var cp = require('child_process');
+
 var path = require('path');
+
 var Promise = require('bluebird');
+
 var debug = require('debug')('cypress:cli');
+
 var debugElectron = require('debug')('cypress:electron');
 
 var util = require('../util');
+
 var state = require('../tasks/state');
+
 var xvfb = require('./xvfb');
+
 var verify = require('../tasks/verify');
+
 var errors = require('../errors');
 
 var isXlibOrLibudevRe = /^(?:Xlib|libudev)/;
 var isHighSierraWarningRe = /\*\*\* WARNING/;
 var isRenderWorkerRe = /\.RenderWorker-/;
-
 var GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe];
 
 var isGarbageLineWarning = function isGarbageLineWarning(str) {
@@ -41,11 +50,11 @@ function needsEverythingPipedDirectly() {
 function getStdio(needsXvfb) {
   if (needsEverythingPipedDirectly()) {
     return 'pipe';
-  }
-
-  // https://github.com/cypress-io/cypress/issues/921
+  } // https://github.com/cypress-io/cypress/issues/921
   // https://github.com/cypress-io/cypress/issues/1143
   // https://github.com/cypress-io/cypress/issues/1745
+
+
   if (needsStderrPiped(needsXvfb)) {
     // returning pipe here so we can massage stderr
     // and remove garbage from Xlib and libuv
@@ -58,10 +67,8 @@ function getStdio(needsXvfb) {
 
 module.exports = {
   isGarbageLineWarning: isGarbageLineWarning,
-
   start: function start(args) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
     var needsXvfb = xvfb.isNeeded();
     var executable = state.getPathToExecutable(state.getBinaryDir());
 
@@ -69,16 +76,14 @@ module.exports = {
       executable = path.resolve(util.getEnv('CYPRESS_RUN_BINARY'));
     }
 
-    debug('needs to start own Xvfb?', needsXvfb);
-
-    // 1. Start arguments with "--" so Electron knows these are OUR
+    debug('needs to start own Xvfb?', needsXvfb); // 1. Start arguments with "--" so Electron knows these are OUR
     // arguments and does not try to sanitize them. Otherwise on Windows
     // an url in one of the arguments crashes it :(
     // https://github.com/cypress-io/cypress/issues/5466
-
     // 2. Always push cwd into the args
     // which additionally acts as a signal to the
     // binary that it was invoked through the NPM module
+
     args = ['--'].concat(args, '--cwd', process.cwd());
 
     _.defaults(options, {
@@ -90,7 +95,6 @@ module.exports = {
 
     var spawn = function spawn() {
       var overrides = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-
       return new Promise(function (resolve, reject) {
         _.defaults(overrides, {
           onStderrData: false,
@@ -102,33 +106,35 @@ module.exports = {
           // the launch cmd to be 'npm run dev'
           executable = 'node';
           args.unshift(path.resolve(__dirname, '..', '..', '..', 'scripts', 'start.js'));
-
           debug('in dev mode the args became %o', args);
         }
 
         var onStderrData = overrides.onStderrData,
             electronLogging = overrides.electronLogging;
-
         var envOverrides = util.getEnvOverrides(options);
+
         var electronArgs = _.clone(args);
+
         var node11WindowsFix = isPlatform('win32');
 
         if (!options.dev && verify.needsSandbox()) {
           // this is one of the Electron's command line switches
           // thus it needs to be before "--" separator
           electronArgs.unshift('--no-sandbox');
-        }
+        } // strip dev out of child process options
 
-        // strip dev out of child process options
-        var stdioOptions = _.pick(options, 'env', 'detached', 'stdio');
 
-        // figure out if we're going to be force enabling or disabling colors.
+        var stdioOptions = _.pick(options, 'env', 'detached', 'stdio'); // figure out if we're going to be force enabling or disabling colors.
         // also figure out whether we should force stdout and stderr into thinking
         // it is a tty as opposed to a pipe.
+
+
         stdioOptions.env = _.extend({}, stdioOptions.env, envOverrides);
 
         if (node11WindowsFix) {
-          stdioOptions = _.extend({}, stdioOptions, { windowsHide: false });
+          stdioOptions = _.extend({}, stdioOptions, {
+            windowsHide: false
+          });
         }
 
         if (electronLogging) {
@@ -143,16 +149,18 @@ module.exports = {
 
         debug('spawning Cypress with executable: %s', executable);
         debug('spawn args %o %o', electronArgs, _.omit(stdioOptions, 'env'));
-
         var child = cp.spawn(executable, electronArgs, stdioOptions);
 
         function resolveOn(event) {
           return function (code, signal) {
-            debug('child event fired %o', { event: event, code: code, signal: signal });
+            debug('child event fired %o', {
+              event: event,
+              code: code,
+              signal: signal
+            });
 
             if (code === null) {
               var errorObject = errors.errors.childProcessKilled(event, signal);
-
               return errors.getError(errorObject).then(reject);
             }
 
@@ -162,13 +170,12 @@ module.exports = {
 
         child.on('close', resolveOn('close'));
         child.on('exit', resolveOn('exit'));
-        child.on('error', reject);
-
-        // if stdio options is set to 'pipe', then
+        child.on('error', reject); // if stdio options is set to 'pipe', then
         //   we should set up pipes:
         //  process STDIN (read stream) => child STDIN (writeable)
         //  child STDOUT => process STDOUT
         //  child STDERR => process STDERR with additional filtering
+
         if (child.stdin) {
           debug('piping process STDIN into child STDIN');
           process.stdin.pipe(child.stdin);
@@ -177,38 +184,37 @@ module.exports = {
         if (child.stdout) {
           debug('piping child STDOUT to process STDOUT');
           child.stdout.pipe(process.stdout);
-        }
-
-        // if this is defined then we are manually piping for linux
+        } // if this is defined then we are manually piping for linux
         // to filter out the garbage
+
+
         if (child.stderr) {
           debug('piping child STDERR to process STDERR');
           child.stderr.on('data', function (data) {
-            var str = data.toString();
+            var str = data.toString(); // bail if this is warning line garbage
 
-            // bail if this is warning line garbage
             if (isGarbageLineWarning(str)) {
               return;
-            }
-
-            // if we have a callback and this explictly returns
+            } // if we have a callback and this explictly returns
             // false then bail
+
+
             if (onStderrData && onStderrData(str) === false) {
               return;
-            }
+            } // else pass it along!
+
 
-            // else pass it along!
             process.stderr.write(data);
           });
-        }
-
-        // https://github.com/cypress-io/cypress/issues/1841
+        } // https://github.com/cypress-io/cypress/issues/1841
         // https://github.com/cypress-io/cypress/issues/5241
         // In some versions of node, it will throw on windows
         // when you close the parent process after piping
         // into the child process. unpiping does not seem
         // to have any effect. so we're just catching the
         // error here and not doing anything.
+
+
         process.stdin.on('error', function (err) {
           if (['EPIPE', 'ENOTCONN'].includes(err.code)) {
             return;
@@ -224,14 +230,12 @@ module.exports = {
     };
 
     var spawnInXvfb = function spawnInXvfb() {
-      return xvfb.start().then(userFriendlySpawn).finally(xvfb.stop);
+      return xvfb.start().then(userFriendlySpawn)["finally"](xvfb.stop);
     };
 
     var userFriendlySpawn = function userFriendlySpawn(linuxWithDisplayEnv) {
       debug('spawning, should retry on display problem?', Boolean(linuxWithDisplayEnv));
-
-      var brokenGtkDisplay = void 0;
-
+      var brokenGtkDisplay;
       var overrides = {};
 
       if (linuxWithDisplayEnv) {
@@ -242,11 +246,11 @@ module.exports = {
             // then we know that's why cypress exited early
             if (util.isBrokenGtkDisplay(str)) {
               brokenGtkDisplay = true;
-            }
-
-            // we should attempt to always slurp up
+            } // we should attempt to always slurp up
             // the stderr logs unless we've explicitly
             // enabled the electron debug logging
+
+
             if (!debugElectron.enabled) {
               return false;
             }
@@ -257,26 +261,25 @@ module.exports = {
       return spawn(overrides).then(function (code) {
         if (code !== 0 && brokenGtkDisplay) {
           util.logBrokenGtkDisplayWarning();
-
           return spawnInXvfb();
         }
 
         return code;
-      })
-      // we can format and handle an error message from the code above
+      }) // we can format and handle an error message from the code above
       // prevent wrapping error again by using "known: undefined" filter
-      .catch({ known: undefined }, errors.throwFormErrorText(errors.errors.unexpected));
+      ["catch"]({
+        known: undefined
+      }, errors.throwFormErrorText(errors.errors.unexpected));
     };
 
     if (needsXvfb) {
       return spawnInXvfb();
-    }
-
-    // if we are on linux and there's already a DISPLAY
+    } // if we are on linux and there's already a DISPLAY
     // set, then we may need to rerun cypress after
     // spawning our own Xvfb server
-    var linuxWithDisplayEnv = util.isPossibleLinuxWithIncorrectDisplay();
 
+
+    var linuxWithDisplayEnv = util.isPossibleLinuxWithIncorrectDisplay();
     return userFriendlySpawn(linuxWithDisplayEnv);
   }
 };

package/lib/exec/versions.js

@@ -1,10 +1,13 @@
-'use strict';
+"use strict";
 
 var Promise = require('bluebird');
+
 var debug = require('debug')('cypress:cli');
+
 var path = require('path');
 
 var util = require('../util');
+
 var state = require('../tasks/state');
 
 var _require = require('../errors'),
@@ -12,19 +15,19 @@ var _require = require('../errors'),
     errors = _require.errors;
 
 var getVersions = function getVersions() {
-  return Promise.try(function () {
+  return Promise["try"](function () {
     if (util.getEnv('CYPRESS_RUN_BINARY')) {
       var envBinaryPath = path.resolve(util.getEnv('CYPRESS_RUN_BINARY'));
-
       return state.parseRealPlatformBinaryFolderAsync(envBinaryPath).then(function (envBinaryDir) {
         if (!envBinaryDir) {
           return throwFormErrorText(errors.CYPRESS_RUN_BINARY.notValid(envBinaryPath))();
         }
 
         debug('CYPRESS_RUN_BINARY has binaryDir:', envBinaryDir);
-
         return envBinaryDir;
-      }).catch({ code: 'ENOENT' }, function (err) {
+      })["catch"]({
+        code: 'ENOENT'
+      }, function (err) {
         return throwFormErrorText(errors.CYPRESS_RUN_BINARY.notValid(envBinaryPath))(err.message);
       });
     }
@@ -32,7 +35,7 @@ var getVersions = function getVersions() {
     return state.getBinaryDir();
   }).then(state.getBinaryPkgVersionAsync).then(function (binaryVersion) {
     return {
-      package: util.pkgVersion(),
+      "package": util.pkgVersion(),
       binary: binaryVersion || 'not installed'
     };
   });

package/lib/exec/xvfb.js

@@ -1,17 +1,28 @@
-'use strict';
+"use strict";
 
-var _templateObject = _taggedTemplateLiteral(['\n        DISPLAY environment variable is set to ', ' on Linux\n        Assuming this DISPLAY points at working X11 server,\n        Cypress will not spawn own Xvfb\n\n        NOTE: if the X11 server is NOT working, Cypress will exit without explanation,\n          see ', '\n        Solution: Unset the DISPLAY variable and try again:\n          DISPLAY= npx cypress run ...\n      '], ['\n        DISPLAY environment variable is set to ', ' on Linux\n        Assuming this DISPLAY points at working X11 server,\n        Cypress will not spawn own Xvfb\n\n        NOTE: if the X11 server is NOT working, Cypress will exit without explanation,\n          see ', '\n        Solution: Unset the DISPLAY variable and try again:\n          DISPLAY= npx cypress run ...\n      ']);
+function _templateObject() {
+  var data = _taggedTemplateLiteral(["\n        DISPLAY environment variable is set to ", " on Linux\n        Assuming this DISPLAY points at working X11 server,\n        Cypress will not spawn own Xvfb\n\n        NOTE: if the X11 server is NOT working, Cypress will exit without explanation,\n          see ", "\n        Solution: Unset the DISPLAY variable and try again:\n          DISPLAY= npx cypress run ...\n      "]);
 
-function _taggedTemplateLiteral(strings, raw) { return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+  _templateObject = function _templateObject() {
+    return data;
+  };
+
+  return data;
+}
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
 var os = require('os');
+
 var Promise = require('bluebird');
+
 var Xvfb = require('@cypress/xvfb');
 
 var _require = require('common-tags'),
     stripIndent = _require.stripIndent;
 
 var debug = require('debug')('cypress:cli');
+
 var debugXvfb = require('debug')('cypress:xvfb');
 
 var _require2 = require('../errors'),
@@ -21,7 +32,8 @@ var _require2 = require('../errors'),
 var util = require('../util');
 
 var xvfbOptions = {
-  timeout: 30000, // milliseconds
+  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'],
@@ -31,20 +43,19 @@ var xvfbOptions = {
     }
   }
 };
-
 var xvfb = Promise.promisifyAll(new Xvfb(xvfbOptions));
-
 module.exports = {
-  _debugXvfb: debugXvfb, // expose for testing
-
-  _xvfb: xvfb, // expose for testing
-
-  _xvfbOptions: xvfbOptions, // expose for testing
-
+  _debugXvfb: debugXvfb,
+  // expose for testing
+  _xvfb: xvfb,
+  // expose for testing
+  _xvfbOptions: xvfbOptions,
+  // expose for testing
   start: function start() {
     debug('Starting Xvfb');
-
-    return xvfb.startAsync().return(null).catch({ nonZeroExitCode: true }, throwFormErrorText(errors.nonZeroExitCodeXvfb)).catch(function (err) {
+    return xvfb.startAsync()["return"](null)["catch"]({
+      nonZeroExitCode: true
+    }, throwFormErrorText(errors.nonZeroExitCodeXvfb))["catch"](function (err) {
       if (err.known) {
         throw err;
       }
@@ -54,9 +65,7 @@ module.exports = {
   },
   stop: function stop() {
     debug('Stopping Xvfb');
-
-    return xvfb.stopAsync().return(null).catch(function () {
-      // noop
+    return xvfb.stopAsync()["return"](null)["catch"](function () {// noop
     });
   },
   isNeeded: function isNeeded() {
@@ -66,27 +75,20 @@ module.exports = {
 
     if (process.env.DISPLAY) {
       var issueUrl = util.getGitHubIssueUrl(4034);
-
-      var message = stripIndent(_templateObject, process.env.DISPLAY, issueUrl);
-
+      var message = stripIndent(_templateObject(), process.env.DISPLAY, issueUrl);
       debug(message);
-
       return false;
     }
 
     debug('undefined DISPLAY environment variable');
     debug('Cypress will spawn its own Xvfb');
-
     return true;
   },
-
-
   // async method, resolved with Boolean
   verify: function verify() {
-    return xvfb.startAsync().return(true).catch(function (err) {
+    return xvfb.startAsync()["return"](true)["catch"](function (err) {
       debug('Could not verify xvfb: %s', err.message);
-
       return false;
-    }).finally(xvfb.stopAsync);
+    })["finally"](xvfb.stopAsync);
   }
 };

package/lib/fs.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 var Promise = require('bluebird');
 

package/lib/logger.js

@@ -1,6 +1,7 @@
-'use strict';
+"use strict";
 
 var R = require('ramda');
+
 var chalk = require('chalk');
 
 var logs = [];
@@ -10,7 +11,7 @@ var logLevel = function logLevel() {
 };
 
 var error = function error() {
-  for (var _len = arguments.length, messages = Array(_len), _key = 0; _key < _len; _key++) {
+  for (var _len = arguments.length, messages = new Array(_len), _key = 0; _key < _len; _key++) {
     messages[_key] = arguments[_key];
   }
 
@@ -19,12 +20,12 @@ var error = function error() {
 };
 
 var warn = function warn() {
-  for (var _len2 = arguments.length, messages = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+  if (logLevel() === 'silent') return;
+
+  for (var _len2 = arguments.length, messages = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
     messages[_key2] = arguments[_key2];
   }
 
-  if (logLevel() === 'silent') return;
-
   logs.push(messages.join(' '));
   console.log(chalk.yellow.apply(chalk, messages)); // eslint-disable-line no-console
 };
@@ -32,21 +33,35 @@ var warn = function warn() {
 var log = function log() {
   var _console;
 
-  for (var _len3 = arguments.length, messages = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+  if (logLevel() === 'silent' || logLevel() === 'warn') return;
+
+  for (var _len3 = arguments.length, messages = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
     messages[_key3] = arguments[_key3];
   }
 
-  if (logLevel() === 'silent' || logLevel() === 'warn') return;
-
   logs.push(messages.join(' '));
+
   (_console = console).log.apply(_console, messages); // eslint-disable-line no-console
+
 };
 
-// splits long text into lines and calls log()
+var always = function always() {
+  var _console2;
+
+  for (var _len4 = arguments.length, messages = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+    messages[_key4] = arguments[_key4];
+  }
+
+  logs.push(messages.join(' '));
+
+  (_console2 = console).log.apply(_console2, 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
+
+
 var logLines = function logLines(text) {
   var lines = text.split('\n');
-
   R.forEach(log, lines);
 };
 
@@ -62,6 +77,7 @@ module.exports = {
   log: log,
   warn: warn,
   error: error,
+  always: always,
   logLines: logLines,
   print: print,
   reset: reset,

package/lib/tasks/cache.js

@@ -1,55 +1,61 @@
-'use strict';
+"use strict";
 
 var state = require('./state');
+
 var logger = require('../logger');
+
 var fs = require('../fs');
+
 var util = require('../util');
 
 var _require = require('path'),
     join = _require.join;
 
 var Table = require('cli-table3');
+
 var moment = require('moment');
+
 var chalk = require('chalk');
-var _ = require('lodash');
 
-// output colors for the table
+var _ = require('lodash'); // output colors for the table
+
+
 var colors = {
   titles: chalk.white,
   dates: chalk.cyan,
   values: chalk.green
+};
 
-  // TODO: rename this function
-};var path = function path() {
-  logger.log(state.getCacheDir());
-
+var logCachePath = function logCachePath() {
+  logger.always(state.getCacheDir());
   return undefined;
 };
 
 var clear = function clear() {
   return fs.removeAsync(state.getCacheDir());
 };
+/**
+ * Collects all cached versions, finds when each was used
+ * and prints a table with results to the terminal
+ */
+
 
 var list = function list() {
   return getCachedVersions().then(function (binaries) {
     var table = new Table({
       head: [colors.titles('version'), colors.titles('last used')]
     });
-
     binaries.forEach(function (binary) {
       var versionString = colors.values(binary.version);
       var lastUsed = binary.accessed ? colors.dates(binary.accessed) : 'unknown';
-
       return table.push([versionString, lastUsed]);
     });
-
-    logger.log(table.toString());
+    logger.always(table.toString());
   });
 };
 
 var getCachedVersions = function getCachedVersions() {
   var cacheDir = state.getCacheDir();
-
   return fs.readdirAsync(cacheDir).filter(util.isSemver).map(function (version) {
     return {
       version: version,
@@ -60,7 +66,6 @@ var getCachedVersions = function getCachedVersions() {
     // on the Cypress binary
     var binaryDir = state.getBinaryDir(binary.version);
     var executable = state.getPathToExecutable(binaryDir);
-
     return fs.statAsync(executable).then(function (stat) {
       var lastAccessedTime = _.get(stat, 'atime');
 
@@ -71,9 +76,7 @@ var getCachedVersions = function getCachedVersions() {
       }
 
       var accessed = moment(lastAccessedTime).fromNow();
-
       binary.accessed = accessed;
-
       return binary;
     }, function (e) {
       // could not find the binary or gets its stats
@@ -83,7 +86,7 @@ var getCachedVersions = function getCachedVersions() {
 };
 
 module.exports = {
-  path: path,
+  path: logCachePath,
   clear: clear,
   list: list,
   getCachedVersions: getCachedVersions