Merge branch 'develop' into electron-34

Author: jennifer-shehane

.circleci/workflows.yml

@@ -1,11 +1,11 @@
 version: 2.1
 
-chrome-stable-version: &chrome-stable-version "135.0.7049.84"
-chrome-beta-version: &chrome-beta-version "136.0.7103.25"
+chrome-stable-version: &chrome-stable-version "135.0.7049.95"
+chrome-beta-version: &chrome-beta-version "136.0.7103.33"
 firefox-stable-version: &firefox-stable-version "137.0"
 
 orbs:
-  browser-tools: circleci/[email protected].2
+  browser-tools: circleci/[email protected].3
 
 defaults: &defaults
   parallelism: 1
@@ -38,7 +38,6 @@ mainBuildFilters: &mainBuildFilters
         - /^release\/\d+\.\d+\.\d+$/
         # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
         - 'update-v8-snapshot-cache-on-develop'
-        - 'ryanm/chore/add_internal_studio'
         - 'electron-34'
 
 # usually we don't build Mac app - it takes a long time
@@ -50,7 +49,6 @@ macWorkflowFilters: &darwin-workflow-filters
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'feat/implement_bidi', << pipeline.git.branch >> ]
       - equal: [ 'electron-34', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
@@ -62,7 +60,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'chore/update_mobx_decoratorless', << pipeline.git.branch >> ]
+      - equal: [ 'ryanm/chore/full-snapshot-threaded', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>
@@ -85,7 +83,6 @@ windowsWorkflowFilters: &windows-workflow-filters
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'feat/implement_bidi', << pipeline.git.branch >> ]
       - equal: [ 'electron-34', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/

.gitignore

@@ -20,6 +20,7 @@ Cached Theme Material Design.pak
 packages/data-context/src/**/*.js
 packages/errors/src/**/*.js
 packages/errors/test/**/*.js
+!packages/errors/test/.mocharc.js
 
 # from driver
 packages/driver/cypress/videos

cli/.mocharc.js

@@ -0,0 +1,6 @@
+module.exports = {
+  spec: 'test/**/*_spec.js',
+  timeout: 10000,
+  reporter: 'spec',
+  recursive: true
+} 

cli/CHANGELOG.md

@@ -1,11 +1,16 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
 ## 14.3.1
 
-_Released 4/22/2025 (PENDING)_
+_Released 4/17/2025_
+
+**Performance:**
+
+- Reduced the initial timeout for the preflight API request to determine proxy conditions from sixty seconds to five, and made this timeout duration configurable with the `CYPRESS_INITIAL_PREFLIGHT_TIMEOUT` environment variable. Addresses [#28423](https://github.com/cypress-io/cypress/issues/28423). Addressed in [#31283](https://github.com/cypress-io/cypress/pull/31283).
 
 **Bugfixes:**
 
 - The [`cy.press()`](http://on.cypress.io/api/press) command no longer errors when used in specs subsequent to the first spec in run mode. Fixes [#31466](https://github.com/cypress-io/cypress/issues/31466).
+- Fixed an issue where certain proxy conditions prevented test runs from being recorded. Fixes [#31485](https://github.com/cypress-io/cypress/issues/31485).
 
 **Misc:**
 

cli/test/mocha.opts

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "14.3.0",
+  "version": "14.3.1",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {

package.json

@@ -647,7 +647,8 @@ describe('App: Specs', () => {
           })
 
           cy.contains('Review the docs')
-          .should('have.attr', 'href', 'https://on.cypress.io/styling-components')
+          .should('be.visible')
+          .and('have.attr', 'href', 'https://on.cypress.io/styling-components')
 
           cy.log('should not contain the link if you navigate away and back')
           cy.get('body').type('f')

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

@@ -0,0 +1,11 @@
+module.exports = {
+  spec: 'test/unit/*.ts',
+  require: '@packages/ts/register',
+  recursive: true,
+  extension: ['ts'],
+  reporter: 'mocha-multi-reporters',
+  reporterOptions: {
+    configFile: '../../mocha-reporter-config.json'
+  },
+  exit: true
+} 

packages/errors/.mocharc.js

@@ -138,12 +138,6 @@ export const AllCypressErrors = {
 
         ${fmt.highlightSecondary(arg2)}`
   },
-  NOT_LOGGED_IN: () => {
-    return errTemplate`\
-        You're not logged in.
-
-        Run ${fmt.highlight(`cypress open`)} to open Cypress and log in.`
-  },
   TESTS_DID_NOT_START_RETRYING: (arg1: string) => {
     return errTemplate`Timed out waiting for the browser to connect. ${fmt.off(arg1)}`
   },
@@ -1032,30 +1026,6 @@ export const AllCypressErrors = {
 
         https://on.cypress.io/installing-cypress`
   },
-  FREE_PLAN_EXCEEDS_MONTHLY_PRIVATE_TESTS: (arg1: {link: string, usedTestsMessage: string, limit: number}) => {
-    return errTemplate`\
-        You've exceeded the limit of private test results under your free plan this month. ${getUsedTestsMessage(arg1.limit, arg1.usedTestsMessage)}
-
-        To continue recording tests this month you must upgrade your account. Please visit your billing to upgrade to another billing plan.
-
-        ${fmt.off(arg1.link)}`
-  },
-  FREE_PLAN_IN_GRACE_PERIOD_EXCEEDS_MONTHLY_PRIVATE_TESTS: (arg1: {link: string, usedTestsMessage: string, gracePeriodMessage: string, limit: number}) => {
-    return errTemplate`\
-        You've exceeded the limit of private test results under your free plan this month. ${getUsedTestsMessage(arg1.limit, arg1.usedTestsMessage)}
-
-        Your plan is now in a grace period, which means your tests will still be recorded until ${fmt.off(arg1.gracePeriodMessage)}. Please upgrade your plan to continue recording tests on Cypress Cloud in the future.
-
-        ${fmt.off(arg1.link)}`
-  },
-  PAID_PLAN_EXCEEDS_MONTHLY_PRIVATE_TESTS: (arg1: {link: string, usedTestsMessage: string, limit: number}) => {
-    return errTemplate`\
-        You've exceeded the limit of private test results under your current billing plan this month. ${getUsedTestsMessage(arg1.limit, arg1.usedTestsMessage)}
-
-        To upgrade your account, please visit your billing to upgrade to another billing plan.
-
-        ${fmt.off(arg1.link)}`
-  },
   FREE_PLAN_EXCEEDS_MONTHLY_TESTS: (arg1: {link: string, usedTestsMessage: string, limit: number}) => {
     return errTemplate`\
         You've exceeded the limit of test results under your free plan this month. ${getUsedTestsMessage(arg1.limit, arg1.usedTestsMessage)}
@@ -1901,12 +1871,6 @@ export type AllCypressErrorObj = typeof AllCypressErrors
 
 export type AllCypressErrorNames = keyof typeof AllCypressErrors
 
-export function getMsgByType<Type extends keyof AllCypressErrorObj> (type: Type, ...args: Parameters<AllCypressErrorObj[Type]>): string {
-  const err = getError(type, ...args)
-
-  return err.message
-}
-
 /**
  * Given an error name & params for the error, returns a "CypressError",
  * with a forBrowser property, used when we want to format the value for sending to

packages/errors/__snapshot-html__/NOT_LOGGED_IN.html renamed to packages/errors/__snapshot-html__/CDP_FIREFOX_DEPRECATED.html

@@ -17,7 +17,7 @@ describe('lib/errors', () => {
 
   context('.log', () => {
     it('uses red by default', () => {
-      const err = errors.get('NOT_LOGGED_IN')
+      const err = errors.get('TESTS_DID_NOT_START_FAILED')
 
       const ret = errors.log(err)
 
@@ -33,7 +33,7 @@ describe('lib/errors', () => {
     })
 
     it('can change the color', () => {
-      const err = errors.get('NOT_LOGGED_IN')
+      const err = errors.get('TESTS_DID_NOT_START_FAILED')
 
       const ret = errors.log(err, 'yellow')
 

packages/errors/__snapshot-html__/FREE_PLAN_EXCEEDS_MONTHLY_PRIVATE_TESTS.html

@@ -364,11 +364,6 @@ describe('visual error templates', () => {
         default: ['/path/does/not/exist', err.message],
       }
     },
-    NOT_LOGGED_IN: () => {
-      return {
-        default: [],
-      }
-    },
     TESTS_DID_NOT_START_RETRYING: () => {
       return {
         default: ['Retrying...'],
@@ -971,34 +966,6 @@ describe('visual error templates', () => {
         default: [],
       }
     },
-    FREE_PLAN_EXCEEDS_MONTHLY_PRIVATE_TESTS: () => {
-      return {
-        default: [{
-          link: 'https://cloud.cypress.io/project/abcd',
-          limit: 500,
-          usedTestsMessage: 'test',
-        }],
-      }
-    },
-    FREE_PLAN_IN_GRACE_PERIOD_EXCEEDS_MONTHLY_PRIVATE_TESTS: () => {
-      return {
-        default: [{
-          link: 'https://cloud.cypress.io/project/abcd',
-          limit: 500,
-          usedTestsMessage: 'test',
-          gracePeriodMessage: 'the grace period ends',
-        }],
-      }
-    },
-    PAID_PLAN_EXCEEDS_MONTHLY_PRIVATE_TESTS: () => {
-      return {
-        default: [{
-          link: 'https://on.cypress.io/set-up-billing',
-          limit: 25000,
-          usedTestsMessage: 'private test',
-        }],
-      }
-    },
     FREE_PLAN_EXCEEDS_MONTHLY_TESTS: () => {
       return {
         default: [{