add checkForStats and add tests for removing url parameters

Author: mabela416

cli/types/cypress.d.ts

@@ -297,12 +297,7 @@ declare namespace Cypress {
   /**
    * The interface for user-defined properties in Window object under test.
    */
-  interface ApplicationWindow {
-    state?: {
-      studioSingleTestActive?: boolean
-      [key: string]: any
-    }
-  } // tslint:disable-line
+  interface ApplicationWindow {} // tslint:disable-line
 
   /**
    * The configuration for Cypress.

packages/app/cypress/e2e/studio/studio-cloud.cy.ts

@@ -40,7 +40,7 @@ describe('Studio Cloud', () => {
     cy.wait('@indexHtml')
 
     // Studio re-executes spec before waiting for commands - wait for the spec to finish executing.
-    cy.waitForSpecToFinish()
+    cy.waitForSpecToFinish(undefined, undefined, false)
 
     // Verify the studio panel is still open
     cy.findByTestId('studio-panel')
@@ -224,7 +224,7 @@ describe('Studio Cloud', () => {
     cy.wait('@indexHtml')
 
     // Studio re-executes spec before waiting for commands - wait for the spec to finish executing.
-    cy.waitForSpecToFinish()
+    cy.waitForSpecToFinish(undefined, undefined, false)
 
     // Verify the studio panel is still open
     cy.findByTestId('studio-panel')

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

@@ -2,7 +2,7 @@ import { launchStudio, loadProjectAndRunSpec, assertClosingPanelWithoutChanges }
 
 describe('Cypress Studio', () => {
   function incrementCounter (initialCount: number) {
-    cy.waitForSpecToFinish()
+    cy.waitForSpecToFinish(undefined, undefined, false)
 
     cy.getAutIframe().within(() => {
       cy.get('p').contains(`Count is ${initialCount}`)
@@ -88,7 +88,7 @@ describe('studio functionality', () => {
   it('updates an existing test with assertions', () => {
     launchStudio()
 
-    cy.waitForSpecToFinish()
+    cy.waitForSpecToFinish(undefined, undefined, false)
 
     cy.getAutIframe().within(() => {
       cy.get('#increment').rightclick().then(() => {
@@ -403,7 +403,7 @@ describe('studio functionality', () => {
   it('shows assertions menu and submenu correctly', () => {
     launchStudio()
 
-    cy.waitForSpecToFinish()
+    cy.waitForSpecToFinish(undefined, undefined, false)
 
     cy.contains('No commands were issued in this test.').should('not.exist')
 
@@ -442,7 +442,7 @@ describe('studio functionality', () => {
       win.location.href = win.location.href
     })
 
-    cy.waitForSpecToFinish()
+    cy.waitForSpecToFinish(undefined, undefined, false)
 
     // after reloading we should still be in studio mode but the commands should be removed
     // so the save button should be disabled
@@ -458,7 +458,7 @@ describe('studio functionality', () => {
 
     cy.get('button[aria-label="Rerun all tests"]').click()
 
-    cy.waitForSpecToFinish()
+    cy.waitForSpecToFinish(undefined, undefined, false)
     // after reloading we should still be in studio mode but the commands should be removed
     // the save button should be disabled since the commands were removed
     cy.findByTestId('studio-save-button').should('be.disabled')
@@ -524,7 +524,7 @@ describe('studio functionality', () => {
 
     cy.findByTestId('studio-save-button').click()
 
-    cy.waitForSpecToFinish()
+    cy.waitForSpecToFinish(undefined, undefined, false)
 
     // only the commands in the editor are written to the test block - ideally we should also pick up the changes from the file system
     // TODO: https://github.com/cypress-io/cypress-services/issues/11085
@@ -651,7 +651,7 @@ describe('studio functionality', () => {
 
     cy.findByTestId('record-button-recording').should('be.visible')
 
-    cy.waitForSpecToFinish()
+    cy.waitForSpecToFinish(undefined, undefined, false)
 
     cy.getAutIframe().within(() => {
       cy.get('#increment').realClick()
@@ -692,4 +692,34 @@ describe('studio functionality', () => {
 
     cy.location().its('hash').should('contain', 'testId=r3').and('contain', 'studio=')
   })
+
+  it('removes the studio url parameters when closing studio existing test with the back button', () => {
+    launchStudio()
+
+    cy.location().its('hash').should('contain', 'testId=r3').and('contain', 'studio=')
+
+    cy.get('[data-cy="studio-back-button"]').click()
+
+    cy.location().its('hash').and('not.contain', 'testId=').and('not.contain', 'studio=')
+  })
+
+  it('removes the studio url parameters when closing studio existing test with the studio header button', () => {
+    launchStudio()
+
+    cy.location().its('hash').should('contain', 'testId=r3').and('contain', 'studio=')
+
+    cy.findByTestId('studio-header-studio-button').click()
+
+    cy.location().its('hash').and('not.contain', 'testId=').and('not.contain', 'studio=')
+  })
+
+  it('removes the studio url parameters when closing studio new test', () => {
+    launchStudio({ specName: 'spec-w-visit.cy.js', createNewTest: true })
+
+    cy.location().its('hash').should('contain', 'suiteId=r2').and('contain', 'studio=')
+
+    cy.findByTestId('studio-header-studio-button').click()
+
+    cy.location().its('hash').and('not.contain', 'suiteId=').and('not.contain', 'studio=')
+  })
 })

packages/app/cypress/e2e/support/execute-spec.ts

@@ -17,23 +17,19 @@ declare global {
        * 3. Waits (with a timeout of 30s) for the Rerun all tests button to be present. This ensures all tests have completed
        *
        */
-      waitForSpecToFinish(expectedResults?: ExpectedResults, timeout?: number): void
+      waitForSpecToFinish(expectedResults?: ExpectedResults, timeout?: number, checkStats?: boolean): void
       verifyE2ESelected(): void
       verifyCtSelected(): void
     }
   }
 }
 
-export const waitForSpecToFinish = (expectedResults, timeout?: number) => {
-  // Check if we're in studio mode using URL hash parameters (same method as studio store)
-  cy.window().then((win) => {
-    const studioSingleTestActive = win.state?.studioSingleTestActive
-
-    if (!studioSingleTestActive) {
-      cy.get('.passed > .num').should('exist')
-      cy.get('.failed > .num').should('exist')
-    }
-  })
+export const waitForSpecToFinish = (expectedResults, timeout?: number, checkStats: boolean = true) => {
+  // when we're in studio single test mode, we don't have the stats so we can skip this
+  if (checkStats) {
+    cy.get('.passed > .num').should('exist')
+    cy.get('.failed > .num').should('exist')
+  }
 
   // Then ensure the tests are not running
   cy.contains('Your tests are loading...', { timeout: timeout || 30000 }).should('not.exist')