isolated runner changes

packages/driver/package.json

@@ -56,6 +56,7 @@
     "parse-domain": "bahmutov/parse-domain#fb60bd4",
     "setimmediate": "1.0.5",
     "sinon": "8.1.1",
+    "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,27 +32,27 @@ validateAlias = (alias) ->
   if alias in blacklist
     $errUtils.throwErrByPath "as.reserved_word", { args: { alias } }
 
-create = (state) ->
+create = (cy) ->
   addAlias = (ctx, aliasObj) ->
     { alias, subject } = aliasObj
 
-    aliases = state("aliases") ? {}
+    aliases = cy.state("aliases") ? {}
     aliases[alias] = aliasObj
-    state("aliases", aliases)
+    cy.state("aliases", aliases)
 
     remoteSubject = cy.getRemotejQueryInstance(subject)
 
     ## assign the subject to our runnable ctx
     ctx[alias] = remoteSubject ? subject
 
   getNextAlias = ->
-    next = state("current").get("next")
+    next = cy.state("current").get("next")
 
     if next and next.get("name") is "as"
       next.get("args")[0]
 
   getAlias = (name, cmd, log) ->
-    aliases = state("aliases") ? {}
+    aliases = cy.state("aliases") ? {}
 
     ## bail if the name doesnt reference an alias
     return if not aliasRe.test(name)
@@ -64,7 +64,7 @@ create = (state) ->
     return alias
 
   getAvailableAliases = ->
-    return [] if not aliases = state("aliases")
+    return [] if not aliases = cy.state("aliases")
 
     _.keys(aliases)
 
@@ -80,7 +80,7 @@ create = (state) ->
         args: { name, displayName }
       }
 
-    cmd ?= log and log.get("name") or state("current").get("name")
+    cmd ?= log and log.get("name") or cy.state("current").get("name")
     displayName = aliasDisplayName(name)
 
     errPath = if availableAliases.length

packages/driver/src/cy/assertions.js

@@ -1,4 +1,3 @@
-/* global cy Cypress */
 const _ = require('lodash')
 const Promise = require('bluebird')
 
@@ -70,14 +69,14 @@ const parseValueActualAndExpected = (value, actual, expected) => {
   return obj
 }
 
