From 9d58b752a9049e35a16e87c50d3e23189ddc6cb2 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Fri, 19 Feb 2021 21:15:52 +0100
Subject: [PATCH] [Security Solution] Adds cypress-pipe (#91550) (#92064)

* introducing cypress-pipe

* moves cypress pipe and promise packages to dev dependencies

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 package.json                                                | 5 +++--
 x-pack/plugins/security_solution/cypress/support/index.js   | 1 +
 x-pack/plugins/security_solution/cypress/tasks/timeline.ts  | 5 +++--
 x-pack/plugins/security_solution/cypress/tasks/timelines.ts | 6 ++----
 x-pack/plugins/security_solution/cypress/tsconfig.json      | 1 +
 yarn.lock                                                   | 5 +++++
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 2c6e801e33b9a..e2fa3d250c111 100644
--- a/package.json
+++ b/package.json
@@ -180,7 +180,6 @@
     "content-disposition": "0.5.3",
     "core-js": "^3.6.5",
     "custom-event-polyfill": "^0.3.0",
-    "cypress-promise": "^1.1.0",
     "cytoscape": "^3.10.0",
     "cytoscape-dagre": "^2.2.2",
     "d3-array": "1.2.4",
@@ -610,6 +609,8 @@
     "cypress": "^6.2.1",
     "cypress-cucumber-preprocessor": "^2.5.2",
     "cypress-multi-reporters": "^1.4.0",
+    "cypress-pipe": "^2.0.0",
+    "cypress-promise": "^1.1.0",
     "d3": "3.5.17",
     "d3-cloud": "1.2.5",
     "d3-scale": "1.0.7",
@@ -830,8 +831,8 @@
     "val-loader": "^1.1.1",
     "vega": "^5.19.1",
     "vega-lite": "^4.17.0",
-    "vega-spec-injector": "^0.0.2",
     "vega-schema-url-parser": "^2.1.0",
+    "vega-spec-injector": "^0.0.2",
     "vega-tooltip": "^0.25.0",
     "venn.js": "0.2.20",
     "vinyl-fs": "^3.0.3",
diff --git a/x-pack/plugins/security_solution/cypress/support/index.js b/x-pack/plugins/security_solution/cypress/support/index.js
index 0b6cea1a9487b..73a9f1503a47d 100644
--- a/x-pack/plugins/security_solution/cypress/support/index.js
+++ b/x-pack/plugins/security_solution/cypress/support/index.js
@@ -22,6 +22,7 @@
 
 // Import commands.js using ES2015 syntax:
 import './commands';
+import 'cypress-pipe';
 
 Cypress.Cookies.defaults({
   preserve: 'sid',
diff --git a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
index c001f1fc2bc47..ada09d9c05c08 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
@@ -177,8 +177,9 @@ export const openTimelineInspectButton = () => {
 };
 
 export const openTimelineFromSettings = () => {
-  cy.get(TIMELINE_SETTINGS_ICON).filter(':visible').click({ force: true });
-  cy.get(OPEN_TIMELINE_ICON).click({ force: true });
+  const click = ($el: Cypress.ObjectLike) => cy.wrap($el).click();
+  cy.get(TIMELINE_SETTINGS_ICON).filter(':visible').pipe(click);
+  cy.get(OPEN_TIMELINE_ICON).pipe(click);
 };
 
 export const openTimelineTemplateFromSettings = (id: string) => {
diff --git a/x-pack/plugins/security_solution/cypress/tasks/timelines.ts b/x-pack/plugins/security_solution/cypress/tasks/timelines.ts
index 5f9448a58288b..15575f304009b 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/timelines.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/timelines.ts
@@ -20,10 +20,8 @@ export const exportTimeline = (timelineId: string) => {
 };
 
 export const openTimeline = (id: string) => {
-  // This temporary wait here is to reduce flakeyness until we integrate cypress-pipe. Then please let us use cypress pipe.
-  // Ref: https://www.cypress.io/blog/2019/01/22/when-can-the-test-click/
-  // Ref: https://github.com/NicholasBoll/cypress-pipe#readme
-  cy.get(TIMELINE(id)).should('be.visible').wait(1500).click();
+  const click = ($el: Cypress.ObjectLike) => cy.wrap($el).click();
+  cy.get(TIMELINE(id)).should('be.visible').pipe(click);
 };
 
 export const waitForTimelinesPanelToBeLoaded = () => {
diff --git a/x-pack/plugins/security_solution/cypress/tsconfig.json b/x-pack/plugins/security_solution/cypress/tsconfig.json
index d0669ccb78281..270d877a362a6 100644
--- a/x-pack/plugins/security_solution/cypress/tsconfig.json
+++ b/x-pack/plugins/security_solution/cypress/tsconfig.json
@@ -8,6 +8,7 @@
     "tsBuildInfoFile": "../../../../build/tsbuildinfo/security_solution/cypress",
     "types": [
       "cypress",
+      "cypress-pipe",
       "node"
     ],
     "resolveJsonModule": true,
diff --git a/yarn.lock b/yarn.lock
index 6fcc09c93f86b..2f05112092750 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11680,6 +11680,11 @@ cypress-multi-reporters@^1.4.0:
     debug "^4.1.1"
     lodash "^4.17.15"
 
+cypress-pipe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/cypress-pipe/-/cypress-pipe-2.0.0.tgz#577df7a70a8603d89a96dfe4092a605962181af8"
+  integrity sha512-KW9s+bz4tFLucH3rBGfjW+Q12n7S4QpUSSyxiGrgPOfoHlbYWzAGB3H26MO0VTojqf9NVvfd5Kt0MH5XMgbfyg==
+
 cypress-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/cypress-promise/-/cypress-promise-1.1.0.tgz#f2d66965945fe198431aaf692d5157cea9d47b25"