Bump cypress@13.3.0 (#162383)

## Summary Bump Cypress-related dependencies to the latest versions and update `renovate.json` to do it automatically in the future --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Gloria Hornero <gloria.hornero@elastic.co> (cherry picked from commit 924664f) # Conflicts: # .buildkite/pipelines/pull_request/security_solution.yml # package.json # yarn.lock
elastic · Oct 2, 2023 · 749e65e · 749e65e
1 parent 657eaab
commit 749e65e
Show file tree

Hide file tree

Showing 16 changed files with 102 additions and 97 deletions.
diff --git a/.buildkite/pipelines/pull_request/security_solution.yml b/.buildkite/pipelines/pull_request/security_solution.yml
@@ -5,7 +5,31 @@ steps:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 60
-    parallelism: 10
+    parallelism: 16
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/functional/security_solution_explore.sh
+    label: 'Explore - Security Solution Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 60
+    parallelism: 4
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/functional/security_solution_investigations.sh
+    label: 'Investigations - Security Solution Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 60
+    parallelism: 8
     retry:
       automatic:
         - exit_status: '*'
@@ -18,8 +42,8 @@ steps:
     agents:
       queue: n2-4-spot
     depends_on: build
-    timeout_in_minutes: 120
+    timeout_in_minutes: 60
     parallelism: 1
     soft_fail: true
     artifact_paths:
-      - "target/kibana-security-solution/**/*"      
+      - "target/kibana-security-solution/**/*"
diff --git a/package.json b/package.json
@@ -78,7 +78,7 @@
     "yarn": "^1.22.19"
   },
   "resolutions": {
-    "**/@types/node": "18.17.1",
+    "**/@types/node": "18.17.5",
     "**/@typescript-eslint/utils": "5.62.0",
     "**/chokidar": "^3.5.3",
     "**/globule/minimatch": "^3.1.2",
@@ -1316,7 +1316,7 @@
     "@types/multistream": "^4.1.0",
     "@types/mustache": "^0.8.31",
     "@types/nock": "^10.0.3",
-    "@types/node": "18.17.1",
+    "@types/node": "18.17.5",
     "@types/node-fetch": "2.6.4",
     "@types/node-forge": "^1.3.1",
     "@types/nodemailer": "^6.4.0",
@@ -1415,13 +1415,13 @@
     "cssnano": "^5.1.12",
     "cssnano-preset-default": "^5.2.12",
     "csstype": "^3.0.2",
-    "cypress": "^12.17.4",
-    "cypress-axe": "^1.4.0",
+    "cypress": "^13.3.0",
+    "cypress-axe": "^1.5.0",
     "cypress-file-upload": "^5.0.8",
     "cypress-multi-reporters": "^1.6.3",
     "cypress-react-selector": "^3.0.0",
-    "cypress-real-events": "^1.8.1",
-    "cypress-recurse": "^1.35.1",
+    "cypress-real-events": "^1.10.3",
+    "cypress-recurse": "^1.35.2",
     "date-fns": "^2.29.3",
     "debug": "^2.6.9",
     "delete-empty": "^2.0.0",

diff --git a/renovate.json b/renovate.json
@@ -256,11 +256,8 @@
     },
     {
       "groupName": "cypress",
-      "matchPackageNames": [
-        "eslint-plugin-cypress"
-      ],
       "matchPackagePatterns": [
-        "^cypress"
+        "cypress"
       ],
       "reviewers": [
         "Team:apm",

diff --git a/x-pack/plugins/apm/ftr_e2e/cypress.config.ts b/x-pack/plugins/apm/ftr_e2e/cypress.config.ts
@@ -22,7 +22,6 @@ export default defineCypressConfig({
   viewportHeight: 1800,
   viewportWidth: 1440,
   video: true,
-  videoUploadOnPasses: false,
   screenshotOnRunFailure: true,
   retries: {
     runMode: 1,

diff --git a/x-pack/plugins/apm/ftr_e2e/cypress_test_runner.ts b/x-pack/plugins/apm/ftr_e2e/cypress_test_runner.ts
@@ -64,7 +64,7 @@ export async function cypressTestRunner({ getService }: FtrProviderContext) {
   const res = await cypressExecution({
     ...cypressCliArgs,
     project: cypressProjectPath,
-    browser: 'chrome',
+    browser: 'electron',
     config: {
       e2e: {
         baseUrl: kibanaUrlWithoutAuth,

diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_config.ts b/x-pack/plugins/apm/ftr_e2e/ftr_config.ts
@@ -46,7 +46,12 @@ async function ftrConfig({ readConfigFile }: FtrConfigProviderContext) {
       const result = await cypressTestRunner(ftrProviderContext);
 
       // set exit code explicitly if at least one Cypress test fails
-      if (result && (result.status === 'failed' || result.totalFailed > 0)) {
+      if (
+        result &&
+        ((result as CypressCommandLine.CypressFailedRunResult)?.status ===
+          'failed' ||
+          (result as CypressCommandLine.CypressRunResult)?.totalFailed)
+      ) {
         process.exitCode = 1;
       }
     },

diff --git a/x-pack/plugins/observability_onboarding/e2e/cypress.config.ts b/x-pack/plugins/observability_onboarding/e2e/cypress.config.ts
@@ -20,7 +20,6 @@ export default defineCypressConfig({
   viewportHeight: 1800,
   viewportWidth: 1440,
   video: false,
-  videoUploadOnPasses: false,
   screenshotOnRunFailure: false,
   retries: {
     runMode: 1,

diff --git a/x-pack/plugins/observability_onboarding/e2e/ftr_config_runner.ts b/x-pack/plugins/observability_onboarding/e2e/ftr_config_runner.ts
@@ -25,7 +25,12 @@ async function testRunner(ftrProviderContext: FtrProviderContext) {
     cypressExecution: cypress.run,
   });
 
-  if (result && (result.status === 'failed' || result.totalFailed > 0)) {
+  if (
+    result &&
+    ((result as CypressCommandLine.CypressFailedRunResult)?.status ===
+      'failed' ||
+      (result as CypressCommandLine.CypressRunResult)?.totalFailed)
+  ) {
     process.exit(1);
   }
 }

diff --git a/x-pack/plugins/profiling/e2e/cypress.config.ts b/x-pack/plugins/profiling/e2e/cypress.config.ts
@@ -20,7 +20,6 @@ export default defineCypressConfig({
   viewportHeight: 1800,
   viewportWidth: 1440,
   video: false,
-  videoUploadOnPasses: false,
   screenshotOnRunFailure: false,
   retries: {
     runMode: 1,

diff --git a/x-pack/plugins/profiling/e2e/ftr_config_runner.ts b/x-pack/plugins/profiling/e2e/ftr_config_runner.ts
@@ -22,8 +22,12 @@ async function ftrConfigRun({ readConfigFile }: FtrConfigProviderContext) {
 async function testRunner(ftrProviderContext: FtrProviderContext) {
   const result = await cypressTestRunner({ ftrProviderContext, cypressExecution: cypress.run });
 
-  if (result && (result.status === 'failed' || result.totalFailed > 0)) {
-    process.exit(1);
+  if (
+    result &&
+    ((result as CypressCommandLine.CypressFailedRunResult)?.status === 'failed' ||
+      (result as CypressCommandLine.CypressRunResult)?.totalFailed)
+  ) {
+    process.exitCode = 1;
   }
 }
 

diff --git a/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts b/x-pack/plugins/security_solution/scripts/run_cypress/parallel.ts
@@ -485,7 +485,9 @@ ${JSON.stringify(cyCustomEnv, null, 2)}
         renderSummaryTable(results as CypressCommandLine.CypressRunResult[]);
         const hasFailedTests = _.some(
           results,
-          (result) => result?.status === 'finished' && result.totalFailed > 0
+          (result) =>
+            (result as CypressCommandLine.CypressFailedRunResult)?.status === 'failed' ||
+            (result as CypressCommandLine.CypressRunResult)?.totalFailed
         );
         if (hasFailedTests) {
           throw createFailError('Not all tests passed');

diff --git a/x-pack/plugins/security_solution/scripts/run_cypress/print_run.ts b/x-pack/plugins/security_solution/scripts/run_cypress/print_run.ts
@@ -278,7 +278,6 @@ export function renderSummaryTable(results: CypressCommandLine.CypressRunResult[
   const parsedResults = _.reduce(
     results,
     (acc: CypressCommandLine.CypressRunResult, result) => {
-      acc.status = result.status;
       acc.startedTestsAt =
         acc.startedTestsAt && new Date(result.startedTestsAt) > new Date(acc.startedTestsAt)
           ? acc.startedTestsAt
@@ -358,12 +357,8 @@ export function renderSummaryTable(results: CypressCommandLine.CypressRunResult[
 
     _.each(runs, (run) => {
       const { spec, stats } = run;
-      const ms = durationInMinutes(stats.duration);
-      const formattedSpec = formatPath(spec.relativeToCommonRoot, getWidth(table2, 1));
-
-      if (run.skippedSpec) {
-        return table2.push(['-', formattedSpec, color('SKIPPED', 'gray'), '-', '-', '-', '-', '-']);
-      }
+      const ms = durationInMinutes(stats?.duration ?? 0);
+      const formattedSpec = formatPath(spec.relative, getWidth(table2, 1));
 
       return table2.push([
         formatSymbolSummary(stats.failures),

diff --git a/.../security_solution_cypress/cypress/e2e/investigations/alerts/detection_page_filters.cy.ts b/.../security_solution_cypress/cypress/e2e/investigations/alerts/detection_page_filters.cy.ts
@@ -262,21 +262,19 @@ describe(`Detections : Page Filters`, { tags: [tag.ESS, tag.BROKEN_IN_SERVERLESS
   });
 
   it(`URL is updated when filters are updated`, () => {
-    cy.on('url:changed', (urlString) => {
-      const NEW_FILTERS = DEFAULT_DETECTION_PAGE_FILTERS.map((filter) => {
-        return {
-          ...filter,
-          selectedOptions: filter.title === 'Severity' ? ['high'] : filter.selectedOptions,
-        };
-      });
-      const expectedVal = encode(formatPageFilterSearchParam(NEW_FILTERS));
-      expect(urlString).to.contain.text(expectedVal);
-    });
-
     openPageFilterPopover(1);
     cy.get(OPTION_SELECTABLE(1, 'high')).should('be.visible');
     cy.get(OPTION_SELECTABLE(1, 'high')).click({});
     closePageFilterPopover(1);
+
+    const NEW_FILTERS = DEFAULT_DETECTION_PAGE_FILTERS.map((filter) => {
+      return {
+        ...filter,
+        selectedOptions: filter.title === 'Severity' ? ['high'] : filter.selectedOptions,
+      };
+    });
+    const expectedVal = encode(formatPageFilterSearchParam(NEW_FILTERS));
+    cy.url().should('include', expectedVal);
   });
 
   it(`Filters are restored from localstorage when user navigates back to the page.`, () => {

diff --git a/...k/test/security_solution_cypress/cypress/e2e/investigations/timelines/open_timeline.cy.ts b/...k/test/security_solution_cypress/cypress/e2e/investigations/timelines/open_timeline.cy.ts
@@ -70,35 +70,14 @@ describe('Open timeline', { tags: [tag.BROKEN_IN_SERVERLESS, tag.ESS] }, () => {
       openTimelineById(this.timelineId);
     });
 
-    it('should open a modal', () => {
+    it('should display timeline info', () => {
       cy.get(OPEN_TIMELINE_MODAL).should('be.visible');
-    });
-
-    it('should display timeline info - title', () => {
       cy.contains(getTimeline().title).should('exist');
-    });
-
-    it('should display timeline info - description', () => {
       cy.get(TIMELINES_DESCRIPTION).last().should('have.text', getTimeline().description);
-    });
-
-    it('should display timeline info - pinned event count', () => {
       cy.get(TIMELINES_PINNED_EVENT_COUNT).last().should('have.text', '1');
-    });
-
-    it('should display timeline info - notes count', () => {
       cy.get(TIMELINES_NOTES_COUNT).last().should('have.text', '1');
-    });
-
-    it('should display timeline info - favorite timeline', () => {
       cy.get(TIMELINES_FAVORITE).last().should('exist');
-    });
-
-    it('should display timeline content - title', () => {
       cy.get(TIMELINE_TITLE).should('have.text', getTimeline().title);
-    });
-
-    it('should display timeline content - description', () => {
       cy.get(TIMELINE_DESCRIPTION).should('have.text', getTimeline().description);
     });
   });

diff --git a/x-pack/test_serverless/functional/test_suites/observability/cypress/cypress.config.ts b/x-pack/test_serverless/functional/test_suites/observability/cypress/cypress.config.ts
@@ -20,7 +20,6 @@ export default defineCypressConfig({
   viewportHeight: 1800,
   viewportWidth: 1440,
   video: false,
-  videoUploadOnPasses: false,
   screenshotOnRunFailure: false,
   retries: {
     runMode: 1,