-const create = function (state, queue, retryFn) {
+const create = function (Cypress, cy) {
   const getUpcomingAssertions = () => {
-    const index = state('index') + 1
+    const index = cy.state('index') + 1
 
     const assertions = []
 
     // grab the rest of the queue'd commands
-    for (let cmd of queue.slice(index).get()) {
+    for (let cmd of cy.queue.slice(index).get()) {
       // don't break on utilities, just skip over them
       if (cmd.is('utility')) {
         continue
@@ -112,7 +111,7 @@ const create = function (state, queue, retryFn) {
       cmd.set('assertionIndex', 0)
 
       return cmd.get('fn').originalFn.apply(
-        state('ctx'),
+        cy.state('ctx'),
         [subject].concat(cmd.get('args')),
       )
     })
@@ -135,7 +134,7 @@ const create = function (state, queue, retryFn) {
   const verifyUpcomingAssertions = function (subject, options = {}, callbacks = {}) {
     const cmds = getUpcomingAssertions()
 
-    state('upcomingAssertions', cmds)
+    cy.state('upcomingAssertions', cmds)
 
     // we're applying the default assertion in the
     // case where there are no upcoming assertion commands
@@ -228,7 +227,7 @@ const create = function (state, queue, retryFn) {
       }
 
       if (_.isFunction(onRetry)) {
-        return retryFn(onRetry, options)
+        return cy.retry(onRetry, options)
       }
     }
 
@@ -258,7 +257,7 @@ const create = function (state, queue, retryFn) {
         }
 
         // when we do immediately unbind this function
-        state('onBeforeLog', null)
+        cy.state('onBeforeLog', null)
 
         const insertNewLog = (log) => {
           cmd.log(log)
@@ -341,7 +340,7 @@ const create = function (state, queue, retryFn) {
         return insertNewLog(log)
       }
 
-      state('onBeforeLog', setCommandLog)
+      cy.state('onBeforeLog', setCommandLog)
 
       // send verify=true as the last arg
       return assertFn.apply(this, args.concat(true))
@@ -381,16 +380,16 @@ const create = function (state, queue, retryFn) {
     }
 
     const restore = () => {
-      state('upcomingAssertions', [])
+      cy.state('upcomingAssertions', [])
 
       // no matter what we need to
       // restore the assert fn
-      return state('overrideAssert', undefined)
+      return cy.state('overrideAssert', undefined)
     }
 
     // store this in case our test ends early
     // and we reset between tests
-    state('overrideAssert', overrideAssert)
+    cy.state('overrideAssert', overrideAssert)
 
     return Promise
     .reduce(fns, assertions, [subject])
@@ -459,7 +458,7 @@ const create = function (state, queue, retryFn) {
         // if our current command is an assertion type
         isAssertionType(current) ||
         // are we currently verifying assertions?
-        (state('upcomingAssertions') && state('upcomingAssertions').length > 0) ||
+        (cy.state('upcomingAssertions') && cy.state('upcomingAssertions').length > 0) ||
         // did the function have arguments
         functionHadArguments(current)
     }
@@ -503,7 +502,7 @@ const create = function (state, queue, retryFn) {
   const assert = function (...args) {
     // if we've temporarily overriden assertions
     // then just bail early with this function
-    const fn = state('overrideAssert') || assertFn
+    const fn = cy.state('overrideAssert') || assertFn
 
     return fn.apply(this, args)
   }

packages/driver/src/cy/commands/agents.coffee

@@ -50,7 +50,7 @@ onInvoke = (Cypress, obj, args) ->
     error:    obj.error
     type:     "parent"
     end:      true
-    snapshot: true
+    snapshot: !agent._noSnapshot
     event:    true
     consoleProps: ->
       consoleObj = {}
@@ -187,6 +187,12 @@ module.exports = (Commands, Cypress, cy, state, config) ->
 
       return agent
 
+    ## disable DOM snapshots during log for this agent
+    agent.snapshot = (bool = true) ->
+      agent._noSnapshot = !bool
+
+      return agent
+
     agent.as = (alias) ->
       cy.validateAlias(alias)
       cy.addAlias(ctx, {

packages/driver/src/cy/commands/navigation.coffee

@@ -98,7 +98,7 @@ specifyFileByRelativePath = (url, log) ->
     }
   })
 
-aboutBlank = (win) ->
+aboutBlank = (cy, win) ->
   new Promise (resolve) ->
     cy.once("window:load", resolve)
 
@@ -173,7 +173,7 @@ formSubmitted = (Cypress, e) ->
     }
   })
 
-pageLoading = (bool, state) ->
+pageLoading = (bool, Cypress, state) ->
   return if state("pageLoading") is bool
 
   state("pageLoading", bool)
@@ -187,15 +187,15 @@ stabilityChanged = (Cypress, state, config, stable, event) ->
       ## if we're currently visiting about blank
       ## and becoming unstable for the first time
       ## notifiy that we're page loading
-      pageLoading(true, state)
+      pageLoading(true, Cypress, state)
       return
     else
       ## else wait until after we finish visiting
       ## about blank
       return
 
   ## let the world know that the app is page:loading
-  pageLoading(!stable, state)
+  pageLoading(!stable, Cypress, state)
 
   ## if we aren't becoming unstable
   ## then just return now
@@ -825,7 +825,7 @@ module.exports = (Commands, Cypress, cy, state, config) ->
           hasVisitedAboutBlank = true
           currentlyVisitingAboutBlank = true
 
-          aboutBlank(win)
+          aboutBlank(cy, win)
           .then ->
             currentlyVisitingAboutBlank = false
 

packages/driver/src/cypress/cy.js

@@ -5,6 +5,7 @@ const Promise = require('bluebird')
 
 const $dom = require('../dom')
 const $utils = require('./utils')
+const $selection = require('../dom/selection')
 const $errUtils = require('./error_utils')
 const $Chai = require('../cy/chai')
 const $Xhrs = require('../cy/xhrs')
@@ -24,7 +25,6 @@ const $Timers = require('../cy/timers')
 const $Timeouts = require('../cy/timeouts')
 const $Retries = require('../cy/retries')
 const $Stability = require('../cy/stability')
-const $selection = require('../dom/selection')
 const $Snapshots = require('../cy/snapshots')
 const $CommandQueue = require('./command_queue')
 const $VideoRecorder = require('../cy/video-recorder')
@@ -72,25 +72,31 @@ const setTopOnError = function (cy) {
 
   curCy = cy
 
-  const onTopError = function () {
-    return curCy.onUncaughtException.apply(curCy, arguments)
-  }
+  // prevent overriding top.onerror twice when loading more than one
+  // instance of test runner.
+  if (!top.__cypress__onerror) {
+    top.__cypress__onerror = true
+    const onTopError = function () {
+      return curCy.onUncaughtException.apply(curCy, arguments)
+    }
 
-  top.onerror = onTopError
+    top.onerror = onTopError
 
-  // Prevent Mocha from setting top.onerror which would override our handler
-  // Since the setter will change which event handler gets invoked, we make it a noop
-  return Object.defineProperty(top, 'onerror', {
-    set () {},
-    get () {
-      return onTopError
-    },
-    configurable: false,
-    enumerable: true,
-  })
+    // Prevent Mocha from setting top.onerror which would override our handler
+    // Since the setter will change which event handler gets invoked, we make it a noop
+    return Object.defineProperty(top, 'onerror', {
+      set () {},
+      get () {
+        return onTopError
+      },
+      configurable: false,
+      enumerable: true,
+    })
+  }
 }
 
 const create = function (specWindow, Cypress, Cookies, state, config, log) {
+  let cy = {}
   let stopped = false
   const commandFns = {}
 
@@ -124,7 +130,7 @@ const create = function (specWindow, Cypress, Cookies, state, config, log) {
   const timeouts = $Timeouts.create(state)
   const stability = $Stability.create(Cypress, state)
   const retries = $Retries.create(Cypress, state, timeouts.timeout, timeouts.clearTimeout, stability.whenStable, onFinishAssertions)
-  const assertions = $Assertions.create(state, queue, retries.retry)
+  const assertions = $Assertions.create(Cypress, cy)
 
   const jquery = $jQuery.create(state)
   const location = $Location.create(state)
@@ -136,7 +142,7 @@ const create = function (specWindow, Cypress, Cookies, state, config, log) {
   const { expect } = $Chai.create(specWindow, assertions.assert)
 
   const xhrs = $Xhrs.create(state)
-  const aliases = $Aliases.create(state)
+  const aliases = $Aliases.create(cy)
 
   const errors = $Errors.create(state, config, log)
   const ensures = $Ensures.create(state, expect)
@@ -734,7 +740,7 @@ const create = function (specWindow, Cypress, Cookies, state, config, log) {
     return finish(err)
   }
 
-  const cy = {
+  _.extend(cy, {
     id: _.uniqueId('cy'),
 
     // synchrounous querying
@@ -1328,7 +1334,7 @@ const create = function (specWindow, Cypress, Cookies, state, config, log) {
         }
       }
     },
-  }
+  })
 
   _.each(privateProps, (obj, key) => {
     return Object.defineProperty(cy, key, {