Merge branch 'develop' into csv-benchmark

Author: cacieprins

.github/ISSUE_TEMPLATE/1-bug-report.yml

@@ -5,14 +5,14 @@ body:
     attributes:
       value: |
         ## If you are a customer of Cypress Cloud please utilize our [Support Portal](https://www.cypress.io/support/) for our fastest support!
-        
-        ### Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions).  
+
+        ### Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions).
         Issues in the Cypress repo are reserved for bugs and feature requests only.  Questions on how to use Cypress will be closed.
   - type: textarea
     id: current-behavior
     attributes:
       label: Current behavior
-      description: Please provide a description including screenshots, stack traces, etc. [Troubleshooting tips](https://on.cypress.io/troubleshooting).
+      description: Please provide a description including screenshots, stack traces, etc. [Troubleshooting tips](https://docs.cypress.io/app/references/troubleshooting).
       placeholder: Currently...
     validations:
       required: true

.github/ISSUE_TEMPLATE/3-install-issue.yml

@@ -6,23 +6,23 @@ body:
     attributes:
       value: |
         ## If you are a customer of Cypress Cloud please utilize our [Support Portal](https://www.cypress.io/support/) for our fastest support!
-        
+
         ### Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions).
 
         If you're behind a corporate proxy, make sure to [configure it properly](https://on.cypress.io/proxy-configuration) before install.
   - type: textarea
     id: current-behavior
     attributes:
       label: Current behavior
-      description: Please provide a description including screenshots, stack traces, DEBUG logs, etc. [Troubleshooting tips](https://on.cypress.io/troubleshooting)
+      description: Please provide a description including screenshots, stack traces, DEBUG logs, etc. [Troubleshooting tips](https://docs.cypress.io/app/references/troubleshooting)
       placeholder: When I try to download Cypress...
     validations:
       required: true
   - type: textarea
     id: debug-logs
     attributes:
       label: Debug logs
-      description: Include DEBUG logs setting [`DEBUG=cypress:*`](https://on.cypress.io/troubleshooting#Print-DEBUG-logs/). Include npm/yarn logs if applicable.
+      description: Include DEBUG logs setting [`DEBUG=cypress:*`](https://docs.cypress.io/app/references/troubleshooting#Print-DEBUG-logs/). Include npm/yarn logs if applicable.
       placeholder: Debug logs
       render: Text
   - type: input

.github/ISSUE_TEMPLATE/5-cy-prompt-issue.yml

@@ -11,7 +11,7 @@ body:
     id: current-behavior
     attributes:
       label: Current behavior
-      description: Please provide a description including screenshots, stack traces, etc. [Troubleshooting tips](https://on.cypress.io/troubleshooting).
+      description: Please provide a description including screenshots, stack traces, etc. [Troubleshooting tips](https://docs.cypress.io/app/references/troubleshooting).
       placeholder: Currently...
     validations:
       required: true

.github/workflows/update-browser-versions.yml

@@ -7,6 +7,8 @@ on:
 jobs:
   update-browser-versions:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     env:
       CYPRESS_BOT_APP_ID: ${{ secrets.CYPRESS_BOT_APP_ID }}
       BASE_BRANCH: develop
@@ -47,7 +49,7 @@ jobs:
       - name: Determine name of new branch and if it already exists
         id: check-branch
         env:
-          BRANCH_NAME: update-chrome-stable-from-${{ steps.get-versions.outputs.current_stable_version }}-beta-from-${{ steps.get-versions.outputs.current_beta_version }}
+          BRANCH_NAME: update-chrome-stable-from-${{ steps.get-versions.outputs.latest_stable_version }}-beta-from-${{ steps.get-versions.outputs.latest_beta_version }}
         run: |
           echo "branch_name=${{ env.BRANCH_NAME }}" >> $GITHUB_OUTPUT
           echo "branch_exists=$(git show-ref --verify --quiet refs/remotes/origin/${{ env.BRANCH_NAME }} && echo 'true')" >> $GITHUB_OUTPUT
@@ -127,5 +129,4 @@ jobs:
               branchName: '${{ steps.check-branch.outputs.branch_name }}',
               description: '${{ steps.get-versions.outputs.description }}',
               body: 'This PR was auto-generated to update the version(s) of Chrome for driver tests',
-              addToProjectBoard: true,
             })

guides/studio-development.md

@@ -70,7 +70,7 @@ To ensure that we get the same results from our Studio AI calls every time, we s
 
 ```js
 const aiOutput = 'cy.get(\'button\').should(\'have.text\', \'Increment\')'
-cy.mockNodeCloudStreamingRequest({
+cy.mockNodeCloudRequest({
   url: '/studio/testgen/n69px6/generate',
   method: 'post',
   body: { recommendations: [{ content: aiOutput }] },

package.json

@@ -110,7 +110,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/getenv": "^1.0.3",
     "@types/glob": "7.1.1",
-    "@types/gulp": "^4.0.9",
+    "@types/gulp": "^4.0.18",
     "@types/lodash": "^4.14.168",
     "@types/markdown-it": "12.2.3",
     "@types/mocha": "8.0.3",

packages/app/cypress/e2e/studio/studio-state-management.cy.ts

@@ -68,6 +68,12 @@ describe('Cypress Studio - State Management', () => {
   it('remains in studio mode when the test name is changed on the file system and file watching is disabled', () => {
     launchStudio({ cliArgs: ['--config', 'watchForFileChanges=false'] })
 
+    // since we aren't logged in, we need to close the connect to cloud panel
+    cy.get('[data-cy="studio-error"]').within(() => {
+      cy.contains('Connect to Cypress Cloud').should('be.visible')
+      cy.get('[aria-label="Close"]').click()
+    })
+
     cy.findByTestId('record-button-recording').should('be.visible')
 
     incrementCounter(0)

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

@@ -146,24 +146,23 @@ describe('studio functionality', () => {
     cy.location().its('hash').should('contain', 'suiteId=r1').and('not.contain', 'testId=')
   })
 
-  // TODO: un-skip this test when we enable Studio AI
-  it.skip('opens a cloud studio session with AI enabled', () => {
+  it('opens a cloud studio session with AI enabled', () => {
     cy.mockNodeCloudRequest({
-      url: '/studio/testgen/n69px6/enabled',
+      url: '/studio/config?projectSlug=n69px6',
       method: 'get',
-      body: { enabled: true },
+      body: { AI: { enabled: true } },
     })
 
     // this endpoint gets called twice, so we need to mock it twice
     cy.mockNodeCloudRequest({
-      url: '/studio/testgen/n69px6/enabled',
+      url: '/studio/config?projectSlug=n69px6',
       method: 'get',
-      body: { enabled: true },
+      body: { AI: { enabled: true } },
     })
 
     const aiOutput = 'cy.get(\'button\').should(\'have.text\', \'Increment\')'
 
-    cy.mockNodeCloudStreamingRequest({
+    cy.mockNodeCloudRequest({
       url: '/studio/testgen/n69px6/generate',
       method: 'post',
       body: { recommendations: [{ content: aiOutput }] },
@@ -182,50 +181,26 @@ describe('studio functionality', () => {
       url: 'http://localhost:3000/cypress/e2e/index.html',
     })
 
-    const deferred = pDefer()
-
-    loadProjectAndRunSpec()
-
-    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()
-
-    // cloud studio is loaded immediately
-    cy.findByTestId('studio-panel').then(() => {
-      // check for the loading panel from the app first
-      cy.findByTestId('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')
-
-    // make sure studio is not loading
-    cy.findByTestId('loading-studio-panel').should('not.exist')
-
-    // Verify that AI is enabled
-    cy.findByTestId('ai-status-text').should('contain.text', 'Enabled')
+    launchStudio()
 
     // Verify that the AI output is correct
-    cy.findByTestId('recommendation-editor').should('contain', aiOutput)
+    cy.get('.cm-is-recommendation-line').should('contain', aiOutput)
   })
 
   it('studio AI is marked as coming soon', () => {
+    cy.mockNodeCloudRequest({
+      url: '/studio/config?projectSlug=n69px6',
+      method: 'get',
+      body: { AI: { enabled: false, disabledReason: 'studio_ai_feature_flag_disabled' }, featureFlags: { studioAI: false } },
+    })
+
+    // this endpoint gets called twice, so we need to mock it twice
+    cy.mockNodeCloudRequest({
+      url: '/studio/config?projectSlug=n69px6',
+      method: 'get',
+      body: { AI: { enabled: false, disabledReason: 'studio_ai_feature_flag_disabled' }, featureFlags: { studioAI: false } },
+    })
+
     launchStudio()
 
     // Verify that AI is coming soon

packages/data-context/package.json

@@ -101,7 +101,7 @@
     "@types/dedent": "^0.7.2",
     "@types/ejs": "^3.1.5",
     "@types/fs-extra": "^8.1.5",
-    "@types/graphql-resolve-batch": "1.1.6",
+    "@types/graphql-resolve-batch": "1.1.11",
     "@types/jest": "^30.0.0",
     "@types/micromatch": "4.0.9",
     "@types/parse-glob": "3.0.29",

packages/data-context/src/data/ProjectConfigIpc.ts

@@ -246,6 +246,7 @@ export class ProjectConfigIpc extends EventEmitter {
       })
 
       this.once('file:preprocessor:overridden', ({ handlerText }) => {
+        debug('file:preprocessor:overridden: %s', handlerText)
         this.onDebugData({
           filePreprocessorHandlerText: handlerText,
         })