Merge branch 'develop' into release/15.0.0

jennifer-shehane · web-flow · commit 968dabbe455b · 2025-06-17T13:51:52.000-04:00
diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
@@ -1,11 +1,11 @@
 version: 2.1
 
 chrome-stable-version: &chrome-stable-version "137.0.7151.103"
-chrome-beta-version: &chrome-beta-version "138.0.7204.15"
+chrome-beta-version: &chrome-beta-version "138.0.7204.23"
 firefox-stable-version: &firefox-stable-version "137.0"
 
 orbs:
-  browser-tools: circleci/browser-tools@2.1.0
+  browser-tools: circleci/browser-tools@2.1.1
 
 defaults: &defaults
   parallelism: 1
@@ -578,11 +578,6 @@ commands:
         description: whether or not to install google chrome for testing
         type: boolean
         default: false
-      google-chrome-for-testing-channel:
-        description: Google Chrome for Testing channel to install
-        type: string
-        # can be stable, beta, dev, or canary
-        default: stable
       google-chrome-for-testing-version:
         description: Google Chrome for Testing version to install
         type: string
@@ -635,13 +630,13 @@ commands:
                   equal: [ true, << parameters.install-chrome-for-testing >> ]
                 steps:
                   - run:
-                      name: Install Chrome for Testing and link it to google-chrome
+                      name: Install unzip
                       command: |
-                        INSTALL_OUTPUT=$(npx @puppeteer/browsers install chrome@<<parameters.google-chrome-version>> --path /tmp/chrome-for-testing)
-                        DOWNLOAD_DIR=$(echo "$INSTALL_OUTPUT" | grep -o '\/.*\/chrome-linux64')
-                        mv $DOWNLOAD_DIR /opt/chrome-for-testing
-                        ln -fs /opt/chrome-for-testing/chrome /usr/local/bin/chrome
-                        rm -rf /tmp/chrome-for-testing
+                        apt-get update && apt-get install -y unzip
+                  - browser-tools/install_chrome_for_testing:
+                      version: << parameters.google-chrome-for-testing-version >>
+                      install_chromedriver: false
+
   # This code builds better-sqlite3 on Debian 10 (Buster). This is necessary because Debian 10 has the oldest glibc version (2.28) that we support.
   #
   # Since this is running Docker remote (because the job running the command may not be using an executor with the appropriate glibc version), we need to 
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -26,7 +26,7 @@ _Released 07/01/2025 (PENDING)_
 
 ## 14.5.0
 
-_Released 6/17/2025 (PENDING)_
+_Released 6/17/2025_
 
 **Features:**
 
diff --git a/cli/lib/util.js b/cli/lib/util.js
@@ -2,7 +2,7 @@ const _ = require('lodash')
 const arch = require('arch')
 const os = require('os')
 const ospath = require('ospath')
-const crypto = require('crypto')
+const hasha = require('hasha')
 const la = require('lazy-ass')
 const is = require('check-more-types')
 const tty = require('tty')
