cypress-io · emilyrohrbough · Nov 9, 2021 · Oct 20, 2021 · Oct 20, 2021 · Oct 20, 2021
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "main": "lib/index.js",
   "scripts": {
-    "build-prod": "sc --project .",
+    "build-prod": "tsc --project .",
     "clean": "rm lib/options.js",
     "test": "yarn test-unit",
     "test-debug": "yarn test-unit --inspect-brk=5566",

diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json
@@ -1,10 +1,6 @@
 {
   "extends": "../ts/tsconfig.json",
-  "compilerOptions": {
-    "allowJs": true,
-    "outDir": "./lib",
-  },
   "include": [
-    "src/*",
+    "lib/*",
   ],
 }
diff --git a/packages/driver/cypress/integration/commands/navigation_spec.js b/packages/driver/cypress/integration/commands/navigation_spec.js
@@ -693,7 +693,7 @@ describe('src/cy/commands/navigation', () => {
     })
 
     it('does not support file:// protocol', {
-      baseUrl: '',
+      baseUrl: null,
     }, (done) => {
       cy.on('fail', (err) => {
         expect(err.message).to.contain('`cy.visit()` failed because the \'file://...\' protocol is not supported by Cypress.')
@@ -1438,7 +1438,7 @@ describe('src/cy/commands/navigation', () => {
         cy.visit('http://google.com:3500/fixtures/generic.html')
       })
 
-      it('throws attemping to visit 2 unique ip addresses', function (done) {
+      it('throws attempting to visit 2 unique ip addresses', function (done) {
         const $autIframe = cy.state('$autIframe')
 
         const load = () => {

diff --git a/packages/driver/cypress/integration/commands/request_spec.js b/packages/driver/cypress/integration/commands/request_spec.js
@@ -820,7 +820,7 @@ describe('src/cy/commands/request', () => {
       })
 
       it('throws when url is not FQDN', {
-        baseUrl: '',
+        baseUrl: null,
       }, function (done) {
         cy.stub(cy, 'getRemoteLocation').withArgs('origin').returns('')
 
@@ -840,7 +840,7 @@ describe('src/cy/commands/request', () => {
       })
 
       it('throws when url is not FQDN, notes that configFile is disabled', {
-        baseUrl: '',
+        baseUrl: null,
         configFile: false,
       }, function (done) {
         cy.stub(cy, 'getRemoteLocation').withArgs('origin').returns('')
@@ -860,7 +860,7 @@ describe('src/cy/commands/request', () => {
       })
 
       it('throws when url is not FQDN, notes that configFile is non-default', {
-        baseUrl: '',
+        baseUrl: null,
         configFile: 'foo.json',
       }, function (done) {
         cy.stub(cy, 'getRemoteLocation').withArgs('origin').returns('')

diff --git a/packages/driver/src/cy/commands/cookies.ts b/packages/driver/src/cy/commands/cookies.ts
@@ -160,7 +160,7 @@ export default function (Commands, Cypress, cy, state, config) {
   // stuff, or handling this in the runner itself?
   // Cypress sessions will clear cookies on its own before each test
   Cypress.on('test:before:run:async', () => {
-    if (!Cypress.config.experimentalSessionSupport) {
+    if (!Cypress.config('experimentalSessionSupport')) {
       return getAndClear()
     }
   })

diff --git a/packages/driver/src/cy/testConfigOverrides.ts b/packages/driver/src/cy/testConfigOverrides.ts
@@ -110,7 +110,6 @@ function mutateConfiguration (testConfig: ResolvedTestConfigOverride, config, en
 // note: must return as an object to meet the dashboard recording API
 export function getResolvedTestConfigOverride (test): ResolvedTestConfigOverride {
   let curParent = test.parent
-
   const testConfigList = [{
     overrides: test._testConfig,
     invocationDetails: test.invocationDetails,
@@ -144,7 +143,9 @@ class TestConfigOverride {
 
     const resolvedTestConfig = test._testConfig || {}
 
-    this.restoreTestConfigFn = mutateConfiguration(resolvedTestConfig, config, env)
+    if (Object.keys(resolvedTestConfig.unverifiedTestConfig).length > 0) {
+      this.restoreTestConfigFn = mutateConfiguration(resolvedTestConfig, config, env)
+    }
   }
 }
 

diff --git a/packages/driver/src/cypress.ts b/packages/driver/src/cypress.ts
@@ -398,16 +398,12 @@ class $Cypress {
         return this.runner.onRunnableRun(...args)
 
       case 'runner:test:before:run':
-        // get back to a clean slate
-        this.cy.reset(...args)
-
         if (this.config('isTextTerminal')) {
           // needed for handling test retries
           this.emit('mocha', 'test:before:run', args[0])
         }
 
         this.emit('test:before:run', ...args)
-
         break
 
       case 'runner:test:before:run:async':
@@ -431,7 +427,6 @@ class $Cypress {
         }
 
         break
-
       case 'cy:before:all:screenshots':
         return this.emit('before:all:screenshots', ...args)
 

diff --git a/packages/driver/src/cypress/cy.ts b/packages/driver/src/cypress/cy.ts
@@ -706,36 +706,34 @@ export default {
       },
 
       // reset is called before each test
-      reset (_attrs, test) {
-        const s = state()
-
-        const backup = {
-          window: s.window,
-          document: s.document,
-          $autIframe: s.$autIframe,
-          specWindow: s.specWindow,
-          activeSessions: s.activeSessions,
-        }
+      reset (test) {
+        try {
+          const s = state()
+
+          const backup = {
+            window: s.window,
+            document: s.document,
+            $autIframe: s.$autIframe,
+            specWindow: s.specWindow,
+            activeSessions: s.activeSessions,
+          }
 
-        // reset state back to empty object
-        state.reset()
+          // reset state back to empty object
+          state.reset()
 
-        // and then restore these backed up props
-        state(backup)
+          // and then restore these backed up props
+          state(backup)
 
-        queue.reset()
-        queue.clear()
-        timers.reset()
+          queue.reset()
+          queue.clear()
+          timers.reset()
 
-        try {
           testConfigOverrides.restoreAndSetTestConfigOverrides(test, Cypress.config, Cypress.env)
-          // reset mocha slow test threshold
-          test.slow(Cypress.config('slowTestThreshold'))
+
+          cy.removeAllListeners()
         } catch (err) {
           fail(err)
         }
-
-        return cy.removeAllListeners()
       },
 
       addCommandSync (name, fn) {

diff --git a/packages/driver/src/cypress/runner.ts b/packages/driver/src/cypress/runner.ts
@@ -18,6 +18,7 @@ const betweenQuotesRe = /\"(.+?)\"/
 
 const HOOKS = 'beforeAll beforeEach afterEach afterAll'.split(' ')
 const TEST_BEFORE_RUN_ASYNC_EVENT = 'runner:test:before:run:async'
+// event fired before hooks and test execution
 const TEST_BEFORE_RUN_EVENT = 'runner:test:before:run'
 const TEST_AFTER_RUN_EVENT = 'runner:test:after:run'
 
@@ -915,9 +916,9 @@ const _runnerListeners = (_runner, Cypress, _emissions, getTestById, getTest, se
   // })
 
   /**
-     * Mocha retry event is only fired in Mocha version 6+
-     * https://github.com/mochajs/mocha/commit/2a76dd7589e4a1ed14dd2a33ab89f182e4c4a050
-     */
+   * Mocha retry event is only fired in Mocha version 6+
+   * https://github.com/mochajs/mocha/commit/2a76dd7589e4a1ed14dd2a33ab89f182e4c4a050
+   */
   _runner.on('retry', (test, err) => {
     test.err = $errUtils.wrapErr(err)
     Cypress.action('runner:retry', wrap(test), test.err)
@@ -1134,7 +1135,7 @@ export default {
     }
 
     const onRunnable = (r) => {
-      // set defualt retries at onRunnable time instead of onRunnableRun
+      // set default retries at onRunnable time instead of onRunnableRun
       return _runnables.push(r)
     }
 
@@ -1235,6 +1236,7 @@ export default {
           // this prevents afterEach hooks that exist at a deeper level than the failing one from running
           // we will always skip remaining beforeEach hooks since they will always be same level or deeper
           test._skipHooksWithLevelGreaterThan = runnable.titlePath().length
+
           setHookFailureProps(test, runnable, err)
           test.fn = function () {
             throw err
@@ -1244,7 +1246,7 @@ export default {
         }
 
         if (willRetry && isAfterEachHook) {
-          // if we've already failed this attempt from an afterEach hook then we've already enqueud another attempt
+          // if we've already failed this attempt from an afterEach hook then we've already enqueued another attempt
           // so return early
           if (test._retriedFromAfterEachHook) {
             return noFail()
@@ -1371,10 +1373,9 @@ export default {
         }
 
         // closure for calculating the actual
-        // runtime of a runnables fn exection duration
+        // runtime of a runnables fn execution duration
         // and also the run of the runnable:after:run:async event
         let lifecycleStart
-        let wallClockStartedAt = null
         let wallClockEnd = null
         let fnDurationStart = null
         let fnDurationEnd = null
@@ -1384,7 +1385,7 @@ export default {
         // when this is a hook, capture the real start
         // date so we can calculate our test's duration
         // including all of its hooks
-        wallClockStartedAt = new Date()
+        const wallClockStartedAt = new Date()
 
         if (!test.wallClockStartedAt) {
           // if we don't have lifecycle timings yet
@@ -1395,27 +1396,13 @@ export default {
           test.wallClockStartedAt = wallClockStartedAt
         }
 
+        const isHook = runnable.type === 'hook'
+
         // if this isn't a hook, then the name is 'test'
-        const hookName = runnable.type === 'hook' ? getHookName(runnable) : 'test'
+        const hookName = isHook ? getHookName(runnable) : 'test'
 
         // set hook id to hook id or test id
-        const hookId = runnable.type === 'hook' ? runnable.hookId : runnable.id
-
-        // if we haven't yet fired this event for this test
-        // that means that we need to reset the previous state
-        // of cy - since we now have a new 'test' and all of the
-        // associated _runnables will share this state
-        if (!fired(TEST_BEFORE_RUN_EVENT, test)) {
-          fire(TEST_BEFORE_RUN_EVENT, test, Cypress)
-
-          // this is the earliest we can set test._retries since test:before:run
-          // will load in testConfigOverrides (per test configuration)
-          const retries = Cypress.getTestRetries() ?? -1
-
-          test._retries = retries
-        }
-
-        const isHook = runnable.type === 'hook'
+        const hookId = isHook ? runnable.hookId : runnable.id
 
         const isAfterEachHook = isHook && hookName.match(/after each/)
         const isBeforeEachHook = isHook && hookName.match(/before each/)
@@ -1519,22 +1506,32 @@ export default {
           })
         }
 
-        cy.state('duringUserTestExecution', false)
-
-        // our runnable is about to run, so let cy know. this enables
-        // us to always have a correct runnable set even when we are
-        // running lifecycle events
-        // and also get back a function result handler that we use as
-        // an async seam
-        cy.setRunnable(runnable, hookId)
-
         // TODO: handle promise timeouts here!
         // whenever any runnable is about to run
         // we figure out what test its associated to
         // if its a hook, and then we fire the
         // test:before:run:async action if its not
         // been fired before for this test
-        return testBeforeRunAsync(test, Cypress)
+        return Promise.try(() => {
+          if (!fired(TEST_BEFORE_RUN_EVENT, test)) {
+            cy.reset(test)
+            test.slow(Cypress.config('slowTestThreshold'))
+            test._retries = Cypress.getTestRetries() ?? -1
+            fire(TEST_BEFORE_RUN_EVENT, test, Cypress)
+          }
+
+          cy.state('duringUserTestExecution', false)
+
+          // our runnable is about to run, so let cy know. this enables
+          // us to always have a correct runnable set even when we are
+          // running lifecycle events
+          // and also get back a function result handler that we use as
+          // an async seam
+          cy.setRunnable(runnable, hookId)
+        })
+        .then(() => {
+          return testBeforeRunAsync(test, Cypress)
+        })
         .catch((err) => {
           // TODO: if our async tasks fail
           // then allow us to cause the test