merge develop into 15

Author: jennifer-shehane

.circleci/cache-version.txt

@@ -1,3 +1,3 @@
 # Bump this version to force CI to re-create the cache from scratch.
 
-4-28-2025
+4-29-2025

.circleci/workflows.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 chrome-stable-version: &chrome-stable-version "136.0.7103.92"
-chrome-beta-version: &chrome-beta-version "137.0.7151.6"
+chrome-beta-version: &chrome-beta-version "137.0.7151.15"
 firefox-stable-version: &firefox-stable-version "137.0"
 
 orbs:

cli/CHANGELOG.md

@@ -22,6 +22,15 @@ _Released 07/01/2025 (PENDING)_
 
 - Migration helpers and related errors are no longer shown when upgrading from Cypress versions earlier than 10.0.0. To migrate from a pre-10.0.0 version, upgrade one major version at a time to receive the appropriate guidance. Addresses [#31345](https://github.com/cypress-io/cypress/issues/31345). Addressed in [https://github.com/cypress-io/cypress/pull/31629/](https://github.com/cypress-io/cypress/pull/31629/).
 
+## 14.3.4
+
+_Released 5/20/2025 (PENDING)_
+
+**Dependency Updates:**
+
+- Upgraded `trash` from `5.2.0` to `7.2.0`. Addressed in [#31667](https://github.com/cypress-io/cypress/pull/31667).
+
+
 ## 14.3.3
 
 _Released 5/6/2025_

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

@@ -43,3 +43,31 @@ export function launchStudio ({ specName = 'spec.cy.js', createNewTest = false,
     cy.get('[data-cy="hook-name-studio commands"]').should('exist')
   }
 }
+
+export function assertClosingPanelWithoutChanges () {
+  // Cypress re-runs after you cancel Studio.
+  // Original spec should pass
+  cy.waitForSpecToFinish({ passCount: 1 })
+
+  cy.get('.command').should('have.length', 1)
+
+  // Assert the spec was executed without any new commands.
+  cy.get('.command-name-visit').within(() => {
+    cy.contains('visit')
+    cy.contains('cypress/e2e/index.html')
+  })
+
+  cy.findByTestId('hook-name-studio commands').should('not.exist')
+
+  cy.withCtx(async (ctx) => {
+    const spec = await ctx.actions.file.readFileInProject('cypress/e2e/spec.cy.js')
+
+    // No change, since we closed studio
+    expect(spec.trim().replace(/\r/g, '')).to.eq(`
+describe('studio functionality', () => {
+  it('visits a basic html page', () => {
+    cy.visit('cypress/e2e/index.html')
+  })
+})`.trim())
+  })
+}

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

@@ -0,0 +1,191 @@
+import { launchStudio, loadProjectAndRunSpec, assertClosingPanelWithoutChanges } from './helper'
+import pDefer from 'p-defer'
+
+describe('Studio Cloud', () => {
+  it('enables protocol for cloud studio', () => {
+    launchStudio({ enableCloudStudio: true })
+
+    cy.window().then((win) => {
+      expect(win.Cypress.config('isDefaultProtocolEnabled')).to.be.false
+      expect(win.Cypress.state('isProtocolEnabled')).to.be.true
+    })
+  })
+
+  it('loads the studio UI correctly when studio bundle is taking too long to load', () => {
+    loadProjectAndRunSpec({ enableCloudStudio: false })
+
+    cy.window().then(() => {
+      cy.withCtx((ctx) => {
+        // Mock the studioLifecycleManager.getStudio method to return a hanging promise
+        if (ctx.coreData.studioLifecycleManager) {
+          const neverResolvingPromise = new Promise<null>(() => {})
+
+          ctx.coreData.studioLifecycleManager.getStudio = () => neverResolvingPromise
+          ctx.coreData.studioLifecycleManager.isStudioReady = () => false
+        }
+      })
+    })
+
+    cy.contains('visits a basic html page')
+    .closest('.runnable-wrapper')
+    .findByTestId('launch-studio')
+    .click()
+
+    cy.waitForSpecToFinish()
+
+    // Verify the cloud studio panel is not present
+    cy.findByTestId('studio-panel').should('not.exist')
+
+    cy.get('[data-cy="loading-studio-panel"]').should('not.exist')
+
+    cy.get('[data-cy="hook-name-studio commands"]').should('exist')
+
+    cy.getAutIframe().within(() => {
+      cy.get('#increment').realClick()
+    })
+
+    cy.findByTestId('hook-name-studio commands').closest('.hook-studio').within(() => {
+      cy.get('.command').should('have.length', 2)
+      cy.get('.command-name-get').should('contain.text', '#increment')
+      cy.get('.command-name-click').should('contain.text', 'click')
+    })
+
+    cy.get('button').contains('Save Commands').should('not.be.disabled')
+  })
+
+  it('immediately loads the studio panel', () => {
+    const deferred = pDefer()
+
+    loadProjectAndRunSpec({ enableCloudStudio: true })
+
+    cy.findByTestId('studio-panel').should('not.exist')
+
+    cy.intercept('/cypress/e2e/index.html', () => {
+      // wait for the promise to resolve before responding
+      // this will ensure the studio panel is loaded before the test finishes
+      return deferred.promise
+    }).as('indexHtml')
+
+    cy.contains('visits a basic html page')
+    .closest('.runnable-wrapper')
+    .findByTestId('launch-studio')
+    .click()
+
+    // regular studio is not loaded until after the test finishes
+    cy.get('[data-cy="hook-name-studio commands"]').should('not.exist')
+    // cloud studio is loaded immediately
+    cy.findByTestId('studio-panel').then(() => {
+      // check for the loading panel from the app first
+      cy.get('[data-cy="loading-studio-panel"]').should('be.visible')
+      // we've verified the studio panel is loaded, now resolve the promise so the test can finish
+      deferred.resolve()
+    })
+
+    cy.wait('@indexHtml')
+
+    // Studio re-executes spec before waiting for commands - wait for the spec to finish executing.
+    cy.waitForSpecToFinish()
+
+    // Verify the studio panel is still open
+    cy.findByTestId('studio-panel')
+    cy.get('[data-cy="hook-name-studio commands"]')
+  })
+
+  it('hides selector playground and studio controls when studio beta is available', () => {
+    launchStudio({ enableCloudStudio: true })
+    cy.get('[data-cy="studio-header-studio-button"]').click()
+
+    cy.get('[data-cy="playground-activator"]').should('not.exist')
+    cy.get('[data-cy="studio-toolbar"]').should('not.exist')
+  })
+
+  it('closes studio panel when clicking studio button (from the cloud)', () => {
+    launchStudio({ enableCloudStudio: true })
+
+    cy.get('[data-cy="studio-header-studio-button"]').click()
+
+    assertClosingPanelWithoutChanges()
+  })
+
+  it('opens studio panel to new test when clicking on studio button (from the app) next to url', () => {
+    cy.viewport(1500, 1000)
+    loadProjectAndRunSpec({ enableCloudStudio: true })
+    // studio button should be visible when using cloud studio
+    cy.get('[data-cy="studio-button"]').should('be.visible').click()
+    cy.get('[data-cy="studio-panel"]').should('be.visible')
+
+    cy.contains('New Test')
+
+    cy.get('[data-cy="studio-url-prompt"]').should('not.exist')
+
+    cy.percySnapshot()
+  })
+
+  it('opens a cloud studio session with AI enabled', () => {
+    cy.mockNodeCloudRequest({
+      url: '/studio/testgen/n69px6/enabled',
+      method: 'get',
+      body: { enabled: true },
+    })
+
+    const aiOutput = 'cy.get(\'button\').should(\'have.text\', \'Increment\')'
+
+    cy.mockNodeCloudStreamingRequest({
+      url: '/studio/testgen/n69px6/generate',
+      method: 'post',
+      body: { recommendations: [{ content: aiOutput }] },
+    })
+
+    cy.mockStudioFullSnapshot({
+      id: 1,
+      nodeType: 1,
+      nodeName: 'div',
+      localName: 'div',
+      nodeValue: 'div',
+      children: [],
+      shadowRoots: [],
+    })
+
+    const deferred = pDefer()
+
+    loadProjectAndRunSpec({ enableCloudStudio: true })
+
+    cy.findByTestId('studio-panel').should('not.exist')
+
+    cy.intercept('/cypress/e2e/index.html', () => {
+      // wait for the promise to resolve before responding
+      // this will ensure the studio panel is loaded before the test finishes
+      return deferred.promise
+    }).as('indexHtml')
+
+    cy.contains('visits a basic html page')
+    .closest('.runnable-wrapper')
+    .findByTestId('launch-studio')
+    .click()
+
+    // regular studio is not loaded until after the test finishes
+    cy.get('[data-cy="hook-name-studio commands"]').should('not.exist')
+    // cloud studio is loaded immediately
+    cy.findByTestId('studio-panel').then(() => {
+      // check for the loading panel from the app first
+      cy.get('[data-cy="loading-studio-panel"]').should('be.visible')
+      // we've verified the studio panel is loaded, now resolve the promise so the test can finish
+      deferred.resolve()
+    })
+
+    cy.wait('@indexHtml')
+
+    // Studio re-executes spec before waiting for commands - wait for the spec to finish executing.
+    cy.waitForSpecToFinish()
+
+    // Verify the studio panel is still open
+    cy.findByTestId('studio-panel')
+    cy.get('[data-cy="hook-name-studio commands"]')
+
+    // Verify that AI is enabled
+    cy.get('[data-cy="ai-status-text"]').should('contain.text', 'Enabled')
+
+    // Verify that the AI output is correct
+    cy.get('[data-cy="recommendation-editor"]').should('contain', aiOutput)
+  })
+})