cypress 3.1.2 → 3.1.3

package/lib/exec/spawn.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var _ = require('lodash');
+var os = require('os');
 var cp = require('child_process');
 var path = require('path');
 var Promise = require('bluebird');
@@ -17,12 +18,16 @@ var _require = require('../errors'),
 var isXlibOrLibudevRe = /^(?:Xlib|libudev)/;
 var isHighSierraWarningRe = /\*\*\* WARNING/;
 
+function isPlatform(platform) {
+  return os.platform() === platform;
+}
+
 function needsStderrPiped(needsXvfb) {
-  return util.isPlatform('darwin') || needsXvfb && util.isPlatform('linux');
+  return isPlatform('darwin') || needsXvfb && isPlatform('linux');
 }
 
 function needsEverythingPipedDirectly() {
-  return util.isPlatform('win32');
+  return isPlatform('win32');
 }
 
 function getStdio(needsXvfb) {
@@ -75,6 +80,7 @@ module.exports = {
         }
 
         var overrides = util.getEnvOverrides();
+        var node11WindowsFix = isPlatform('win32');
 
         debug('spawning Cypress with executable: %s', executable);
         debug('spawn forcing env overrides %o', overrides);
@@ -88,6 +94,9 @@ module.exports = {
         // also figure out whether we should force stdout and stderr into thinking
         // it is a tty as opposed to a pipe.
         options.env = _.extend({}, options.env, overrides);
+        if (node11WindowsFix) {
+          options = _.extend({}, options, { windowsHide: false });
+        }
 
         var child = cp.spawn(executable, args, options);
 

package/lib/util.js

@@ -19,7 +19,6 @@ var _isInstalledGlobally = require('is-installed-globally');
 var pkg = require(path.join(__dirname, '..', 'package.json'));
 var logger = require('./logger');
 var debug = require('debug')('cypress:cli');
-var compareVersions = require('compare-versions');
 
 var getosAsync = Promise.promisify(getos);
 
@@ -71,8 +70,7 @@ var util = {
     .mapValues(function (value) {
       // stringify to 1 or 0
       return value ? '1' : '0';
-    }).extend(util.getNode11WindowsFix()) // the value has to be falsy, '0' as a string not good enoughs
-    .value();
+    }).value();
   },
   getForceTty: function getForceTty() {
     return {
@@ -81,13 +79,6 @@ var util = {
       FORCE_STDERR_TTY: util.isTty(process.stderr.fd)
     };
   },
-  getNode11WindowsFix: function getNode11WindowsFix() {
-    if (compareVersions(util.getNodeVersion(), 'v11') >= 0 && util.isPlatform('win32')) {
-      return {
-        windowsHide: false
-      };
-    }
-  },
   getEnvColors: function getEnvColors() {
     var sc = util.supportsColor();
 
@@ -97,12 +88,6 @@ var util = {
       MOCHA_COLORS: sc ? true : undefined
     };
   },
-  getNodeVersion: function getNodeVersion() {
-    return process.version;
-  },
-  isPlatform: function isPlatform(platform) {
-    return os.platform() === platform;
-  },
   isTty: function isTty(fd) {
     return tty.isatty(fd);
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "main": "index.js",
   "bin": {
     "cypress": "bin/cypress"
@@ -38,7 +38,6 @@
     "check-more-types": "2.24.0",
     "commander": "2.11.0",
     "common-tags": "1.4.0",
-    "compare-versions": "3.4.0",
     "debug": "3.1.0",
     "execa": "0.10.0",
     "executable": "4.1.1",

package/types/index.d.ts

@@ -1514,13 +1514,13 @@ declare namespace Cypress {
      *
      * @see https://on.cypress.io/wait
      */
-    wait(alias: string, options?: Partial<Loggable & Timeoutable>): Chainable<WaitXHR>
+    wait(alias: string, options?: Partial<Loggable & Timeoutable & TimeoutableXHR>): Chainable<WaitXHR>
     /**
      * Wait for list of XHR requests to complete.
      *
      * @see https://on.cypress.io/wait
      */
-    wait(alias: string[], options?: Partial<Loggable & Timeoutable>): Chainable<WaitXHR[]>
+    wait(alias: string[], options?: Partial<Loggable & Timeoutable & TimeoutableXHR>): Chainable<WaitXHR[]>
 
     /**
      * Get the window object of the page that is currently active.
@@ -1568,6 +1568,16 @@ declare namespace Cypress {
      *    })
      */
     wrap<E extends Node = HTMLElement>(element: E | JQuery<E>, options?: Partial<Loggable & Timeoutable>): Chainable<JQuery<E>>
+    /**
+     * Yield the element passed into `.wrap()` to the next command in the Cypress chain.
+     *
+     * @see https://on.cypress.io/wrap
+     * @example
+     *    cy.wrap(new Promise((resolve, reject) => {
+     *      setTimeout(resolve, 1000);
+     *    }).then(result => {})
+     */
+    wrap<F extends Promise<S>, S>(promise: F, options?: Partial<Loggable & Timeoutable>): Chainable<S>
     /**
      * Yields whatever is passed into `.wrap()` to the next command in the Cypress chain.
      *
@@ -1647,6 +1657,26 @@ declare namespace Cypress {
     timeout: number
   }
 
+  /**
+   * Options that control how long the Test Runner waits for an XHR request and response to succeed
+   */
+  interface TimeoutableXHR {
+    /**
+     * Time to wait for the request (ms)
+     *
+     * @default {@link Timeoutable#timeout}
+     * @see https://docs.cypress.io/guides/references/configuration.html#Timeouts
+     */
+    requestTimeout: number,
+    /**
+     * Time to wait for the response (ms)
+     *
+     * @default {@link Timeoutable#timeout}
+     * @see https://docs.cypress.io/guides/references/configuration.html#Timeouts
+     */
+    responseTimeout: number
+  }
+
   /**
    * Options to force an event, skipping Actionability check
    * @see https://docs.cypress.io/guides/core-concepts/interacting-with-elements.html#Actionability