updates

Author: mschile

packages/driver/src/cypress/runner.ts

@@ -557,6 +557,9 @@ const overrideRunnerHook = (Cypress, _runner, getTestById, getTest, setTest, get
         testAfterRun(test, Cypress)
         await testAfterRunAsync(test, Cypress)
 
+        // if the user has stopped the run, we need to abort,
+        // this needs to happen after the test:after:run events have fired
+        // to ensure protocol can properly handle the abort
         if (_runner.stopped) {
           // abort the run
           _runner.abort()

system-tests/__snapshots__/cypress-stop.spec.ts.js

@@ -1,4 +1,4 @@
-exports['e2e Cypress.stop() / stops execution when called in before'] = `
+exports['Cypress.stop() / stops execution when called in before'] = `
 
 ====================================================================================================
 
@@ -52,7 +52,7 @@ exports['e2e Cypress.stop() / stops execution when called in before'] = `
 
 `
 
-exports['e2e Cypress.stop() / stops execution when called in beforeEach'] = `
+exports['Cypress.stop() / stops execution when called in beforeEach'] = `
 
 ====================================================================================================
 
@@ -106,7 +106,7 @@ exports['e2e Cypress.stop() / stops execution when called in beforeEach'] = `
 
 `
 
-exports['e2e Cypress.stop() / stops execution when called in test'] = `
+exports['Cypress.stop() / stops execution when called in test'] = `
 
 ====================================================================================================
 
@@ -161,7 +161,7 @@ exports['e2e Cypress.stop() / stops execution when called in test'] = `
 
 `
 
-exports['e2e Cypress.stop() / stops execution when called in afterEach'] = `
+exports['Cypress.stop() / stops execution when called in afterEach'] = `
 
 ====================================================================================================
 
@@ -215,7 +215,7 @@ exports['e2e Cypress.stop() / stops execution when called in afterEach'] = `
 
 `
 
-exports['e2e Cypress.stop() / stops execution when called in after'] = `
+exports['Cypress.stop() / stops execution when called in after'] = `
 
 ====================================================================================================
 

system-tests/projects/cypres-stop/package.json

@@ -1,6 +1,6 @@
 import systemTests from '../lib/system-tests'
 
-describe('e2e Cypress.stop()', () => {
+describe('Cypress.stop()', () => {
   const getRunnableEventCounts = (stderr: string) => {
     const beforeRunCount = (stderr.match(/test:before:run(?!:async)/g) || []).length
     const beforeRunAsyncCount = (stderr.match(/test:before:run:async/g) || []).length
@@ -34,7 +34,7 @@ describe('e2e Cypress.stop()', () => {
   systemTests.setup()
 
   systemTests.it('stops execution when called in before', {
-    project: 'cypres-stop',
+    project: 'cypress-stop',
     spec: 'before.cy.js',
     snapshot: true,
     expectedExitCode: 0,
@@ -67,7 +67,7 @@ describe('e2e Cypress.stop()', () => {
   })
 
   systemTests.it('stops execution when called in beforeEach', {
-    project: 'cypres-stop',
+    project: 'cypress-stop',
     spec: 'beforeEach.cy.js',
     snapshot: true,
     expectedExitCode: 0,
@@ -100,7 +100,7 @@ describe('e2e Cypress.stop()', () => {
   })
 
   systemTests.it('stops execution when called in test', {
-    project: 'cypres-stop',
+    project: 'cypress-stop',
     spec: 'test.cy.js',
     snapshot: true,
     expectedExitCode: 0,
@@ -133,7 +133,7 @@ describe('e2e Cypress.stop()', () => {
   })
 
   systemTests.it('stops execution when called in afterEach', {
-    project: 'cypres-stop',
+    project: 'cypress-stop',
     spec: 'afterEach.cy.js',
     snapshot: true,
     expectedExitCode: 0,
@@ -166,7 +166,7 @@ describe('e2e Cypress.stop()', () => {
   })
 
   systemTests.it('stops execution when called in after', {
-    project: 'cypres-stop',
+    project: 'cypress-stop',
     spec: 'after.cy.js',
     snapshot: true,
     expectedExitCode: 0,