Merge branch 'develop' into release/14.0.0

Author: AtofStryker

browser-versions.json

@@ -1,5 +1,5 @@
 {
-  "chrome:beta": "132.0.6834.15",
-  "chrome:stable": "131.0.6778.85",
+  "chrome:beta": "132.0.6834.32",
+  "chrome:stable": "131.0.6778.108",
   "chrome:minimum": "64.0.3282.0"
 }

cli/CHANGELOG.md

@@ -70,7 +70,6 @@ _Released 12/03/2024_
 
 **Bugfixes:**
 
-- Support multiple imports of one module with multiple lines. Addressed in [#30314](https://github.com/cypress-io/cypress/pull/30314).
 - During recorded or parallel runs, execution will fail if Cypress is unable to confirm the creation of an instance instead of skipping the spec. Addresses [#30628](https://github.com/cypress-io/cypress/issues/30628).
 
 ## 13.16.0

npm/vite-plugin-cypress-esm/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/vite-plugin-cypress-esm-v1.1.2](https://github.com/cypress-io/cypress/compare/@cypress/vite-plugin-cypress-esm-v1.1.1...@cypress/vite-plugin-cypress-esm-v1.1.2) (2024-12-03)
+
+
+### Bug Fixes
+
+* support multiple imports of one module with multiple lines ([#30314](https://github.com/cypress-io/cypress/issues/30314)) ([12df40e](https://github.com/cypress-io/cypress/commit/12df40ed8c1101c5c4053a1fe63c06fcd2809bc7))
+
 # [@cypress/vite-plugin-cypress-esm-v1.1.1](https://github.com/cypress-io/cypress/compare/@cypress/vite-plugin-cypress-esm-v1.1.0...@cypress/vite-plugin-cypress-esm-v1.1.1) (2024-05-10)
 
 

packages/https-proxy/test/integration/proxy_spec.js

@@ -90,29 +90,31 @@ describe('Proxy', () => {
     })
   })
 
-  it('closes outgoing connections when client disconnects', function () {
+  it('closes outgoing connections when client disconnects', async function () {
     this.sandbox.spy(net, 'connect')
 
-    return request({
+    await request({
       strictSSL: false,
       url: 'https://localhost:8444/replace',
       proxy: 'http://localhost:3333',
       resolveWithFullResponse: true,
     })
-    .then(() => {
-      // ensure the outgoing socket created for this connection was destroyed
-      expect(net.connect).calledOnce
 
-      const socket = net.connect.getCalls()[0].returnValue
+    // ensure the outgoing socket created for this connection was destroyed
+    expect(net.connect).calledOnce
 
-      return new Promise((resolve) => {
+    const socket = net.connect.getCalls()[0].returnValue
+
+    // sometimes the close event happens before we can attach the listener, causing this test to flake
+    if (!socket.destroyed || !socket.readyState === 'closed') {
+      await new Promise((resolve) => {
         socket.on('close', () => {
           expect(socket.destroyed).to.be.true
 
           resolve()
         })
       })
-    })
+    }
   })
 
   it('can boot the httpServer', () => {
@@ -127,7 +129,9 @@ describe('Proxy', () => {
     })
   })
 
-  context('generating certificates', () => {
+  context('generating certificates', function () {
+    this.retries(4)
+
     it('reuses existing certificates', function () {
       return request({
         strictSSL: false,
@@ -270,13 +274,13 @@ describe('Proxy', () => {
       process.env.npm_config_noproxy = 'just,some,nonsense'
 
       process.env.NO_PROXY = ''
-      process.env.HTTP_PROXY = process.env.HTTPS_PROXY = 'http://localhost:9001'
+      process.env.HTTP_PROXY = process.env.HTTPS_PROXY = 'http://localhost:2222'
 
       this.upstream = new DebugProxy({
         keepRequests: true,
       })
 
-      return this.upstream.start(9001)
+      return this.upstream.start(2222)
     })
 
     it('passes a request to an https server through the upstream', function () {
@@ -309,7 +313,7 @@ describe('Proxy', () => {
         return true
       }
 
-      process.env.HTTP_PROXY = (process.env.HTTPS_PROXY = 'http://foo:bar@localhost:9001')
+      process.env.HTTP_PROXY = process.env.HTTPS_PROXY = 'http://foo:bar@localhost:2222'
 
       return request({
         strictSSL: false,
@@ -335,10 +339,9 @@ describe('Proxy', () => {
       expect(net.connect).calledOnce
       const socket = net.connect.getCalls()[0].returnValue
 
-      // sometimes the close event happens before we can attach the listener,
-      // causing this test to flake
+      // sometimes the close event happens before we can attach the listener, causing this test to flake
       if (!socket.destroyed || !socket.readyState === 'closed') {
-        return new Promise((resolve) => {
+        await new Promise((resolve) => {
           socket.on('close', () => {
             expect(socket.destroyed).to.be.true
 

system-tests/lib/normalizeStdout.ts

@@ -164,6 +164,8 @@ export const normalizeStdout = function (str: string, options: any = {}) {
   .replace(crossOriginErrorRe, '[Cross origin error message]')
   // Replaces connection warning since Chrome or Firefox sometimes take longer to connect
   .replace(/Still waiting to connect to .+, retrying in 1 second \(attempt .+\/.+\)\n/g, '')
+  // Replaces CDP connection error message in Firefox since Cypress will retry
+  .replace(/Failed to spawn CDP with Firefox. Retrying.*\.\.\./, '')
 
   if (options.browser === 'webkit') {
     // WebKit throws for lookups on undefined refs with "Can't find variable: <var>"