feat: support test retries

.prettierignore

@@ -1 +1,2 @@
-**/*
+*
+!*.ts

cli/test/lib/build_spec.js

@@ -2,7 +2,7 @@ require('../spec_helper')
 
 const fs = require(`${lib}/fs`)
 const makeUserPackageFile = require('../../scripts/build')
-const snapshot = require('snap-shot-it')
+const snapshot = require('../support/snapshot')
 const la = require('lazy-ass')
 const is = require('check-more-types')
 const R = require('ramda')

cli/test/lib/cli_spec.js

@@ -9,7 +9,7 @@ const open = require(`${lib}/exec/open`)
 const state = require(`${lib}/tasks/state`)
 const verify = require(`${lib}/tasks/verify`)
 const install = require(`${lib}/tasks/install`)
-const snapshot = require('snap-shot-it')
+const snapshot = require('../support/snapshot')
 const execa = require('execa-wrap')
 
 describe('cli', () => {

cli/test/lib/cypress_spec.js

@@ -3,16 +3,25 @@ require('../spec_helper')
 const os = require('os')
 const path = require('path')
 const R = require('ramda')
-const snapshot = require('snap-shot-it')
+const snapshot = require('../support/snapshot')
 const Promise = require('bluebird')
 const tmp = Promise.promisifyAll(require('tmp'))
+const mockfs = require('mock-fs')
 
 const fs = require(`${lib}/fs`)
 const open = require(`${lib}/exec/open`)
 const run = require(`${lib}/exec/run`)
 const cypress = require(`${lib}/cypress`)
 
 describe('cypress', function () {
+  beforeEach(function () {
+    mockfs({})
+  })
+
+  afterEach(() => {
+    mockfs.restore()
+  })
+
   context('.open', function () {
     beforeEach(function () {
       sinon.stub(open, 'start').resolves()

cli/test/lib/errors_spec.js

@@ -1,7 +1,7 @@
 require('../spec_helper')
 
 const os = require('os')
-const snapshot = require('snap-shot-it')
+const snapshot = require('../support/snapshot')
 const { errors, formErrorText } = require(`${lib}/errors`)
 const util = require(`${lib}/util`)
 

cli/test/lib/exec/run_spec.js

@@ -1,6 +1,6 @@
 require('../../spec_helper')
 
-const snapshot = require('snap-shot-it')
+const snapshot = require('../../support/snapshot')
 
 const util = require(`${lib}/util`)
 const run = require(`${lib}/exec/run`)

cli/test/lib/tasks/cache_spec.js

@@ -6,7 +6,7 @@ const fs = require(`${lib}/fs`)
 const state = require(`${lib}/tasks/state`)
 const cache = require(`${lib}/tasks/cache`)
 const stdout = require('../../support/stdout')
-const snapshot = require('snap-shot-it')
+const snapshot = require('../../support/snapshot')
 
 describe('lib/tasks/cache', () => {
   beforeEach(() => {

cli/test/lib/tasks/download_spec.js

@@ -5,7 +5,7 @@ const la = require('lazy-ass')
 const is = require('check-more-types')
 const path = require('path')
 const nock = require('nock')
-const snapshot = require('snap-shot-it')
+const snapshot = require('../../support/snapshot')
 
 const fs = require(`${lib}/fs`)
 const logger = require(`${lib}/logger`)

cli/test/lib/tasks/install_spec.js

@@ -4,7 +4,7 @@ const path = require('path')
 const chalk = require('chalk')
 const Promise = require('bluebird')
 const mockfs = require('mock-fs')
-const snapshot = require('snap-shot-it')
+const snapshot = require('../../support/snapshot')
 
 const stdout = require('../../support/stdout')
 

cli/test/lib/tasks/state_spec.js

@@ -4,6 +4,7 @@ const os = require('os')
 const path = require('path')
 const Promise = require('bluebird')
 const proxyquire = require('proxyquire')
+const mockfs = require('mock-fs')
 
 const fs = require(`${lib}/fs`)
 const logger = require(`${lib}/logger`)
@@ -190,6 +191,12 @@ describe('lib/tasks/state', function () {
     })
   })
   context('.writeBinaryVerified', function () {
+    beforeEach(() => {
+      mockfs({})
+    })
+    afterEach(() => {
+      mockfs.restore()
+    })
     it('writes to binary state verified:true', function () {
       sinon.stub(fs, 'outputJsonAsync').resolves()
 

cli/test/lib/tasks/unzip_spec.js

@@ -2,7 +2,7 @@ require('../../spec_helper')
 
 const os = require('os')
 const path = require('path')
-const snapshot = require('snap-shot-it')
+const snapshot = require('../../support/snapshot')
 
 const fs = require(`${lib}/fs`)
 const util = require(`${lib}/util`)

cli/test/lib/tasks/verify_spec.js

@@ -3,7 +3,6 @@ require('../../spec_helper')
 const _ = require('lodash')
 const os = require('os')
 const mockfs = require('mock-fs')
-const _snapshot = require('snap-shot-it')
 const Promise = require('bluebird')
 const { stripIndent } = require('common-tags')
 
@@ -15,6 +14,7 @@ const verify = require(`${lib}/tasks/verify`)
 
 const Stdout = require('../../support/stdout')
 const normalize = require('../../support/normalize')
+const snapshot = require('../../support/snapshot')
 
 const packageVersion = '1.2.3'
 const cacheDir = '/cache/Cypress'
@@ -26,11 +26,6 @@ let spawnedProcess
 
 /* eslint-disable no-octal */
 