@@ -30,31 +30,11 @@ const getosAsync = Promise.promisify(getos)
 
 /**
  * Returns SHA512 of a file
- *
- * Implementation lifted from https://github.com/sindresorhus/hasha
- * but without bringing that dependency (since hasha is Node v8+)
  */
 const getFileChecksum = (filename) => {
   la(is.unemptyString(filename), 'expected filename', filename)
 
-  const hashStream = () => {
-    const s = crypto.createHash('sha512')
-
-    s.setEncoding('hex')
-
-    return s
-  }
-
-  return new Promise((resolve, reject) => {
-    const stream = fs.createReadStream(filename)
-
-    stream.on('error', reject)
-    .pipe(hashStream())
-    .on('error', reject)
-    .on('finish', function () {
-      resolve(this.read())
-    })
-  })
+  return hasha.fromFile(filename, { algorithm: 'sha512' })
 }
 
 const getFileSize = (filename) => {
diff --git a/cli/package.json b/cli/package.json
@@ -46,6 +46,7 @@
     "figures": "^3.2.0",
     "fs-extra": "^9.1.0",
     "getos": "^3.2.1",
+    "hasha": "5.2.2",
     "is-installed-globally": "~0.4.0",
     "lazy-ass": "^1.6.0",
     "listr2": "^3.8.3",
@@ -91,7 +92,6 @@
     "dependency-check": "4.1.0",
     "dtslint": "4.2.1",
     "execa-wrap": "1.4.0",
-    "hasha": "5.2.2",
     "mocha": "6.2.2",
     "mock-fs": "5.4.0",
     "mocked-env": "1.3.2",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "14.4.1",
+  "version": "14.5.0",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {
@@ -165,8 +165,7 @@
     "gulp-awspublish": "8.0.0",
     "gulp-debug": "4.0.0",
     "gulp-rename": "1.4.0",
-    "hasha": "5.0.0",
-    "http-server": "0.12.3",
+    "hasha": "5.2.2",
     "human-interval": "1.0.0",
     "husky": "7.0.2",
     "inquirer": "8.2.4",
diff --git a/packages/app/README.md b/packages/app/README.md
@@ -17,7 +17,7 @@ This is the front-end for the Cypress App.
 Cypress has two modes: `run` and `open`. We want run mode to be as light and fast as possible, since this is the mode used to run on CI machines, etc. Run mode has minimal UI showing only what is necessary. Open mode is the interactive experience.
 
 - **`open`** mode is driven using GraphQL and urql. It shows the full Cypress app, include the top nav, side nav, spec list, etc. You can change between testing types, check your latest runs on Cypress Cloud, update settings, etc.
-- **`run`** mode is does not rely on GraphQL. This is so we can be as performant as possible. It only renders the "runner" part of the UI, which is comprised of the command log, Spec Runner header, and AUT iframe.
+- **`run`** mode does not rely on GraphQL. This is so we can be as performant as possible. It only renders the "runner" part of the UI, which is comprised of the command log, Spec Runner header, and AUT iframe.
 
 The two modes are composed using the same logic, but have slightly different components. You can see where the differences are in `Runner.vue`(src/pages/Specs/Runner.vue). Notice that `<SpecRunnerOpenMode>` receives a `gql` prop, since it uses GraphQL, and `<SpecRunnerRunMode>` does not.
 
diff --git a/packages/app/cypress/e2e/runs.cy.ts b/packages/app/cypress/e2e/runs.cy.ts
@@ -564,8 +564,9 @@ describe('App: Runs', { viewportWidth: 1200 }, () => {
       })
 
       cy.visitApp('/runs')
+      cy.findByText(defaultMessages.runs.errors.unauthorized.button).should('be.visible')
       cy.findByText(defaultMessages.runs.errors.unauthorized.button).click()
-      cy.findByText(defaultMessages.runs.errors.unauthorizedRequested.button).should('exist')
+      cy.findByText(defaultMessages.runs.errors.unauthorizedRequested.button).should('be.visible')
     })
   })
 
diff --git a/packages/app/cypress/e2e/studio/studio-cloud.cy.ts b/packages/app/cypress/e2e/studio/studio-cloud.cy.ts
@@ -227,4 +227,35 @@ describe('studio functionality', () => {
     // verify studio is still open
     cy.findByTestId('studio-panel').should('be.visible')
   })
+
+  it('does not record studio commands when cloud studio is enabled', () => {
+    launchStudio({ enableCloudStudio: true })
+
+    cy.findByTestId('studio-panel').should('be.visible')
+
+    // Attempt to perform actions that would normally be recorded in regular studio
+    // but should NOT be recorded in when cloud studio is enabled because event listeners are not attached
+    cy.getAutIframe().within(() => {
+      cy.get('p').contains('Count is 0')
+
+      // Try to click the increment button - this should NOT be recorded
+      // because cloud studio event listeners should not be attached
+      cy.get('#increment').realClick().then(() => {
+        cy.get('p').contains('Count is 1')
+      })
+    })
+
+    // Verify that no legacy studio commands were recorded
+    cy.get('.command-is-studio').should('not.exist')
+
+    // Verify that the actual DOM interactions still work (button was clicked, counter incremented)
+    // but they just weren't recorded by the legacy studio event listeners
+    cy.getAutIframe().within(() => {
+      cy.get('p').should('contain', 'Count is 1')
+    })
+
+    cy.findByTestId('studio-panel').should('be.visible')
+
+    cy.get('[data-cy="studio-toolbar"]').should('not.exist')
+  })
 })
