From 089f944622bcd03dde01578d952ca1aeb0e4cd22 Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Sat, 4 Apr 2020 16:51:28 +0200
Subject: [PATCH] fixes flakiness (#62406) (#62503)

* fixes flakiness

* updates 'number of signals' selector

* changes the way we are asserting the text
---
 .../cypress/integration/detections.spec.ts    | 77 ++++++++++---------
 .../siem/cypress/screens/detections.ts        |  2 +-
 2 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts
index 646132c3f88eb..f38cb2285b480 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts
@@ -42,16 +42,15 @@ describe('Detections', () => {
       cy.get(NUMBER_OF_SIGNALS)
         .invoke('text')
         .then(numberOfSignals => {
-          cy.get(SHOWING_SIGNALS)
-            .invoke('text')
-            .should('eql', `Showing ${numberOfSignals} signals`);
+          cy.get(SHOWING_SIGNALS).should('have.text', `Showing ${numberOfSignals} signals`);
 
           const numberOfSignalsToBeClosed = 3;
           selectNumberOfSignals(numberOfSignalsToBeClosed);
 
-          cy.get(SELECTED_SIGNALS)
-            .invoke('text')
-            .should('eql', `Selected ${numberOfSignalsToBeClosed} signals`);
+          cy.get(SELECTED_SIGNALS).should(
+            'have.text',
+            `Selected ${numberOfSignalsToBeClosed} signals`
+          );
 
           closeSignals();
           waitForSignals();
@@ -59,30 +58,33 @@ describe('Detections', () => {
           waitForSignals();
 
           const expectedNumberOfSignalsAfterClosing = +numberOfSignals - numberOfSignalsToBeClosed;
-          cy.get(NUMBER_OF_SIGNALS)
-            .invoke('text')
-            .should('eq', expectedNumberOfSignalsAfterClosing.toString());
-          cy.get(SHOWING_SIGNALS)
-            .invoke('text')
-            .should('eql', `Showing ${expectedNumberOfSignalsAfterClosing.toString()} signals`);
+          cy.get(NUMBER_OF_SIGNALS).should(
+            'have.text',
+            expectedNumberOfSignalsAfterClosing.toString()
+          );
+
+          cy.get(SHOWING_SIGNALS).should(
+            'have.text',
+            `Showing ${expectedNumberOfSignalsAfterClosing.toString()} signals`
+          );
 
           goToClosedSignals();
           waitForSignals();
 
-          cy.get(NUMBER_OF_SIGNALS)
-            .invoke('text')
-            .should('eql', numberOfSignalsToBeClosed.toString());
-          cy.get(SHOWING_SIGNALS)
-            .invoke('text')
-            .should('eql', `Showing ${numberOfSignalsToBeClosed.toString()} signals`);
+          cy.get(NUMBER_OF_SIGNALS).should('have.text', numberOfSignalsToBeClosed.toString());
+          cy.get(SHOWING_SIGNALS).should(
+            'have.text',
+            `Showing ${numberOfSignalsToBeClosed.toString()} signals`
+          );
           cy.get(SIGNALS).should('have.length', numberOfSignalsToBeClosed);
 
           const numberOfSignalsToBeOpened = 1;
           selectNumberOfSignals(numberOfSignalsToBeOpened);
 
-          cy.get(SELECTED_SIGNALS)
-            .invoke('text')
-            .should('eql', `Selected ${numberOfSignalsToBeOpened} signal`);
+          cy.get(SELECTED_SIGNALS).should(
+            'have.text',
+            `Selected ${numberOfSignalsToBeOpened} signal`
+          );
 
           openSignals();
           waitForSignals();
@@ -93,15 +95,14 @@ describe('Detections', () => {
           waitForSignals();
 
           const expectedNumberOfClosedSignalsAfterOpened = 2;
-          cy.get(NUMBER_OF_SIGNALS)
-            .invoke('text')
-            .should('eql', expectedNumberOfClosedSignalsAfterOpened.toString());
-          cy.get(SHOWING_SIGNALS)
-            .invoke('text')
-            .should(
-              'eql',
-              `Showing ${expectedNumberOfClosedSignalsAfterOpened.toString()} signals`
-            );
+          cy.get(NUMBER_OF_SIGNALS).should(
+            'have.text',
+            expectedNumberOfClosedSignalsAfterOpened.toString()
+          );
+          cy.get(SHOWING_SIGNALS).should(
+            'have.text',
+            `Showing ${expectedNumberOfClosedSignalsAfterOpened.toString()} signals`
+          );
           cy.get(SIGNALS).should('have.length', expectedNumberOfClosedSignalsAfterOpened);
 
           goToOpenedSignals();
@@ -109,13 +110,15 @@ describe('Detections', () => {
 
           const expectedNumberOfOpenedSignals =
             +numberOfSignals - expectedNumberOfClosedSignalsAfterOpened;
-          cy.get(SHOWING_SIGNALS)
-            .invoke('text')
-            .should('eql', `Showing ${expectedNumberOfOpenedSignals.toString()} signals`);
-
-          cy.get('[data-test-subj="server-side-event-count"]')
-            .invoke('text')
-            .should('eql', expectedNumberOfOpenedSignals.toString());
+          cy.get(SHOWING_SIGNALS).should(
+            'have.text',
+            `Showing ${expectedNumberOfOpenedSignals.toString()} signals`
+          );
+
+          cy.get('[data-test-subj="server-side-event-count"]').should(
+            'have.text',
+            expectedNumberOfOpenedSignals.toString()
+          );
         });
     });
 
diff --git a/x-pack/legacy/plugins/siem/cypress/screens/detections.ts b/x-pack/legacy/plugins/siem/cypress/screens/detections.ts
index f388ac1215d01..cb776be8d7b6b 100644
--- a/x-pack/legacy/plugins/siem/cypress/screens/detections.ts
+++ b/x-pack/legacy/plugins/siem/cypress/screens/detections.ts
@@ -10,7 +10,7 @@ export const LOADING_SIGNALS_PANEL = '[data-test-subj="loading-signals-panel"]';
 
 export const MANAGE_SIGNAL_DETECTION_RULES_BTN = '[data-test-subj="manage-signal-detection-rules"]';
 
-export const NUMBER_OF_SIGNALS = '[data-test-subj="server-side-event-count"]';
+export const NUMBER_OF_SIGNALS = '[data-test-subj="server-side-event-count"] .euiBadge__text';
 
 export const OPEN_CLOSE_SIGNAL_BTN = '[data-test-subj="update-signal-status-button"]';