Merge branch 'develop' into ryanm/fix/v8-improvements

cypress-io · Dec 2, 2022 · 12a5753 · 12a5753 · cypress-bot · Dec 2, 2022
2 parents 5f3a735 + ed0668e
commit 12a5753
Show file tree

Hide file tree

Showing 302 changed files with 5,737 additions and 12,744 deletions.
diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
@@ -27,6 +27,7 @@ mainBuildFilters: &mainBuildFilters
     branches:
       only:
         - develop
+        - /^release\/\d+\.\d+\.\d+$/
         - 'ryanm/fix/v8-improvements'
 
 # usually we don't build Mac app - it takes a long time
@@ -38,17 +39,16 @@ macWorkflowFilters: &darwin-workflow-filters
     - equal: [ develop, << pipeline.git.branch >> ]
     - equal: [ 'ryanm/fix/v8-improvements', << pipeline.git.branch >> ]
     - matches:
-          pattern: "-release$"
-          value: << pipeline.git.branch >>
-
+        pattern: /^release\/\d+\.\d+\.\d+$/
+        value: << pipeline.git.branch >>
 linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
   when:
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
     - equal: [ 'ryanm/fix/v8-improvements', << pipeline.git.branch >> ]
     - matches:
-          pattern: "-release$"
-          value: << pipeline.git.branch >>
+        pattern: /^release\/\d+\.\d+\.\d+$/
+        value: << pipeline.git.branch >>
 
 # uncomment & add to the branch conditions below to disable the main linux
 # flow if we don't want to test it for a certain branch
@@ -65,9 +65,8 @@ windowsWorkflowFilters: &windows-workflow-filters
     - equal: [ develop, << pipeline.git.branch >> ]
     - equal: [ 'ryanm/fix/v8-improvements', << pipeline.git.branch >> ]
     - matches:
-          pattern: "-release$"
-          value: << pipeline.git.branch >>
-
+        pattern: /^release\/\d+\.\d+\.\d+$/
+        value: << pipeline.git.branch >>
 executors:
   # the Docker image with Cypress dependencies and Chrome browser
   cy-doc:
@@ -130,7 +129,7 @@ commands:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "ryanm/fix/v8-improvements" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ryanm/fix/v8-improvements" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -461,10 +460,6 @@ commands:
         description: chrome channel to install
         type: string
         default: ''
-      experimentalSessionAndOrigin:
-        description: experimental flag to apply
-        type: boolean
-        default: false
     steps:
       - restore_cached_workspace
       - when:
@@ -488,13 +483,8 @@ commands:
 
             if [[ -v MAIN_RECORD_KEY ]]; then
               # internal PR
-              if <<parameters.experimentalSessionAndOrigin>>; then
-                CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
-                yarn cypress:run-experimentalSessionAndOrigin --record --parallel --group 5x-driver-<<parameters.browser>>-experimentalSessionAndOrigin --browser <<parameters.browser>>
-              else
-                CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
-                yarn cypress:run --record --parallel --group 5x-driver-<<parameters.browser>> --browser <<parameters.browser>>
-              fi
+              CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
+              yarn cypress:run --record --parallel --group 5x-driver-<<parameters.browser>> --browser <<parameters.browser>>
             else
               # external PR
               TESTFILES=$(circleci tests glob "cypress/e2e/**/*.cy.*" | circleci tests split --total=$CIRCLE_NODE_TOTAL)
@@ -503,11 +493,7 @@ commands:
               if [[ -z "$TESTFILES" ]]; then
                 echo "Empty list of test files"
               fi
-              if <<parameters.experimentalSessionAndOrigin>>; then
-                yarn cypress:run-experimentalSessionAndOrigin --browser <<parameters.browser>> --spec $TESTFILES
-              else
-                yarn cypress:run --browser <<parameters.browser>> --spec $TESTFILES
-              fi
+              yarn cypress:run --browser <<parameters.browser>> --spec $TESTFILES
             fi
           working_directory: packages/driver
       - verify-mocha-results
