Merge branch 'develop' into jordanpowell88/update-angular-tsconfig-path

cypress-io · Sep 5, 2023 · 8254be5 · 8254be5 · cypress-bot · Sep 5, 2023
2 parents d8d9d89 + b5c379f
commit 8254be5
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 12 deletions.
diff --git a/.circleci/cache-version.txt b/.circleci/cache-version.txt
@@ -1,3 +1,3 @@
 # Bump this version to force CI to re-create the cache from scratch.
 
-08-29-23
+08-31-23
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Cypress.io
+Copyright (c) 2023 Cypress.io
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -9,7 +9,7 @@ _Released 09/12/2023 (PENDING)_
 
 ## 13.1.0
 
-_Released 09/12/2023 (PENDING)_
+_Released 08/31/2023_
 
 **Features:**
 
@@ -20,6 +20,8 @@ _Released 09/12/2023 (PENDING)_
 - Fixed a regression introduced in Cypress [13.0.0](#13-0-0) where the [Module API](https://docs.cypress.io/guides/guides/module-api), [`after:run`](https://docs.cypress.io/api/plugins/after-run-api), and  [`after:spec`](https://docs.cypress.io/api/plugins/after-spec-api) results did not include the `stats.skipped` field for each run result. Fixes [#27694](https://github.com/cypress-io/cypress/issues/27694). Addressed in [#27695](https://github.com/cypress-io/cypress/pull/27695).
 - Individual CDP errors that occur while capturing data for test replay will no longer prevent the entire run from being available. Addressed in [#27709](https://github.com/cypress-io/cypress/pull/27709).
 - Fixed an issue where the release date on the `v13` landing page was a day behind. Fixed in [#27711](https://github.com/cypress-io/cypress/pull/27711).
+- Fixed an issue where fatal protocol errors would leak between specs causing all subsequent specs to fail to upload protocol information. Fixed in [#27720](https://github.com/cypress-io/cypress/pull/27720)
+- Updated `plist` from `3.0.6` to `3.1.0` to address [CVE-2022-37616](https://github.com/advisories/GHSA-9pgh-qqpf-7wqj) and [CVE-2022-39353](https://github.com/advisories/GHSA-crh6-fp67-6883). Fixed in [#27710](https://github.com/cypress-io/cypress/pull/27710).
 
 ## 13.0.0
 

diff --git a/npm/webpack-batteries-included-preprocessor/CHANGELOG.md b/npm/webpack-batteries-included-preprocessor/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [@cypress/webpack-batteries-included-preprocessor-v3.0.2](https://github.com/cypress-io/cypress/compare/@cypress/webpack-batteries-included-preprocessor-v3.0.1...@cypress/webpack-batteries-included-preprocessor-v3.0.2) (2023-08-31)
+
+
+### Bug Fixes
+
+* change how tsconfig is aliased in webpack-batteries-included-preprocessor ([#27706](https://github.com/cypress-io/cypress/issues/27706)) ([6081751](https://github.com/cypress-io/cypress/commit/6081751c411a45bb9eaf7ba200d4921acdcc2422))
+
 # [@cypress/webpack-batteries-included-preprocessor-v3.0.1](https://github.com/cypress-io/cypress/compare/@cypress/webpack-batteries-included-preprocessor-v3.0.0...@cypress/webpack-batteries-included-preprocessor-v3.0.1) (2023-08-29)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {

diff --git a/packages/driver/cypress/e2e/commands/sessions/sessions.cy.js b/packages/driver/cypress/e2e/commands/sessions/sessions.cy.js
@@ -116,7 +116,7 @@ describe('cy.session', { retries: 0 }, () => {
         const clearCurrentSessionData = cy.spy(Cypress.session, 'clearCurrentSessionData')
 
         await Cypress.action('runner:test:before:run:async', {
-          runnable: 'r1',
+          id: 'r1',
           currentRetry: 0,
         }, Cypress.state('runnable'))
 
@@ -127,7 +127,7 @@ describe('cy.session', { retries: 0 }, () => {
         const backendSpy = cy.spy(Cypress, 'backend').log(false)
 
         await Cypress.action('runner:test:before:run:async', {
-          runnable: 'r1',
+          id: 'r1',
           currentRetry: 0,
         }, Cypress.state('runnable'))
 
@@ -144,7 +144,7 @@ describe('cy.session', { retries: 0 }, () => {
           cy.spy(Cypress, 'action').log(false)
 
           await Cypress.action('runner:test:before:run:async', {
-            runnable: 'r1',
+            id: 'r1',
             currentRetry: 0,
           }, Cypress.state('runnable'))
         })
@@ -839,7 +839,7 @@ describe('cy.session', { retries: 0 }, () => {
           cy.spy(Cypress, 'action').log(false)
 
           await Cypress.action('runner:test:before:run:async', {
-            runnable: 'r1',
+            id: 'r1',
             currentRetry: 0,
           }, Cypress.state('runnable'))
 
@@ -853,7 +853,7 @@ describe('cy.session', { retries: 0 }, () => {
         const clearCurrentSessionData = cy.spy(Cypress.session, 'clearCurrentSessionData')
 
         await Cypress.action('runner:test:before:run:async', {
-          runnable: 'r1',
+          id: 'r1',
           currentRetry: 0,
         }, Cypress.state('runnable'))
 
@@ -864,7 +864,7 @@ describe('cy.session', { retries: 0 }, () => {
         const backendSpy = cy.spy(Cypress, 'backend').log(false)
 
         await Cypress.action('runner:test:before:run:async', {
-          runnable: 'r1',
+          id: 'r1',
           currentRetry: 0,
         }, Cypress.state('runnable'))
 
@@ -882,7 +882,7 @@ describe('cy.session', { retries: 0 }, () => {
           cy.spy(Cypress, 'action').log(false)
 
           await Cypress.action('runner:test:before:run:async', {
-            runnable: 'r1',
+            id: 'r1',
             currentRetry: 0,
           }, Cypress.state('runnable'))
 

diff --git a/packages/driver/cypress/e2e/commands/window.cy.js b/packages/driver/cypress/e2e/commands/window.cy.js
@@ -670,7 +670,7 @@ describe('src/cy/commands/window', () => {
 
         cy.viewport(500, 400).then(async () => {
           await Cypress.action('runner:test:before:run:async', {
-            runnable: 'r1',
+            id: 'r1',
             currentRetry: 0,
           }, Cypress.state('runnable'))
           .then(() => {

diff --git a/packages/server/lib/cloud/protocol.ts b/packages/server/lib/cloud/protocol.ts
@@ -134,6 +134,9 @@ export class ProtocolManager implements ProtocolManagerShape {
       return
     }
 
+    // Reset the errors here so that we are tracking on them per-spec
+    this._errors = []
+
     try {
       this._beforeSpec(spec)
     } catch (error) {

diff --git a/packages/server/test/unit/cloud/protocol_spec.ts b/packages/server/test/unit/cloud/protocol_spec.ts
@@ -80,10 +80,18 @@ describe('lib/cloud/protocol', () => {
   it('should be able to initialize a new spec', () => {
     sinon.stub(protocol, 'beforeSpec')
 
+    ;(protocolManager as any)._errors = [
+      {
+        captureMethod: 'cdpClient.on',
+      },
+    ]
+
     protocolManager.beforeSpec({
       instanceId: 'instanceId',
     })
 
+    expect((protocolManager as any)._errors).to.be.empty
+
     expect(protocol.beforeSpec).to.be.calledWith({
       workingDirectory: path.join(os.tmpdir(), 'cypress', 'protocol'),
       archivePath: path.join(os.tmpdir(), 'cypress', 'protocol', 'instanceId.tar'),