cypress 5.4.0 → 5.5.0

package/lib/tasks/state.js

@@ -1,21 +1,21 @@
 "use strict";
 
-var _ = require('lodash');
+const _ = require('lodash');
 
-var os = require('os');
+const os = require('os');
 
-var path = require('path');
+const path = require('path');
 
-var untildify = require('untildify');
+const untildify = require('untildify');
 
-var debug = require('debug')('cypress:cli');
+const debug = require('debug')('cypress:cli');
 
-var fs = require('../fs');
+const fs = require('../fs');
 
-var util = require('../util');
+const util = require('../util');
 
-var getPlatformExecutable = function getPlatformExecutable() {
-  var platform = os.platform();
+const getPlatformExecutable = () => {
+  const platform = os.platform();
 
   switch (platform) {
     case 'darwin':
@@ -29,12 +29,12 @@ var getPlatformExecutable = function getPlatformExecutable() {
     // TODO handle this error using our standard
 
     default:
-      throw new Error("Platform: \"".concat(platform, "\" is not supported."));
+      throw new Error(`Platform: "${platform}" is not supported.`);
   }
 };
 
-var getPlatFormBinaryFolder = function getPlatFormBinaryFolder() {
-  var platform = os.platform();
+const getPlatFormBinaryFolder = () => {
+  const platform = os.platform();
 
   switch (platform) {
     case 'darwin':
@@ -48,12 +48,12 @@ var getPlatFormBinaryFolder = function getPlatFormBinaryFolder() {
     // TODO handle this error using our standard
 
     default:
-      throw new Error("Platform: \"".concat(platform, "\" is not supported."));
+      throw new Error(`Platform: "${platform}" is not supported.`);
   }
 };
 
-var getBinaryPkgPath = function getBinaryPkgPath(binaryDir) {
-  var platform = os.platform();
+const getBinaryPkgPath = binaryDir => {
+  const platform = os.platform();
 
   switch (platform) {
     case 'darwin':
@@ -67,7 +67,7 @@ var getBinaryPkgPath = function getBinaryPkgPath(binaryDir) {
     // TODO handle this error using our standard
 
     default:
-      throw new Error("Platform: \"".concat(platform, "\" is not supported."));
+      throw new Error(`Platform: "${platform}" is not supported.`);
   }
 };
 /**
@@ -75,13 +75,11 @@ var getBinaryPkgPath = function getBinaryPkgPath(binaryDir) {
 */
 
 
-var getBinaryDir = function getBinaryDir() {
-  var version = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : util.pkgVersion();
+const getBinaryDir = (version = util.pkgVersion()) => {
   return path.join(getVersionDir(version), getPlatFormBinaryFolder());
 };
 
-var getVersionDir = function getVersionDir() {
-  var version = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : util.pkgVersion();
+const getVersionDir = (version = util.pkgVersion()) => {
   return path.join(getCacheDir(), version);
 };
 /**
@@ -90,22 +88,22 @@ var getVersionDir = function getVersionDir() {
  */
 
 
-var isInstallingFromPostinstallHook = function isInstallingFromPostinstallHook() {
+const isInstallingFromPostinstallHook = () => {
   // individual folders
-  var cwdFolders = process.cwd().split(path.sep);
-  var length = cwdFolders.length;
+  const cwdFolders = process.cwd().split(path.sep);
+  const length = cwdFolders.length;
   return cwdFolders[length - 2] === 'node_modules' && cwdFolders[length - 1] === 'cypress';
 };
 
-var getCacheDir = function getCacheDir() {
-  var cache_directory = util.getCacheDir();
+const getCacheDir = () => {
+  let cache_directory = util.getCacheDir();
 
   if (util.getEnv('CYPRESS_CACHE_FOLDER')) {
-    var envVarCacheDir = untildify(util.getEnv('CYPRESS_CACHE_FOLDER'));
+    const envVarCacheDir = untildify(util.getEnv('CYPRESS_CACHE_FOLDER'));
     debug('using environment variable CYPRESS_CACHE_FOLDER %s', envVarCacheDir);
 
     if (!path.isAbsolute(envVarCacheDir) && isInstallingFromPostinstallHook()) {
-      var packageRootFolder = path.join('..', '..', envVarCacheDir);
+      const packageRootFolder = path.join('..', '..', envVarCacheDir);
       cache_directory = path.resolve(packageRootFolder);
       debug('installing from postinstall hook, original root folder is %s', packageRootFolder);
       debug('and resolved cache directory is %s', cache_directory);
@@ -117,8 +115,8 @@ var getCacheDir = function getCacheDir() {
   return cache_directory;
 };
 
-var parseRealPlatformBinaryFolderAsync = function parseRealPlatformBinaryFolderAsync(binaryPath) {
-  return fs.realpathAsync(binaryPath).then(function (realPath) {
+const parseRealPlatformBinaryFolderAsync = binaryPath => {
+  return fs.realpathAsync(binaryPath).then(realPath => {
     debug('CYPRESS_RUN_BINARY has realpath:', realPath);
 
     if (!realPath.toString().endsWith(getPlatformExecutable())) {
@@ -133,7 +131,7 @@ var parseRealPlatformBinaryFolderAsync = function parseRealPlatformBinaryFolderA
   });
 };
 
-var getDistDir = function getDistDir() {
+const getDistDir = () => {
   return path.join(__dirname, '..', '..', 'dist');
 };
 /**
@@ -143,25 +141,25 @@ var getDistDir = function getDistDir() {
  */
 
 
-var getBinaryStatePath = function getBinaryStatePath(binaryDir) {
+const getBinaryStatePath = binaryDir => {
   return path.join(binaryDir, '..', 'binary_state.json');
 };
 
-var getBinaryStateContentsAsync = function getBinaryStateContentsAsync(binaryDir) {
-  var fullPath = getBinaryStatePath(binaryDir);
-  return fs.readJsonAsync(fullPath)["catch"]({
+const getBinaryStateContentsAsync = binaryDir => {
+  const fullPath = getBinaryStatePath(binaryDir);
+  return fs.readJsonAsync(fullPath).catch({
     code: 'ENOENT'
-  }, SyntaxError, function () {
+  }, SyntaxError, () => {
     debug('could not read binary_state.json file at "%s"', fullPath);
     return {};
   });
 };
 
-var getBinaryVerifiedAsync = function getBinaryVerifiedAsync(binaryDir) {
+const getBinaryVerifiedAsync = binaryDir => {
   return getBinaryStateContentsAsync(binaryDir).tap(debug).get('verified');
 };
 
-var clearBinaryStateAsync = function clearBinaryStateAsync(binaryDir) {
+const clearBinaryStateAsync = binaryDir => {
   return fs.removeAsync(getBinaryStatePath(binaryDir));
 };
 /**
@@ -172,24 +170,24 @@ var clearBinaryStateAsync = function clearBinaryStateAsync(binaryDir) {
  */
 
 
-var writeBinaryVerifiedAsync = function writeBinaryVerifiedAsync(verified, binaryDir) {
-  return getBinaryStateContentsAsync(binaryDir).then(function (contents) {
+const writeBinaryVerifiedAsync = (verified, binaryDir) => {
+  return getBinaryStateContentsAsync(binaryDir).then(contents => {
     return fs.outputJsonAsync(getBinaryStatePath(binaryDir), _.extend(contents, {
-      verified: verified
+      verified
     }), {
       spaces: 2
     });
   });
 };
 
-var getPathToExecutable = function getPathToExecutable(binaryDir) {
+const getPathToExecutable = binaryDir => {
   return path.join(binaryDir, getPlatformExecutable());
 };
 
-var getBinaryPkgVersionAsync = function getBinaryPkgVersionAsync(binaryDir) {
-  var pathToPackageJson = getBinaryPkgPath(binaryDir);
+const getBinaryPkgVersionAsync = binaryDir => {
+  const pathToPackageJson = getBinaryPkgPath(binaryDir);
   debug('Reading binary package.json from:', pathToPackageJson);
-  return fs.pathExistsAsync(pathToPackageJson).then(function (exists) {
+  return fs.pathExistsAsync(pathToPackageJson).then(exists => {
     if (!exists) {
       return null;
     }
@@ -199,16 +197,16 @@ var getBinaryPkgVersionAsync = function getBinaryPkgVersionAsync(binaryDir) {
 };
 
 module.exports = {
-  getPathToExecutable: getPathToExecutable,
-  getPlatformExecutable: getPlatformExecutable,
-  getBinaryPkgVersionAsync: getBinaryPkgVersionAsync,
-  getBinaryVerifiedAsync: getBinaryVerifiedAsync,
-  getBinaryPkgPath: getBinaryPkgPath,
-  getBinaryDir: getBinaryDir,
-  getCacheDir: getCacheDir,
-  clearBinaryStateAsync: clearBinaryStateAsync,
-  writeBinaryVerifiedAsync: writeBinaryVerifiedAsync,
-  parseRealPlatformBinaryFolderAsync: parseRealPlatformBinaryFolderAsync,
-  getDistDir: getDistDir,
-  getVersionDir: getVersionDir
+  getPathToExecutable,
+  getPlatformExecutable,
+  getBinaryPkgVersionAsync,
+  getBinaryVerifiedAsync,
+  getBinaryPkgPath,
+  getBinaryDir,
+  getCacheDir,
+  clearBinaryStateAsync,
+  writeBinaryVerifiedAsync,
+  parseRealPlatformBinaryFolderAsync,
+  getDistDir,
+  getVersionDir
 };

package/lib/tasks/unzip.js

@@ -1,41 +1,43 @@
 "use strict";
 
-var _ = require('lodash');
+const _ = require('lodash');
 
-var la = require('lazy-ass');
+const la = require('lazy-ass');
 
-var is = require('check-more-types');
+const is = require('check-more-types');
 
-var cp = require('child_process');
+const cp = require('child_process');
 
-var os = require('os');
+const os = require('os');
 
-var yauzl = require('yauzl');
+const yauzl = require('yauzl');
 
-var debug = require('debug')('cypress:cli:unzip');
+const debug = require('debug')('cypress:cli:unzip');
 
-var extract = require('extract-zip');
+const extract = require('extract-zip');
 
-var Promise = require('bluebird');
+const Promise = require('bluebird');
 
-var readline = require('readline');
+const readline = require('readline');
 
-var _require = require('../errors'),
-    throwFormErrorText = _require.throwFormErrorText,
-    errors = _require.errors;
+const {
+  throwFormErrorText,
+  errors
+} = require('../errors');
 
-var fs = require('../fs');
+const fs = require('../fs');
 
-var util = require('../util');
+const util = require('../util');
 
-var unzipTools = {
-  extract: extract
+const unzipTools = {
+  extract
 }; // expose this function for simple testing
 
-var unzip = function unzip(_ref) {
-  var zipFilePath = _ref.zipFilePath,
-      installDir = _ref.installDir,
-      progress = _ref.progress;
+const unzip = ({
+  zipFilePath,
+  installDir,
+  progress
+}) => {
   debug('unzipping from %s', zipFilePath);
   debug('into', installDir);
 
@@ -43,11 +45,11 @@ var unzip = function unzip(_ref) {
     throw new Error('Missing zip filename');
   }
 
-  var startTime = Date.now();
-  var yauzlDoneTime = 0;
-  return fs.ensureDirAsync(installDir).then(function () {
-    return new Promise(function (resolve, reject) {
-      return yauzl.open(zipFilePath, function (err, zipFile) {
+  const startTime = Date.now();
+  let yauzlDoneTime = 0;
+  return fs.ensureDirAsync(installDir).then(() => {
+    return new Promise((resolve, reject) => {
+      return yauzl.open(zipFilePath, (err, zipFile) => {
         yauzlDoneTime = Date.now();
 
         if (err) {
@@ -55,29 +57,29 @@ var unzip = function unzip(_ref) {
           return reject(err);
         }
 
-        var total = zipFile.entryCount;
+        const total = zipFile.entryCount;
         debug('zipFile entries count', total);
-        var started = new Date();
-        var percent = 0;
-        var count = 0;
+        const started = new Date();
+        let percent = 0;
+        let count = 0;
 
-        var notify = function notify(percent) {
-          var elapsed = +new Date() - +started;
-          var eta = util.calculateEta(percent, elapsed);
+        const notify = percent => {
+          const elapsed = +new Date() - +started;
+          const eta = util.calculateEta(percent, elapsed);
           progress.onProgress(percent, util.secsRemaining(eta));
         };
 
-        var tick = function tick() {
+        const tick = () => {
           count += 1;
           percent = count / total * 100;
-          var displayPercent = percent.toFixed(0);
+          const displayPercent = percent.toFixed(0);
           return notify(displayPercent);
         };
 
-        var unzipWithNode = function unzipWithNode() {
+        const unzipWithNode = () => {
           debug('unzipping with node.js (slow)');
 
-          var endFn = function endFn(err) {
+          const endFn = err => {
             if (err) {
               debug('error %s', err.message);
               return reject(err);
@@ -87,7 +89,7 @@ var unzip = function unzip(_ref) {
             return resolve();
           };
 
-          var opts = {
+          const opts = {
             dir: installDir,
             onEntry: tick
           };
@@ -95,17 +97,17 @@ var unzip = function unzip(_ref) {
           return unzipTools.extract(zipFilePath, opts, endFn);
         };
 
-        var unzipFallback = _.once(unzipWithNode);
+        const unzipFallback = _.once(unzipWithNode);
 
-        var unzipWithUnzipTool = function unzipWithUnzipTool() {
+        const unzipWithUnzipTool = () => {
           debug('unzipping via `unzip`');
-          var inflatingRe = /inflating:/;
-          var sp = cp.spawn('unzip', ['-o', zipFilePath, '-d', installDir]);
-          sp.on('error', function (err) {
+          const inflatingRe = /inflating:/;
+          const sp = cp.spawn('unzip', ['-o', zipFilePath, '-d', installDir]);
+          sp.on('error', err => {
             debug('unzip tool error: %s', err.message);
             unzipFallback();
           });
-          sp.on('close', function (code) {
+          sp.on('close', code => {
             debug('unzip tool close with code %d', code);
 
             if (code === 0) {
@@ -115,16 +117,16 @@ var unzip = function unzip(_ref) {
             }
 
             debug('`unzip` failed %o', {
-              code: code
+              code
             });
             return unzipFallback();
           });
-          sp.stdout.on('data', function (data) {
+          sp.stdout.on('data', data => {
             if (inflatingRe.test(data)) {
               return tick();
             }
           });
-          sp.stderr.on('data', function (data) {
+          sp.stderr.on('data', data => {
             debug('`unzip` stderr %s', data);
           });
         }; // we attempt to first unzip with the native osx
@@ -134,16 +136,16 @@ var unzip = function unzip(_ref) {
         // http://automatica.com.au/2011/02/unzip-mac-os-x-zip-in-terminal/
 
 
-        var unzipWithOsx = function unzipWithOsx() {
+        const unzipWithOsx = () => {
           debug('unzipping via `ditto`');
-          var copyingFileRe = /^copying file/;
-          var sp = cp.spawn('ditto', ['-xkV', zipFilePath, installDir]); // f-it just unzip with node
+          const copyingFileRe = /^copying file/;
+          const sp = cp.spawn('ditto', ['-xkV', zipFilePath, installDir]); // f-it just unzip with node
 
-          sp.on('error', function (err) {
+          sp.on('error', err => {
             debug(err.message);
             unzipFallback();
           });
-          sp.on('close', function (code) {
+          sp.on('close', code => {
             if (code === 0) {
               // make sure we get to 100% on the progress bar
               // because reading in lines is not really accurate
@@ -153,13 +155,13 @@ var unzip = function unzip(_ref) {
             }
 
             debug('`ditto` failed %o', {
-              code: code
+              code
             });
             return unzipFallback();
           });
           return readline.createInterface({
             input: sp.stderr
-          }).on('line', function (line) {
+          }).on('line', line => {
             if (copyingFileRe.test(line)) {
               return tick();
             }
@@ -180,7 +182,7 @@ var unzip = function unzip(_ref) {
             return;
         }
       });
-    }).tap(function () {
+    }).tap(() => {
       debug('unzip completed %o', {
         yauzlMs: yauzlDoneTime - startTime,
         unzipMs: Date.now() - yauzlDoneTime
@@ -189,38 +191,39 @@ var unzip = function unzip(_ref) {
   });
 };
 
-var start = function start(_ref2) {
-  var zipFilePath = _ref2.zipFilePath,
-      installDir = _ref2.installDir,
-      progress = _ref2.progress;
+const start = ({
+  zipFilePath,
+  installDir,
+  progress
+}) => {
   la(is.unemptyString(installDir), 'missing installDir');
 
   if (!progress) {
     progress = {
-      onProgress: function onProgress() {
+      onProgress: () => {
         return {};
       }
     };
   }
 
-  return fs.pathExists(installDir).then(function (exists) {
+  return fs.pathExists(installDir).then(exists => {
     if (exists) {
       debug('removing existing unzipped binary', installDir);
       return fs.removeAsync(installDir);
     }
-  }).then(function () {
+  }).then(() => {
     return unzip({
-      zipFilePath: zipFilePath,
-      installDir: installDir,
-      progress: progress
+      zipFilePath,
+      installDir,
+      progress
     });
-  })["catch"](throwFormErrorText(errors.failedUnzip));
+  }).catch(throwFormErrorText(errors.failedUnzip));
 };
 
 module.exports = {
-  start: start,
+  start,
   utils: {
-    unzip: unzip,
-    unzipTools: unzipTools
+    unzip,
+    unzipTools
   }
 };