@@ -1657,58 +1643,12 @@ jobs:
 
   driver-integration-tests-webkit:
     <<: *defaults
+    resource_class: medium+
     parallelism: 5
     steps:
       - run-driver-integration-tests:
           browser: webkit
 
-  driver-integration-tests-chrome-experimentalSessionAndOrigin:
-    <<: *defaults
-    resource_class: medium
-    parallelism: 5
-    steps:
-      - run-driver-integration-tests:
-          browser: chrome
-          install-chrome-channel: stable
-          experimentalSessionAndOrigin: true
-
-  driver-integration-tests-chrome-beta-experimentalSessionAndOrigin:
-    <<: *defaults
-    resource_class: medium
-    parallelism: 5
-    steps:
-      - run-driver-integration-tests:
-          browser: chrome:beta
-          install-chrome-channel: beta
-          experimentalSessionAndOrigin: true
-
-  driver-integration-tests-firefox-experimentalSessionAndOrigin:
-    <<: *defaults
-    resource_class: medium
-    parallelism: 5
-    steps:
-      - run-driver-integration-tests:
-          browser: firefox
-          experimentalSessionAndOrigin: true
-
-  driver-integration-tests-electron-experimentalSessionAndOrigin:
-    <<: *defaults
-    resource_class: medium
-    parallelism: 5
-    steps:
-      - run-driver-integration-tests:
-          browser: electron
-          experimentalSessionAndOrigin: true
-
-  driver-integration-tests-webkit-experimentalSessionAndOrigin:
-    <<: *defaults
-    resource_class: medium
-    parallelism: 5
-    steps:
-      - run-driver-integration-tests:
-          browser: webkit
-          experimentalSessionAndOrigin: true
-
   run-reporter-component-tests-chrome:
     <<: *defaults
     parameters:
@@ -2482,26 +2422,6 @@ linux-x64-workflow: &linux-x64-workflow
         context: test-runner:cypress-record-key
         requires:
           - build
-    - driver-integration-tests-chrome-experimentalSessionAndOrigin:
-        context: test-runner:cypress-record-key
-        requires:
-          - build
-    - driver-integration-tests-chrome-beta-experimentalSessionAndOrigin:
-        context: test-runner:cypress-record-key
-        requires:
-          - build
-    - driver-integration-tests-firefox-experimentalSessionAndOrigin:
-        context: test-runner:cypress-record-key
-        requires:
-          - build
-    - driver-integration-tests-electron-experimentalSessionAndOrigin:
-        context: test-runner:cypress-record-key
-        requires:
-          - build
-    - driver-integration-tests-webkit-experimentalSessionAndOrigin:
-        context: test-runner:cypress-record-key
-        requires:
-          - build
     - run-frontend-shared-component-tests-chrome:
         context: [test-runner:cypress-record-key, test-runner:launchpad-tests, test-runner:percy]
         percy: true
@@ -2606,10 +2526,6 @@ linux-x64-workflow: &linux-x64-workflow
           - driver-integration-tests-chrome
           - driver-integration-tests-chrome-beta
           - driver-integration-tests-electron
-          - driver-integration-tests-firefox-experimentalSessionAndOrigin
-          - driver-integration-tests-chrome-experimentalSessionAndOrigin
-          - driver-integration-tests-chrome-beta-experimentalSessionAndOrigin
-          - driver-integration-tests-electron-experimentalSessionAndOrigin
           - system-tests-non-root
           - system-tests-firefox
           - system-tests-electron

diff --git a/cli/package.json b/cli/package.json
@@ -116,7 +116,7 @@
     "cypress": "bin/cypress"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
   },
   "types": "types",
   "exports": {

diff --git a/cli/types/cypress-npm-api.d.ts b/cli/types/cypress-npm-api.d.ts
@@ -173,7 +173,7 @@ declare namespace CypressCommandLine {
     title: string[]
     state: string
     body: string
-     /**
+    /**
      * Error string as it's presented in console if the test fails
      */
     displayError: string | null