diff --git a/packages/app/src/runner/SpecRunnerOpenMode.vue b/packages/app/src/runner/SpecRunnerOpenMode.vue
@@ -102,6 +102,7 @@
           <StudioPanel
             v-if="shouldShowStudioPanel"
             data-cy="studio-panel"
+            :cloud-studio-session-id="studioStore.cloudStudioSessionId"
             :can-access-studio-a-i="studioStore.canAccessStudioAI"
             :on-studio-panel-close="handleStudioPanelClose"
             :event-manager="eventManager"
@@ -269,6 +270,8 @@ useSubscription({ query: StudioStatus_ChangeDocument }, (_, data) => {
 })
 
 const cloudStudioRequested = computed(() => {
+  studioStore.setCloudStudioRequested(props.gql.cloudStudioRequested || false)
+
   return props.gql.cloudStudioRequested
 })
 
diff --git a/packages/app/src/runner/event-manager.ts b/packages/app/src/runner/event-manager.ts
@@ -283,27 +283,29 @@ export class EventManager {
       this.studioStore.setSuiteId(suiteId)
       this.studioStore.setShowUrlPrompt(showUrlPrompt)
 
-      this.ws.emit('studio:init', ({ canAccessStudioAI, error }) => {
+      this.ws.emit('studio:init', ({ canAccessStudioAI, cloudStudioSessionId, error }) => {
         if (error) {
           // eslint-disable-next-line no-console
           console.error(error)
         }
 
         this.studioStore.setCanAccessStudioAI(canAccessStudioAI)
+        this.studioStore.setCloudStudioSessionId(cloudStudioSessionId)
         studioInit()
       })
     }
 
     this.reporterBus.on('studio:init:test', (testId) => {
       this.studioStore.setTestId(testId)
 
-      this.ws.emit('studio:init', ({ canAccessStudioAI, error }) => {
+      this.ws.emit('studio:init', ({ canAccessStudioAI, cloudStudioSessionId, error }) => {
         if (error) {
           // eslint-disable-next-line no-console
           console.error(error)
         }
 
         this.studioStore.setCanAccessStudioAI(canAccessStudioAI)
+        this.studioStore.setCloudStudioSessionId(cloudStudioSessionId)
         studioInit()
       })
     })
diff --git a/packages/app/src/store/studio-store.ts b/packages/app/src/store/studio-store.ts
@@ -122,6 +122,8 @@ interface StudioRecorderState {
 
   canAccessStudioAI: boolean
   showUrlPrompt: boolean
+  cloudStudioRequested: boolean
+  cloudStudioSessionId?: string
 }
 
 export const useStudioStore = defineStore('studioRecorder', {
@@ -138,10 +140,16 @@ export const useStudioStore = defineStore('studioRecorder', {
       _currentId: 1,
       canAccessStudioAI: false,
       showUrlPrompt: true,
+      cloudStudioRequested: false,
+      cloudStudioSessionId: undefined,
     }
   },
 
   actions: {
+    setCloudStudioRequested (cloudStudioRequested: boolean) {
+      this.cloudStudioRequested = cloudStudioRequested
+    },
+
     setShowUrlPrompt (shouldShowUrlPrompt: boolean) {
       this.showUrlPrompt = shouldShowUrlPrompt
     },
@@ -161,6 +169,10 @@ export const useStudioStore = defineStore('studioRecorder', {
       this.canAccessStudioAI = canAccessStudioAI
     },
 
+    setCloudStudioSessionId (cloudStudioSessionId: string) {
+      this.cloudStudioSessionId = cloudStudioSessionId
+    },
+
     clearRunnableIds () {
       this.testId = undefined
       this.suiteId = undefined
@@ -498,6 +510,11 @@ export const useStudioStore = defineStore('studioRecorder', {
 
       this._body = body
 
+      // if we're in cloud studio, we shouldn't attach our own listeners - cloud studio will handle it
+      if (this.cloudStudioRequested) {
+        return
+      }
+
       for (const event of eventTypes) {
         this._body.addEventListener(event, this._recordEvent, {
           capture: true,
@@ -853,7 +870,7 @@ export const useStudioStore = defineStore('studioRecorder', {
       return $el.hasClass('__cypress-studio-assertions-menu')
     },
 
-    _openAssertionsMenu (event) {
+    _openAssertionsMenu (event, addAssertion?: ($el: HTMLElement | JQuery<HTMLElement>, ...args: AssertionArgs) => void, generatePossibleAssertions?: ($el: JQuery<Element>) => PossibleAssertions) {
       if (!this._body) {
         throw Error('this._body was not defined')
       }
@@ -873,8 +890,8 @@ export const useStudioStore = defineStore('studioRecorder', {
         $el,
         $body: window.UnifiedRunner.CypressJQuery(this._body),
         props: {
-          possibleAssertions: this._generatePossibleAssertions($el),
-          addAssertion: this._addAssertion,
+          possibleAssertions: generatePossibleAssertions ? generatePossibleAssertions($el) : this._generatePossibleAssertions($el),
+          addAssertion: addAssertion || this._addAssertion,
           closeMenu: this._closeAssertionsMenu,
         },
       })
diff --git a/packages/app/src/studio/StudioPanel.vue b/packages/app/src/studio/StudioPanel.vue
@@ -52,6 +52,7 @@ const props = defineProps<{
   onStudioPanelClose: () => void
   eventManager: EventManager
   studioStatus: string | null
+  cloudStudioSessionId?: string
 }>()
 
 interface StudioApp { default: StudioAppDefaultShape }
@@ -71,7 +72,11 @@ const maybeRenderReactComponent = () => {
     return
   }
 
-  const panel = window.UnifiedRunner.React.createElement(ReactStudioPanel.value, { canAccessStudioAI: props.canAccessStudioAI, onStudioPanelClose: props.onStudioPanelClose })
+  const panel = window.UnifiedRunner.React.createElement(ReactStudioPanel.value, {
+    canAccessStudioAI: props.canAccessStudioAI,
+    onStudioPanelClose: props.onStudioPanelClose,
+    studioSessionId: props.cloudStudioSessionId,
+  })
 
   if (!reactRoot.value) {
     reactRoot.value = window.UnifiedRunner.ReactDOM.createRoot(container.value)
@@ -81,6 +86,7 @@ const maybeRenderReactComponent = () => {
 }
 
 watch(() => props.canAccessStudioAI, maybeRenderReactComponent)
+watch(() => props.cloudStudioSessionId, maybeRenderReactComponent)
 
 const unmountReactComponent = () => {
   if (!ReactStudioPanel.value || !container.value) {
diff --git a/packages/app/src/studio/studio-app-types.ts b/packages/app/src/studio/studio-app-types.ts
@@ -1,6 +1,7 @@
 export interface StudioPanelProps {
   canAccessStudioAI: boolean
   onStudioPanelClose?: () => void
+  studioSessionId?: string
   useRunnerStatus?: RunnerStatusShape
   useTestContentRetriever?: TestContentRetrieverShape
   useStudioAIStream?: StudioAIStreamShape
diff --git a/packages/server/lib/cloud/studio/studio.ts b/packages/server/lib/cloud/studio/studio.ts
@@ -84,6 +84,14 @@ export class StudioManager implements StudioManagerShape {
     await this.invokeAsync('initializeStudioAI', { isEssential: true }, options)
   }
 
+  updateSessionId (sessionId: string): void {
+    if (this._studioServer && typeof this._studioServer.updateSessionId === 'function') {
+      this.invokeSync('updateSessionId', { isEssential: false }, sessionId)
+    } else {
+      debug('updateSessionId method not available on studio server')
+    }
+  }
+
   async destroy (): Promise<void> {
     await this.invokeAsync('destroy', { isEssential: true })
   }
diff --git a/packages/server/lib/project-base.ts b/packages/server/lib/project-base.ts
diff --git a/packages/server/lib/socket-base.ts b/packages/server/lib/socket-base.ts
diff --git a/packages/server/test/unit/socket_spec.js b/packages/server/test/unit/socket_spec.js
diff --git a/packages/types/src/studio/studio-server-types.ts b/packages/types/src/studio/studio-server-types.ts
diff --git a/yarn.lock b/yarn.lock
