replace createTimeline with openTimelineUsingToggle

elastic · Jan 9, 2024 · 729e5ce · 729e5ce
1 parent 9d1f16a
commit 729e5ce
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 18 deletions.
diff --git a/...st/security_solution_cypress/cypress/e2e/investigations/alerts/ransomware_detection.cy.ts b/...st/security_solution_cypress/cypress/e2e/investigations/alerts/ransomware_detection.cy.ts
@@ -13,7 +13,7 @@ import { ALERTS_URL, TIMELINES_URL } from '../../../urls/navigation';
 import { ALERTS_HISTOGRAM_SERIES, ALERT_RULE_NAME, MESSAGE } from '../../../screens/alerts';
 import { TIMELINE_QUERY, TIMELINE_VIEW_IN_ANALYZER } from '../../../screens/timeline';
 import { selectAlertsHistogram } from '../../../tasks/alerts';
-import { createTimeline } from '../../../tasks/timelines';
+import { openTimelineUsingToggle } from '../../../tasks/security_main';
 import { deleteTimelines } from '../../../tasks/api_calls/common';
 
 describe('Ransomware Detection Alerts', { tags: ['@ess', '@serverless'] }, () => {
@@ -53,10 +53,10 @@ describe('Ransomware Detection Alerts', { tags: ['@ess', '@serverless'] }, () =>
       deleteTimelines();
       login();
       visitWithTimeRange(TIMELINES_URL);
-      createTimeline();
     });
 
     it('should show ransomware entries in timelines table', () => {
+      openTimelineUsingToggle();
       cy.get(TIMELINE_QUERY).type('event.code: "ransomware"{enter}');
 
       // Wait for grid to load, it should have an analyzer icon

diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/creation.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/creation.cy.ts
@@ -45,7 +45,7 @@ import {
   addNameToTimelineAndSave,
   addNameToTimelineAndSaveAsNew,
 } from '../../../tasks/timeline';
-import { createTimeline, waitForTimelinesPanelToBeLoaded } from '../../../tasks/timelines';
+import { waitForTimelinesPanelToBeLoaded } from '../../../tasks/timelines';
 
 import { OVERVIEW_URL, TIMELINE_TEMPLATES_URL, TIMELINES_URL } from '../../../urls/navigation';
 
@@ -117,7 +117,7 @@ describe('Timelines', { tags: ['@ess', '@serverless'] }, (): void => {
   it('should show the different timeline states', () => {
     login();
     visitWithTimeRange(TIMELINES_URL);
-    createTimeline();
+    openTimelineUsingToggle();
 
     // Unsaved
     cy.get(TIMELINE_PANEL).should('be.visible');
@@ -150,7 +150,7 @@ describe('Timelines', { tags: ['@ess', '@serverless'] }, (): void => {
     visitWithTimeRange(TIMELINES_URL);
     cy.get(ROWS).should('have.length', '0');
 
-    createTimeline();
+    openTimelineUsingToggle();
     addNameToTimelineAndSave('First');
 
     // Offsetting the extra save that is happening in the background

diff --git a/x-pack/test/security_solution_cypress/cypress/screens/timeline.ts b/x-pack/test/security_solution_cypress/cypress/screens/timeline.ts
@@ -30,8 +30,6 @@ export const COMBO_BOX_INPUT = '[data-test-subj="comboBoxInput"]';
 
 export const CREATE_NEW_TIMELINE = '[data-test-subj="timeline-new"]';
 
-export const CREATE_NEW_TIMELINE_WITH_BORDER = '[data-test-subj="timeline-new-with-border"]';
-
 export const CREATE_NEW_TIMELINE_TEMPLATE = '[data-test-subj="template-timeline-new"]';
 
 export const DATA_PROVIDERS = '.field-value';

diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/timelines.ts b/x-pack/test/security_solution_cypress/cypress/tasks/timelines.ts
@@ -22,7 +22,6 @@ import {
 } from '../screens/timelines';
 import { SELECT_ALL_CHECKBOX } from '../screens/shared';
 import {
-  CREATE_NEW_TIMELINE_WITH_BORDER,
   TIMELINE_COLLAPSED_ITEMS_BTN,
   TIMELINE_CREATE_TIMELINE_FROM_TEMPLATE_BTN,
   TIMELINE_WRAPPER,
@@ -70,16 +69,6 @@ export const exportSelectedTimelines = () => {
   cy.get(EXPORT_TIMELINE_ACTION).click();
 };
 
-export const createTimeline = () =>
-  recurse(
-    () => {
-      cy.get(CREATE_NEW_TIMELINE_WITH_BORDER).click();
-      return cy.get(TIMELINE_WRAPPER);
-    },
-    // Retry if somehow the timeline wrapper is still hidden
-    ($timelineWrapper) => !$timelineWrapper.hasClass('timeline-wrapper--hidden')
-  );
-
 export const createTimelineFromFirstTemplateInList = () => {
   cy.get(TIMELINE_COLLAPSED_ITEMS_BTN).first().click();
   cy.get(TIMELINE_CREATE_TIMELINE_FROM_TEMPLATE_BTN).click();