-const snapshot = (...args) => {
-  mockfs.restore()
-  _snapshot(...args)
-}
-
 context('lib/tasks/verify', () => {
   require('mocha-banner').register()
 
@@ -67,7 +62,6 @@ context('lib/tasks/verify', () => {
   })
 
   it('logs error and exits when no version of Cypress is installed', () => {
-    mockfs({})
 
     return verify
     .start()

cli/test/lib/util_spec.js

@@ -2,7 +2,7 @@ require('../spec_helper')
 
 const os = require('os')
 const tty = require('tty')
-const snapshot = require('snap-shot-it')
+const snapshot = require('../support/snapshot')
 const supportsColor = require('supports-color')
 const proxyquire = require('proxyquire')
 

cli/test/support/snapshot.js

@@ -0,0 +1,9 @@
+const _snapshot = require('snap-shot-it')
+const mockfs = require('mock-fs')
+
+const snapshot = (...args) => {
+  mockfs.restore()
+  _snapshot(...args)
+}
+
+module.exports = snapshot

cli/types/index.d.ts

@@ -4033,7 +4033,7 @@ declare namespace Cypress {
     name: string
     /** Override *name* for display purposes only */
     displayName: string
-    message: any[]
+    message: any[] | string
     /** Return an object that will be printed in the dev tools console */
     consoleProps(): ObjectLike
   }

packages/driver/package.json

@@ -21,6 +21,10 @@
     "@cypress/sinon-chai": "1.1.0",
     "@cypress/underscore.inflection": "1.0.1",
     "@cypress/unique-selector": "0.4.2",
+    "@types/chalk": "^2.2.0",
+    "@types/common-tags": "^1.8.0",
+    "@types/lodash": "^4.14.123",
+    "@types/mocha": "^5.2.6",
     "angular": "1.7.7",
     "backbone": "1.4.0",
     "basic-auth": "2.0.1",
@@ -35,7 +39,7 @@
     "clone": "2.1.2",
     "compression": "1.7.4",
     "cors": "2.8.5",
-    "debug": "2.6.9",
+    "debug": "^4.1.1",
     "errorhandler": "1.5.0",
     "eventemitter2": "4.1.2",
     "express": "4.16.4",
@@ -56,6 +60,7 @@
     "parse-domain": "2.0.0",
     "setimmediate": "1.0.5",
     "sinon": "3.3.0",
+    "snap-shot-core": "^7.4.0",
     "text-mask-addons": "3.8.0",
     "underscore": "1.9.1",
     "underscore.string": "3.3.5",

packages/driver/src/cy/aliases.coffee

@@ -32,15 +32,15 @@ validateAlias = (alias) ->
   if alias in blacklist
     $utils.throwErrByPath "as.reserved_word", { args: { alias } }
 
-create = (state) ->
+create = (getRemotejQueryInstance, state) ->
   addAlias = (ctx, aliasObj) ->
     { alias, subject } = aliasObj
 
     aliases = state("aliases") ? {}
     aliases[alias] = aliasObj
     state("aliases", aliases)
 
-    remoteSubject = cy.getRemotejQueryInstance(subject)
+    remoteSubject = getRemotejQueryInstance(subject)
 
     ## assign the subject to our runnable ctx
     ctx[alias] = remoteSubject ? subject

packages/driver/src/cy/assertions.coffee

@@ -56,7 +56,7 @@ parseValueActualAndExpected = (value, actual, expected) ->
 
   obj
 
-create = (state, queue, retryFn) ->
+create = (Cypress, state, queue, retryFn) ->
   getUpcomingAssertions = ->
     current = state("current")
     index   = state("index") + 1