fixes cypress tests

elastic · Oct 2, 2020 · d6f0085 · d6f0085
1 parent 81ea818
commit d6f0085
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_prebuilt.spec.ts b/x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_prebuilt.spec.ts
@@ -10,6 +10,7 @@ import {
   RELOAD_PREBUILT_RULES_BTN,
   RULES_ROW,
   RULES_TABLE,
+  SHOWING_RULES_TEXT,
 } from '../screens/alerts_detection_rules';
 
 import {
@@ -22,6 +23,7 @@ import {
   deleteFirstRule,
   deleteSelectedRules,
   loadPrebuiltDetectionRules,
+  paginate,
   reloadDeletedRules,
   selectNumberOfRules,
   waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded,
@@ -44,7 +46,7 @@ describe('Alerts rules, prebuilt rules', () => {
     esArchiverUnloadEmptyKibana();
   });
 
-  it('Loads prebuilt rules', () => {
+  it('Loads prebuilt rules', async () => {
     const expectedNumberOfRules = totalNumberOfPrebuiltRules;
     const expectedElasticRulesBtnText = `Elastic rules (${expectedNumberOfRules})`;
 
@@ -61,9 +63,16 @@ describe('Alerts rules, prebuilt rules', () => {
     changeToThreeHundredRowsPerPage();
     waitForRulesToBeLoaded();
 
-    cy.get(RULES_TABLE).then(($table) => {
-      cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
-    });
+    cy.get(SHOWING_RULES_TEXT).should('have.text', `Showing ${expectedNumberOfRules} alerts`);
+    const firstScreenRules = await cy.get(RULES_TABLE).find(RULES_ROW).promisify();
+
+    paginate();
+    waitForRulesToBeLoaded();
+
+    const secondScreenRules = await cy.get(RULES_TABLE).find(RULES_ROW).promisify();
+    const totalNumberOfRules = firstScreenRules.length + secondScreenRules.length;
+
+    expect(totalNumberOfRules).to.eql(expectedNumberOfRules);
   });
 });
 
@@ -85,10 +94,6 @@ describe('Deleting prebuilt rules', () => {
 
     changeToThreeHundredRowsPerPage();
     waitForRulesToBeLoaded();
-
-    cy.get(RULES_TABLE).then(($table) => {
-      cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
-    });
   });
 
   afterEach(() => {
@@ -117,9 +122,6 @@ describe('Deleting prebuilt rules', () => {
       'have.text',
       `Elastic rules (${expectedNumberOfRulesAfterDeletion})`
     );
-    cy.get(RULES_TABLE).then(($table) => {
-      cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRulesAfterDeletion);
-    });
     cy.get(RELOAD_PREBUILT_RULES_BTN).should('exist');
     cy.get(RELOAD_PREBUILT_RULES_BTN).should('have.text', 'Install 1 Elastic prebuilt rule ');
 
@@ -131,9 +133,6 @@ describe('Deleting prebuilt rules', () => {
     changeToThreeHundredRowsPerPage();
     waitForRulesToBeLoaded();
 
-    cy.get(RULES_TABLE).then(($table) => {
-      cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRulesAfterRecovering);
-    });
     cy.get(ELASTIC_RULES_BTN).should(
       'have.text',
       `Elastic rules (${expectedNumberOfRulesAfterRecovering})`
@@ -160,9 +159,6 @@ describe('Deleting prebuilt rules', () => {
       'have.text',
       `Elastic rules (${expectedNumberOfRulesAfterDeletion})`
     );
-    cy.get(RULES_TABLE).then(($table) => {
-      cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRulesAfterDeletion);
-    });
 
     reloadDeletedRules();
 
@@ -172,9 +168,6 @@ describe('Deleting prebuilt rules', () => {
     changeToThreeHundredRowsPerPage();
     waitForRulesToBeLoaded();
 
-    cy.get(RULES_TABLE).then(($table) => {
-      cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRulesAfterRecovering);
-    });
     cy.get(ELASTIC_RULES_BTN).should(
       'have.text',
       `Elastic rules (${expectedNumberOfRulesAfterRecovering})`

diff --git a/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts b/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
@@ -33,6 +33,8 @@ export const LOADING_INITIAL_PREBUILT_RULES_TABLE =
 
 export const LOADING_SPINNER = '[data-test-subj="loading-spinner"]';
 
+export const NEXT_BTN = '[data-test-subj="pagination-button-next"]';
+
 export const PAGINATION_POPOVER_BTN = '[data-test-subj="tablePaginationPopoverButton"]';
 
 export const RISK_SCORE = '[data-test-subj="riskScore"]';

diff --git a/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts b/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
@@ -25,6 +25,7 @@ import {
   THREE_HUNDRED_ROWS,
   EXPORT_ACTION_BTN,
   EDIT_RULE_ACTION_BTN,
+  NEXT_BTN,
 } from '../screens/alerts_detection_rules';
 
 export const activateRule = (rulePosition: number) => {
@@ -75,6 +76,10 @@ export const loadPrebuiltDetectionRules = () => {
   cy.get(LOAD_PREBUILT_RULES_BTN).should('exist').click({ force: true });
 };
 
+export const paginate = () => {
+  cy.get(NEXT_BTN).click();
+};
+
 export const reloadDeletedRules = () => {
   cy.get(RELOAD_PREBUILT_RULES_BTN).click({ force: true });
 };