chore: Merge develop into release/13.0.0

README.md

@@ -63,7 +63,8 @@ yarn add cypress --dev
 
 ## Contributing
 
-- [![CircleCI](https://circleci.com/gh/cypress-io/cypress/tree/develop.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress/tree/develop) - `develop` branch
+[![cypress](https://img.shields.io/endpoint?url=https://cloud.cypress.io/badge/simple/ypt4pf/develop&style=flat&logo=cypress)](https://cloud.cypress.io/projects/ypt4pf/runs)
+[![CircleCI](https://circleci.com/gh/cypress-io/cypress/tree/develop.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress/tree/develop) -  `develop` branch
 
 Please see our [Contributing Guideline](./CONTRIBUTING.md) which explains repo organization, linting, testing, and other steps.
 
@@ -79,7 +80,13 @@ This project is licensed under the terms of the [MIT license](/LICENSE).
 
 ## Badges
 
-Let the world know your project is using Cypress.io to test with this cool badge
+Configure a badge for your project's README to show your test status or test count in the [Cypress Cloud](https://www.cypress.io/cloud).
+
+[![cypress](https://img.shields.io/endpoint?url=https://cloud.cypress.io/badge/simple/ypt4pf/develop&style=flat&logo=cypress)](https://cloud.cypress.io/projects/ypt4pf/runs)
+
+[![cypress](https://img.shields.io/endpoint?url=https://cloud.cypress.io/badge/count/ypt4pf/develop&style=flat&logo=cypress)](https://cloud.cypress.io/projects/ypt4pf/runs)
+
+Or let the world know your project is using Cypress with the badge below.
 
 [![Cypress.io](https://img.shields.io/badge/tested%20with-Cypress-04C38E.svg)](https://www.cypress.io/)
 

cli/CHANGELOG.md

@@ -1,4 +1,32 @@
  <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
+## 12.5.1
+
+_Released 02/10/2023 (PENDING)_
+
+**Dependency Updates:**
+
+- Upgraded [`simple-git`](https://github.com/steveukx/git-js) from `3.15.0` to `3.16.0` to address this [security vulnerability](https://github.com/advisories/GHSA-9p95-fxvg-qgq2) where Remote Code Execution (RCE) via the clone(), pull(), push() and listRemote() methods due to improper input sanitization was possible. Addressed in [#25603](https://github.com/cypress-io/cypress/pull/25603).
+
+## 12.5.0
+
+_Released 01/31/2023_
+
+**Features:**
+
+- Easily debug failed CI test runs recorded to the Cypress Cloud from your local Cypress app with the new Debug page. Please leave any feedback [here](https://github.com/cypress-io/cypress/discussions/25649). Your feedback will help us make decisions to improve the Debug experience. For more details, see [our blog post](https://on.cypress.io/debug-page-release). Addressed in [#25488](https://github.com/cypress-io/cypress/pull/25488).
+
+**Performance:**
+
+- Improved memory consumption in `run` mode by removing reporter logs for successful tests. Fixes [#25230](https://github.com/cypress-io/cypress/issues/25230).
+
+**Bugfixes:**
+
+- Fixed an issue where alternative Microsoft Edge Beta, Canary, and Dev binary versions were not being discovered by Cypress. Fixes [#25455](https://github.com/cypress-io/cypress/issues/25455).
+
+**Dependency Updates:**
+
+- Upgraded [`underscore.string`](https://github.com/esamattis/underscore.string/blob/HEAD/CHANGELOG.markdown) from `3.3.5` to `3.3.6` to reference rebuilt assets after security patch to fix regular expression DDOS exploit. Addressed in [#25574](https://github.com/cypress-io/cypress/pull/25574).
+
 ## 12.4.1
 
 _Released 01/27/2023_

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "12.4.1",
+  "version": "12.5.0",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {

packages/app/cypress/e2e/cypress-in-cypress-run-mode.cy.ts

@@ -1,14 +1,13 @@
+import { CY_IN_CY_SIMULATE_RUN_MODE } from '@packages/types/src/constants'
+
 describe('Cypress In Cypress - run mode', { viewportWidth: 1200 }, () => {
   it('e2e run mode spec runner header is correct', () => {
     cy.scaffoldProject('cypress-in-cypress')
     cy.findBrowsers()
     cy.openProject('cypress-in-cypress')
     cy.startAppServer()
-    cy.visitApp()
-
-    simulateRunModeInUI()
+    cy.visitApp(`/specs/runner?file=cypress/e2e/dom-content.spec.js&${CY_IN_CY_SIMULATE_RUN_MODE}`)
 
-    cy.contains('dom-content.spec').click()
     cy.waitForSpecToFinish()
 
     cy.findByTestId('aut-url').should('be.visible')
@@ -33,17 +32,14 @@ describe('Cypress In Cypress - run mode', { viewportWidth: 1200 }, () => {
     // cy.percySnapshot() // TODO: restore when Percy CSS is fixed. See https://github.com/cypress-io/cypress/issues/23435
   })
 
-  // TODO: fix flaky test https://github.com/cypress-io/cypress/issues/23306
-  it('component testing run mode spec runner header is correct', { retries: 15 }, () => {
+  it('component testing run mode spec runner header is correct', () => {
     cy.scaffoldProject('cypress-in-cypress')
     cy.findBrowsers()
     cy.openProject('cypress-in-cypress')
     cy.startAppServer('component')
-    cy.visitApp()
-    simulateRunModeInUI()
-    cy.contains('TestComponent.spec').click()
-    cy.waitForSpecToFinish()
+    cy.visitApp(`/specs/runner?file=src/TestComponent.spec.jsx&${CY_IN_CY_SIMULATE_RUN_MODE}`)
 
+    cy.waitForSpecToFinish()
     cy.findByTestId('aut-url').should('not.exist')
     cy.findByTestId('playground-activator').should('not.exist')
 
@@ -81,9 +77,7 @@ describe('Cypress In Cypress - run mode', { viewportWidth: 1200 }, () => {
       })
     })
 
-    cy.visitApp()
-    simulateRunModeInUI()
-    cy.contains('dom-content.spec').click()
+    cy.visitApp(`/specs/runner?file=cypress/e2e/dom-content.spec.js&${CY_IN_CY_SIMULATE_RUN_MODE}`)
 
     cy.contains('http://localhost:4455/cypress/e2e/dom-content.html').should('be.visible')
     cy.findByLabelText('Stats').should('not.exist')
@@ -92,13 +86,3 @@ describe('Cypress In Cypress - run mode', { viewportWidth: 1200 }, () => {
     cy.findByTestId('sidebar').should('not.exist')
   })
 })
-
-function simulateRunModeInUI () {
-  // this simulates run mode enough for this test
-  cy.window().then((win) => {
-    win.__CYPRESS_MODE__ = 'run'
-    cy.get('body').then(($el) => {
-      $el.find('[data-cy="sidebar"]')?.remove()
-    })
-  })
-}

packages/app/cypress/e2e/debug.cy.ts

@@ -0,0 +1,151 @@
+import RelevantRunsDataSource_RunsByCommitShas from '../fixtures/gql-RelevantRunsDataSource_RunsByCommitShas.json'
+
+Cypress.on('window:before:load', (win) => {
+  win.__CYPRESS_GQL_NO_SOCKET__ = 'true'
+})
+
+// These mocks all the responses so we can get deterministic
+// results to test the debug page.
+// The JSON fixtures were generated by using a real app and capturing
+// the responses.
+describe('App - Debug Page', () => {
+  beforeEach(() => {
+    cy.scaffoldProject('cypress-in-cypress')
+    cy.openProject('cypress-in-cypress')
+    cy.startAppServer('component')
+
+    cy.loginUser()
+    cy.withCtx((ctx) => {
+      ctx.git?.__setGitHashesForTesting(['commit1', 'commit2'])
+    })
+
+    cy.remoteGraphQLIntercept((obj, _testState, options) => {
+      if (obj.operationName === 'RelevantRunsDataSource_RunsByCommitShas') {
+        obj.result.data = options.RelevantRunsDataSource_RunsByCommitShas.data
+      }
+
+      return obj.result
+    }, { RelevantRunsDataSource_RunsByCommitShas })
+  })
+
+  it('all tests passed', () => {
+    // This mocks all the responses so we can get deterministic
+    // results to test the debug page.
+    cy.intercept('POST', '/__cypress/graphql/query-Debug', {
+      fixture: 'debug-Passing/gql-Debug.json',
+    })
+
+    cy.intercept('POST', '/__cypress/graphql/query-CloudViewerAndProject_RequiredData', {
+      fixture: 'debug-Passing/gql-CloudViewerAndProject_RequiredData.json',
+    })
+
+    cy.intercept('POST', '/__cypress/graphql/query-MainAppQuery', {
+      fixture: 'debug-Passing/gql-MainAppQuery.json',
+    })
+
+    cy.intercept('POST', '/__cypress/graphql/query-SideBarNavigationContainer', {
+      fixture: 'debug-Passing/gql-SideBarNavigationContainer',
+    })
+
+    cy.intercept('POST', '/__cypress/graphql/query-HeaderBar_HeaderBarQuery', {
+      fixture: 'debug-Passing/gql-HeaderBar_HeaderBarQuery',
+    })
+
+    cy.intercept('POST', '/__cypress/graphql/query-SpecsPageContainer', {
+      fixture: 'debug-Passing/gql-SpecsPageContainer',
+    })
+
+    cy.visitApp()
+
+    cy.findByTestId('sidebar-link-debug-page').click()
+    cy.findByTestId('debug-container').should('be.visible')
+
+    cy.findByTestId('header-top').contains('update projectId')
+    cy.findByTestId('debug-header-dashboard-link')
+    .contains('View in Cypress Cloud')
+    .should('have.attr', 'href', 'https://cloud.cypress.io/projects/7p5uce/runs/2')
+
+    cy.findByTestId('debug-runNumber-PASSED').contains('#2')
+    cy.findByTestId('debug-commitsAhead').contains('You are 1 commit ahead')
+
+    cy.findByTestId('metadata').within(() => {
+      cy.get('[title="passed"]').contains('2')
+      cy.get('[title="failed"]').contains('0')
+      cy.get('[title="skipped"]').contains('0')
+      cy.get('[title="pending"]').contains('2')
+      cy.findByTestId('debug-header-branch').contains('main')
+      cy.findByTestId('debug-header-commitHash').contains('e9d176f')
+      cy.findByTestId('debug-header-author').contains('Lachlan Miller')
+      cy.findByTestId('debug-header-createdAt').contains('01:18')
+    })
+
+    cy.findByTestId('debug-passed').contains('Well Done!')
+    cy.findByTestId('debug-passed').contains('All your tests passed.')
+    cy.findByLabelText('Relevant run passed').should('be.visible').contains('0')
+    cy.findByTestId('run-failures').should('not.exist')
+  })
+
+  it('shows information about a failed spec', () => {
+    cy.intercept('POST', '/__cypress/graphql/query-Debug', {
+      fixture: 'debug-Failing/gql-Debug.json',
+    })
+
+    cy.intercept('POST', '/__cypress/graphql/query-CloudViewerAndProject_RequiredData', {
+      fixture: 'debug-Failing/gql-CloudViewerAndProject_RequiredData.json',
+    })
+
+    cy.intercept('POST', '/__cypress/graphql/query-MainAppQuery', {
+      fixture: 'debug-Failing/gql-MainAppQuery.json',
+    })
+
+    cy.intercept('POST', '/__cypress/graphql/query-SideBarNavigationContainer', {
+      fixture: 'debug-Failing/gql-SideBarNavigationContainer',
+    })
+
+    cy.intercept('POST', '/__cypress/graphql/query-HeaderBar_HeaderBarQuery', {
+      fixture: 'debug-Failing/gql-HeaderBar_HeaderBarQuery',
+    })
+
+    cy.intercept('POST', '/__cypress/graphql/query-SpecsPageContainer', {
+      fixture: 'debug-Failing/gql-SpecsPageContainer',
+    })
+
+    cy.visitApp()
+
+    cy.findByTestId('sidebar-link-debug-page').click()
+    cy.findByTestId('debug-container').should('be.visible')
+
+    cy.findByTestId('header-top').contains('chore: testing cypress')
+    cy.findByTestId('debug-header-dashboard-link')
+    .contains('View in Cypress Cloud')
+    .should('have.attr', 'href', 'https://cloud.cypress.io/projects/vgqrwp/runs/136')
+
+    cy.findByLabelText('Relevant run had 1 test failure').should('be.visible').contains('1')
+
+    cy.findByTestId('debug-runNumber-FAILED').contains('#136')
+    cy.findByTestId('debug-commitsAhead').contains('You are 1 commit ahead')
+
+    cy.findByTestId('metadata').within(() => {
+      cy.get('[title="passed"]').contains('1')
+      cy.get('[title="failed"]').contains('1')
+      cy.get('[title="skipped"]').contains('0')
+      cy.get('[title="pending"]').contains('0')
+      cy.findByTestId('debug-header-branch').contains('main')
+      cy.findByTestId('debug-header-commitHash').contains('commit1')
+      cy.findByTestId('debug-header-author').contains('Lachlan Miller')
+      cy.findByTestId('debug-header-createdAt').contains('00:19')
+    })
+
+    cy.findByTestId('spec-contents').within(() => {
+      cy.contains('src/components/InfoPanel/InfoPanel.cy.ts')
+      cy.findByTestId('metaData-Results-spec-duration').contains('00:04')
+      cy.findByTestId('metaData-Results-operating-system').contains('Linux Ubuntu')
+      cy.findByTestId('metaData-Results-browser').contains('Electron 106')
+      cy.findByTestId('metaData-Results-testing-type').contains('Component')
+    })
+
+    cy.findByTestId('test-row').contains('InfoPanel')
+    cy.findByTestId('test-row').contains('renders')
+    cy.findByTestId('run-failures').should('exist').should('have.attr', 'href', '#/specs/runner?file=src/components/InfoPanel/InfoPanel.cy.ts&mode=debug')
+  })
+})