Merge branch 'develop' into ryanm/feat/create-cdp-full-snapshot-at-timestamp

Author: ryanthemanuel

.circleci/workflows.yml

@@ -1,8 +1,8 @@
 version: 2.1
 
-chrome-stable-version: &chrome-stable-version "134.0.6998.165"
-chrome-beta-version: &chrome-beta-version "135.0.7049.41"
-firefox-stable-version: &firefox-stable-version "136.0.3"
+chrome-stable-version: &chrome-stable-version "135.0.7049.52"
+chrome-beta-version: &chrome-beta-version "136.0.7103.17"
+firefox-stable-version: &firefox-stable-version "137.0"
 
 orbs:
   browser-tools: circleci/browser-tools@1.5.2

cli/CHANGELOG.md

@@ -7,6 +7,7 @@ _Released 4/8/2025 (PENDING)_
 
 - Allows for `babel-loader` version 10 to be a peer dependency of `@cypress/webpack-preprocessor`. Fixed in [#31218](https://github.com/cypress-io/cypress/pull/31218).
 - Fixed an issue where Firefox BiDi was prematurely removing prerequests on pending requests. Fixes [#31376](https://github.com/cypress-io/cypress/issues/31376).
+- Fixed an [issue](https://github.com/electron/electron/issues/45398) with Electron causing slow animations and increased test times by starting a CDP screencast with a noop configuration. Fixes [#30980](https://github.com/cypress-io/cypress/issues/30980).
 
 **Misc:**
 
@@ -15,7 +16,7 @@ _Released 4/8/2025 (PENDING)_
 
 **Dependency Updates:**
 
-- Upgraded `mocha` from `7.0.1` to `7.1.1`. Addressed in [#31401](https://github.com/cypress-io/cypress/pull/31401).
+- Upgraded `mocha` from `7.0.1` to `7.2.0`. Addressed in [#31423](https://github.com/cypress-io/cypress/pull/31423) and [#31432](https://github.com/cypress-io/cypress/pull/31432).
 - Upgraded `webdriver` from `9.7.3` to `9.11.0`. Addressed in [#31315](https://github.com/cypress-io/cypress/pull/31315).
 - Upgraded `win-version-info` from `5.0.1` to `6.0.1`. Addressed in [#31358](https://github.com/cypress-io/cypress/pull/31358).
 

package.json

@@ -52,7 +52,7 @@
     "sanitize:mocha:results": "node ./scripts/sanitize-mocha-results.js",
     "prestart": "yarn ensure-deps",
     "start": "cypress open --dev --global",
-    "stop-only": "npx stop-only --skip .cy,.publish,.projects,node_modules,dist,dist-test,fixtures,lib,bower_components,src,__snapshots__ --exclude cypress-tests.ts,*only.cy.js",
+    "stop-only": "npx stop-only --skip .cy,.publish,.projects,node_modules,dist,dist-test,fixtures,lib,bower_components,src,__snapshots__,patches --exclude cypress-tests.ts,*only.cy.js",
     "stop-only-all": "yarn stop-only --folder packages",
     "pretest": "yarn ensure-deps",
     "test": "yarn lerna exec yarn test --scope=cypress --scope=@packages/{config,data-context,driver,electron,errors,extension,https-proxy,launcher,net-stubbing,network,packherd-require,proxy,rewriter,scaffold-config,socket,v8-snapshot-require,telemetry} --scope=@tooling/{electron-mksnapshot,v8-snapshot}",

packages/app/cypress/e2e/runner/event-manager.cy.ts

@@ -0,0 +1,29 @@
+import { loadSpec } from './support/spec-loader'
+
+describe('event-manager', () => {
+  it('emits the cypress:created event when spec is rerun', () => {
+    // load the spec initially
+    loadSpec({
+      filePath: 'hooks/basic.cy.js',
+      passCount: 1,
+    })
+
+    cy.window().then((win) => {
+      const eventManager = win.getEventManager()
+      let eventReceived = false
+
+      // listen for the cypress:created event
+      eventManager.on('cypress:created', (cypress) => {
+        expect(cypress).to.exist
+        expect(cypress).to.not.equal(win.Cypress)
+        eventReceived = true
+      })
+
+      // trigger a rerun
+      cy.get('.restart').click()
+
+      // keep retrying until eventReceived becomes true
+      cy.wrap(() => eventReceived).invoke('call').should('be.true')
+    })
+  })
+})

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

@@ -56,6 +56,8 @@ describe('Cypress Studio', () => {
 
       cy.waitForSpecToFinish()
 
+      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
@@ -70,7 +72,7 @@ describe('Cypress Studio', () => {
       // 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').should('exist').then(() => {
+      cy.findByTestId('studio-panel').then(() => {
         // we've verified the studio panel is loaded, now resolve the promise so the test can finish
         deferred.resolve()
       })
@@ -81,8 +83,8 @@ describe('Cypress Studio', () => {
       cy.waitForSpecToFinish()
 
       // Verify the studio panel is still open
-      cy.findByTestId('studio-panel').should('exist')
-      cy.get('[data-cy="hook-name-studio commands"]').should('exist')
+      cy.findByTestId('studio-panel')
+      cy.get('[data-cy="hook-name-studio commands"]')
     })
   })
 
@@ -1031,11 +1033,11 @@ describe('studio functionality', () => {
 })`)
     })
 
-    cy.findByTestId('studio-toolbar-controls').should('exist')
+    cy.findByTestId('studio-toolbar-controls')
 
     cy.get('button').contains('Save Commands').click()
 
-    cy.findByTestId('studio-toolbar-controls').should('exist')
+    cy.findByTestId('studio-toolbar-controls')
     cy.get('button').contains('Save Commands')
 
     cy.findByTestId('hook-name-studio commands').closest('.hook-studio').within(() => {

packages/app/src/runner/ResizablePanels.vue

@@ -57,7 +57,7 @@
 
     <div
       v-show="showPanel4"
-      data-cy="studio-panel"
+      data-cy="panel-4"
       class="h-full bg-gray-100 relative"
       :style="{width: `${panel4Width}px`}"
     >

packages/app/src/runner/SpecRunnerOpenMode.vue

@@ -1,9 +1,11 @@
 <template>
   <StudioInstructionsModal
+    v-if="studioStore.instructionModalIsOpen"
     :open="studioStore.instructionModalIsOpen"
     @close="studioStore.closeInstructionModal"
   />
   <StudioSaveModal
+    v-if="studioStore.saveModalIsOpen"
     :open="studioStore.saveModalIsOpen"
     @close="studioStore.closeSaveModal"
   />
@@ -99,7 +101,8 @@
       </template>
       <template #panel4>
         <StudioPanel
-          v-show="shouldShowStudioPanel"
+          v-if="shouldShowStudioPanel"
+          data-cy="studio-panel"
           :can-access-studio-a-i="studioStore.canAccessStudioAI"
         />
       </template>

packages/app/src/runner/event-manager.ts

@@ -432,9 +432,9 @@ export class EventManager {
     }
 
     Cypress = this.Cypress = this.$CypressDriver.create(config)
+    this.localBus.emit('cypress:created', Cypress)
 
     // expose Cypress globally
-    // @ts-ignore
     window.Cypress = Cypress
 
     this.studioStore.setup(config)

packages/app/src/studio/StudioPanel.vue

@@ -4,7 +4,7 @@
   </div>
   <div
     v-else
-    ref="root"
+    ref="container"
   >
     Loading the panel...
   </div>
@@ -27,26 +27,30 @@ const props = defineProps<{
 
 interface StudioApp { default: StudioAppDefaultShape }
 
-const root = ref<HTMLElement | null>(null)
+const container = ref<HTMLElement | null>(null)
 const error = ref<string | null>(null)
-const Panel = ref<StudioPanelShape | null>(null)
+const ReactStudioPanel = ref<StudioPanelShape | null>(null)
 const reactRoot = ref<Root | null>(null)
 
 const maybeRenderReactComponent = () => {
-  if (!Panel.value || !!error.value) {
+  // don't render the react component if the react studio panel has not loaded or if there is an error
+  if (!ReactStudioPanel.value || !!error.value) {
     return
   }
 
-  const panel = window.UnifiedRunner.React.createElement(Panel.value, { canAccessStudioAI: props.canAccessStudioAI })
+  const panel = window.UnifiedRunner.React.createElement(ReactStudioPanel.value, { canAccessStudioAI: props.canAccessStudioAI })
+
+  if (!reactRoot.value) {
+    reactRoot.value = window.UnifiedRunner.ReactDOM.createRoot(container.value)
+  }
 
-  reactRoot.value = window.UnifiedRunner.ReactDOM.createRoot(root.value)
   reactRoot.value?.render(panel)
 }
 
 watch(() => props.canAccessStudioAI, maybeRenderReactComponent)
 
 const unmountReactComponent = () => {
-  if (!Panel.value || !root.value) {
+  if (!ReactStudioPanel.value || !container.value) {
     return
   }
 
@@ -86,7 +90,7 @@ loadRemote<StudioApp>('app-studio').then((module) => {
     return
   }
 
-  Panel.value = module.default.StudioPanel
+  ReactStudioPanel.value = module.default.StudioPanel
   maybeRenderReactComponent()
 }).catch((e) => {
   error.value = e.message

packages/driver/package.json

@@ -77,7 +77,7 @@
     "methods": "1.1.2",
     "mime": "^3.0.0",
     "minimatch": "3.1.2",
-    "mocha": "7.1.1",
+    "mocha": "7.2.0",
     "multer": "1.4.4",
     "ordinal": "1.0.3",
     "react-15.6.1": "npm:react@15.6.1",

packages/driver/patches/mocha+7.1.1.dev.patch renamed to packages/driver/patches/mocha+7.2.0.dev.patch

@@ -1,9 +1,51 @@
 diff --git a/node_modules/mocha/CHANGELOG.md b/node_modules/mocha/CHANGELOG.md
 deleted file mode 100644
-index 8c2f86a..0000000
+index 71ef0fc..0000000
 --- a/node_modules/mocha/CHANGELOG.md
 +++ /dev/null
-@@ -1,623 +0,0 @@
+@@ -1,665 +0,0 @@
+-# 7.2.0 / 2020-05-22
+-
+-## :tada: Enhancements
+-
+-- [#4234](https://github.com/mochajs/mocha/issues/4234): Add ability to run tests in a mocha instance multiple times ([**@nicojs**](https://github.com/nicojs))
+-- [#4219](https://github.com/mochajs/mocha/issues/4219): Exposing filename in JSON, doc, and json-stream reporters ([**@Daniel0113**](https://github.com/Daniel0113))
+-- [#4244](https://github.com/mochajs/mocha/issues/4244): Add Root Hook Plugins ([**@boneskull**](https://github.com/boneskull))
+-
+-## :bug: Fixes
+-
+-- [#4258](https://github.com/mochajs/mocha/issues/4258): Fix missing dot in name of configuration file ([**@sonicdoe**](https://github.com/sonicdoe))
+-- [#4194](https://github.com/mochajs/mocha/issues/4194): Check if module.paths really exists ([**@ematipico**](https://github.com/ematipico))
+-- [#4256](https://github.com/mochajs/mocha/issues/4256): `--forbid-only` does not recognize `it.only` when `before` crashes ([**@arvidOtt**](https://github.com/arvidOtt))
+-- [#4152](https://github.com/mochajs/mocha/issues/4152): Bug with multiple async done() calls ([**@boneskull**](https://github.com/boneskull))
+-- [#4275](https://github.com/mochajs/mocha/issues/4275): Improper warnings for invalid reporters ([**@boneskull**](https://github.com/boneskull))
+-- [#4288](https://github.com/mochajs/mocha/issues/4288): Broken hook.spec.js test for IE11 ([**@boneskull**](https://github.com/boneskull))
+-
+-## :book: Documentation
+-
+-- [#4081](https://github.com/mochajs/mocha/issues/4081): Insufficient white space for API docs in view on mobile ([**@HyunSangHan**](https://github.com/HyunSangHan))
+-- [#4255](https://github.com/mochajs/mocha/issues/4255): Update mocha-docdash for UI fixes on API docs ([**@craigtaub**](https://github.com/craigtaub))
+-- [#4235](https://github.com/mochajs/mocha/issues/4235): Enable emoji on website; enable normal ul elements ([**@boneskull**](https://github.com/boneskull))
+-- [#4272](https://github.com/mochajs/mocha/issues/4272): Fetch sponsors at build time, show ALL non-skeevy sponsors ([**@boneskull**](https://github.com/boneskull))
+-
+-## :nut_and_bolt: Other
+-
+-- [#4249](https://github.com/mochajs/mocha/issues/4249): Refactoring improving encapsulation ([**@arvidOtt**](https://github.com/arvidOtt))
+-- [#4242](https://github.com/mochajs/mocha/issues/4242): CI add job names, add Node.js v14 to matrix ([**@boneskull**](https://github.com/boneskull))
+-- [#4237](https://github.com/mochajs/mocha/issues/4237): Refactor validatePlugins to throw coded errors ([**@boneskull**](https://github.com/boneskull))
+-- [#4236](https://github.com/mochajs/mocha/issues/4236): Better debug output ([**@boneskull**](https://github.com/boneskull))
+-
+-# 7.1.2 / 2020-04-26
+-
+-## :nut_and_bolt: Other
+-
+-- [#4251](https://github.com/mochajs/mocha/issues/4251): Prevent karma-mocha from stalling ([**@juergba**](https://github.com/juergba))
+-- [#4222](https://github.com/mochajs/mocha/issues/4222): Update dependency mkdirp to v0.5.5 ([**@outsideris**](https://github.com/outsideris))
+-
+-## :book: Documentation
+-
+-- [#4208](https://github.com/mochajs/mocha/issues/4208): Add Wallaby logo to site ([**@boneskull**](https://github.com/boneskull))
+-
 -# 7.1.1 / 2020-03-18
 -
 -## :lock: Security Fixes
@@ -541,7 +583,7 @@ index 8c2f86a..0000000
 -
 -- [#3226](https://github.com/mochajs/mocha/issues/3226): Do not swallow errors that are thrown asynchronously from passing tests ([@boneskull](https://github.com/boneskull)). Example:
 -
--  \```js
+-  \`\`\`js
 -  it('should actually fail, sorry!', function (done) {
 -  // passing assertion
 -  assert(true === true);
@@ -554,7 +596,7 @@ index 8c2f86a..0000000
 -  throw new Error('chaos!');
 -  }, 100);
 -  });
--  \```
+-  \`\`\`
 -
 -  Previously to this version, Mocha would have _silently swallowed_ the `chaos!` exception, and you wouldn't know. Well, _now you know_. Mocha cannot recover from this gracefully, so it will exit with a nonzero code.
 -
@@ -747,23 +789,23 @@ deleted file mode 100644
 index b3623a5..0000000
 Binary files a/node_modules/mocha/assets/growl/ok.png and /dev/null differ
 diff --git a/node_modules/mocha/lib/mocha.js b/node_modules/mocha/lib/mocha.js
-index 740e1fd..0cd2769 100644
+index 1983690..ee096a3 100644
 --- a/node_modules/mocha/lib/mocha.js
 +++ b/node_modules/mocha/lib/mocha.js
-@@ -904,7 +904,7 @@ Mocha.prototype.run = function(fn) {
-   options.files = this.files;
-   var runner = new exports.Runner(suite, options.delay);
+@@ -1014,7 +1014,7 @@ Mocha.prototype.run = function(fn) {
+     cleanReferencesAfterRun: this._cleanReferencesAfterRun
+   });
    createStatsCollector(runner);
 -  var reporter = new this._reporter(runner, options);
 +  var reporter = this._reporter(runner, options);
    runner.checkLeaks = options.checkLeaks === true;
    runner.fullStackTrace = options.fullTrace;
    runner.asyncOnly = options.asyncOnly;
 diff --git a/node_modules/mocha/lib/runner.js b/node_modules/mocha/lib/runner.js
-index 8e7c873..5208e60 100644
+index 20a6af2..2123646 100644
 --- a/node_modules/mocha/lib/runner.js
 +++ b/node_modules/mocha/lib/runner.js
-@@ -682,9 +682,43 @@ Runner.prototype.runTests = function(suite, fn) {
+@@ -755,9 +755,42 @@ Runner.prototype.runTests = function(suite, fn) {
            }
            self.emit(constants.EVENT_TEST_END, test);
            return self.hookUp(HOOK_TYPE_AFTER_EACH, next);
@@ -803,13 +845,12 @@ index 8e7c873..5208e60 100644
 +
            var retry = test.currentRetry();
 -          if (retry < test.retries()) {
-+
 +          // requeue the test if we have retries and haven't satisfied our retry configuration.
 +          if (retry < test.retries() && testStatusInfo.shouldAttemptsContinue) {
              var clonedTest = test.clone();
              clonedTest.currentRetry(retry + 1);
              tests.unshift(clonedTest);
-@@ -694,8 +728,25 @@ Runner.prototype.runTests = function(suite, fn) {
+@@ -767,8 +800,25 @@ Runner.prototype.runTests = function(suite, fn) {
              // Early return + hook trigger so that it doesn't
              // increment the count wrong
              return self.hookUp(HOOK_TYPE_AFTER_EACH, next);

packages/driver/src/cypress/source_map_utils.ts

@@ -6,7 +6,7 @@ import type { BasicSourceMapConsumer } from 'source-map'
 import mappingsWasm from 'source-map/lib/mappings.wasm'
 
 import $utils from './utils'
-import stackUtils from './stack_utils'
+import { toPosix } from './util/to_posix'
 
 const sourceMapExtractionRegex = /\/\/\s*[@#]\s*sourceMappingURL\s*=\s*(data:[^\s]*)/g
 const regexDataUrl = /data:[^;\n]+(?:;charset=[^;\n]+)?;base64,([a-zA-Z0-9+/]+={0,2})/ // matches data urls
@@ -23,7 +23,7 @@ const initializeSourceMapConsumer = async (script, sourceMap): Promise<BasicSour
 
   const consumer = await new SourceMapConsumer(sourceMap)
 
-  sourceMapConsumers[stackUtils.toPosix(script.fullyQualifiedUrl)] = consumer
+  sourceMapConsumers[toPosix(script.fullyQualifiedUrl)] = consumer
 
   return consumer
 }
@@ -56,7 +56,7 @@ const extractSourceMap = (fileContents) => {
 }
 
 const getSourceContents = (filePath, sourceFile) => {
-  const posixFilePath = stackUtils.toPosix(filePath)
+  const posixFilePath = toPosix(filePath)
 
   if (!sourceMapConsumers[posixFilePath]) return null
 
@@ -72,7 +72,7 @@ const getSourceContents = (filePath, sourceFile) => {
 }
 
 const getSourcePosition = (filePath, position) => {
-  const posixFilePath = stackUtils.toPosix(filePath)
+  const posixFilePath = toPosix(filePath)
   const sourceMapConsumer = sourceMapConsumers[posixFilePath]
 
   if (!sourceMapConsumer) return null

packages/driver/src/cypress/stack_utils.ts

@@ -15,7 +15,7 @@ import { codeFrameColumns } from '@babel/code-frame'
 
 import $utils from './utils'
 import $sourceMapUtils from './source_map_utils'
-
+import { toPosix } from './util/to_posix'
 // Intentionally deep-importing from @packages/errors so as to not bundle the entire @packages/errors in the client unnecessarily
 import { getStackLines, replacedStack, stackWithoutMessage, splitStack, unsplitStack, stackLineRegex } from '@packages/errors/src/stackUtils'
 
@@ -184,12 +184,6 @@ const getCodeFrameFromSource = (sourceCode, { line, column: originalColumn, rela
   }
 }
 
-export const toPosix = (file: string) => {
-  return Cypress.config('platform') === 'win32'
-    ? file.replaceAll('\\', '/')
-    : file
-}
-
 const getRelativePathFromRoot = (relativeFile: string, absoluteFile?: string) => {
   // at this point relativeFile is relative to the cypress config
   // we need it to be relative to the repo root, which is different for monorepos
@@ -549,5 +543,4 @@ export default {
   stackWithUserInvocationStackSpliced,
   captureUserInvocationStack,
   getInvocationDetails,
-  toPosix,
 }