[Security Solution] Improves detections tests

x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts

@@ -100,25 +100,14 @@ import { refreshPage } from '../tasks/security_header';
 
 import { DETECTIONS_URL } from '../urls/navigation';
 
-let expectedUrls = '';
-newRule.referenceUrls.forEach((url) => {
-  expectedUrls = expectedUrls + url;
-});
-let expectedFalsePositives = '';
-newRule.falsePositivesExamples.forEach((falsePositive) => {
-  expectedFalsePositives = expectedFalsePositives + falsePositive;
-});
-let expectedTags = '';
-newRule.tags.forEach((tag) => {
-  expectedTags = expectedTags + tag;
-});
-let expectedMitre = '';
-newRule.mitre.forEach((mitre) => {
-  expectedMitre = expectedMitre + mitre.tactic;
-  mitre.techniques.forEach((technique) => {
-    expectedMitre = expectedMitre + technique;
-  });
-});
+const expectedUrls = newRule.referenceUrls.join('');
+const expectedFalsePositives = newRule.falsePositivesExamples.join('');
+const expectedTags = newRule.tags.join('');
+const expectedMitre = newRule.mitre
+  .map(function (mitre) {
+    return mitre.tactic + mitre.techniques.join('');
+  })
+  .join('');
 const expectedNumberOfRules = 1;
 const expectedEditedtags = editedRule.tags.join('');
 const expectedEditedIndexPatterns =

x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_eql.spec.ts

@@ -65,25 +65,14 @@ import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
 
 import { DETECTIONS_URL } from '../urls/navigation';
 
-let expectedUrls = '';
-eqlRule.referenceUrls.forEach((url) => {
-  expectedUrls = expectedUrls + url;
-});
-let expectedFalsePositives = '';
-eqlRule.falsePositivesExamples.forEach((falsePositive) => {
-  expectedFalsePositives = expectedFalsePositives + falsePositive;
-});
-let expectedTags = '';
-eqlRule.tags.forEach((tag) => {
-  expectedTags = expectedTags + tag;
-});
-let expectedMitre = '';
-eqlRule.mitre.forEach((mitre) => {
-  expectedMitre = expectedMitre + mitre.tactic;
-  mitre.techniques.forEach((technique) => {
-    expectedMitre = expectedMitre + technique;
-  });
-});
+const expectedUrls = eqlRule.referenceUrls.join('');
+const expectedFalsePositives = eqlRule.falsePositivesExamples.join('');
+const expectedTags = eqlRule.tags.join('');
+const expectedMitre = eqlRule.mitre
+  .map(function (mitre) {
+    return mitre.tactic + mitre.techniques.join('');
+  })
+  .join('');
 const expectedNumberOfRules = 1;
 
 describe('Detection rules, EQL', () => {

x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_ml.spec.ts

@@ -62,25 +62,14 @@ import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
 
 import { DETECTIONS_URL } from '../urls/navigation';
 
-let expectedUrls = '';
-machineLearningRule.referenceUrls.forEach((url) => {
-  expectedUrls = expectedUrls + url;
-});
-let expectedFalsePositives = '';
-machineLearningRule.falsePositivesExamples.forEach((falsePositive) => {
-  expectedFalsePositives = expectedFalsePositives + falsePositive;
-});
-let expectedTags = '';
-machineLearningRule.tags.forEach((tag) => {
-  expectedTags = expectedTags + tag;
-});
-let expectedMitre = '';
-machineLearningRule.mitre.forEach((mitre) => {
-  expectedMitre = expectedMitre + mitre.tactic;
-  mitre.techniques.forEach((technique) => {
-    expectedMitre = expectedMitre + technique;
-  });
-});
+const expectedUrls = machineLearningRule.referenceUrls.join('');
+const expectedFalsePositives = machineLearningRule.falsePositivesExamples.join('');
+const expectedTags = machineLearningRule.tags.join('');
+const expectedMitre = machineLearningRule.mitre
+  .map(function (mitre) {
+    return mitre.tactic + mitre.techniques.join('');
+  })
+  .join('');
 const expectedNumberOfRules = totalNumberOfPrebuiltRulesInEsArchive + 1;
 
 describe('Detection rules, machine learning', () => {

x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_override.spec.ts

@@ -80,25 +80,14 @@ import { refreshPage } from '../tasks/security_header';
 
 import { DETECTIONS_URL } from '../urls/navigation';
 
-let expectedUrls = '';
-newOverrideRule.referenceUrls.forEach((url) => {
-  expectedUrls = expectedUrls + url;
-});
-let expectedFalsePositives = '';
-newOverrideRule.falsePositivesExamples.forEach((falsePositive) => {
-  expectedFalsePositives = expectedFalsePositives + falsePositive;
-});
-let expectedTags = '';
-newOverrideRule.tags.forEach((tag) => {
-  expectedTags = expectedTags + tag;
-});
-let expectedMitre = '';
-newOverrideRule.mitre.forEach((mitre) => {
-  expectedMitre = expectedMitre + mitre.tactic;
-  mitre.techniques.forEach((technique) => {
-    expectedMitre = expectedMitre + technique;
-  });
-});
+const expectedUrls = newOverrideRule.referenceUrls.join('');
+const expectedFalsePositives = newOverrideRule.falsePositivesExamples.join('');
+const expectedTags = newOverrideRule.tags.join('');
+const expectedMitre = newOverrideRule.mitre
+  .map(function (mitre) {
+    return mitre.tactic + mitre.techniques.join('');
+  })
+  .join('');
 
 describe('Detection rules, override', () => {
   before(() => {

x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_threshold.spec.ts

@@ -76,25 +76,14 @@ import { refreshPage } from '../tasks/security_header';
 
 import { DETECTIONS_URL } from '../urls/navigation';
 
-let expectedUrls = '';
-newThresholdRule.referenceUrls.forEach((url) => {
-  expectedUrls = expectedUrls + url;
-});
-let expectedFalsePositives = '';
-newThresholdRule.falsePositivesExamples.forEach((falsePositive) => {
-  expectedFalsePositives = expectedFalsePositives + falsePositive;
-});
-let expectedTags = '';
-newThresholdRule.tags.forEach((tag) => {
-  expectedTags = expectedTags + tag;
-});
-let expectedMitre = '';
-newThresholdRule.mitre.forEach((mitre) => {
-  expectedMitre = expectedMitre + mitre.tactic;
-  mitre.techniques.forEach((technique) => {
-    expectedMitre = expectedMitre + technique;
-  });
-});
+const expectedUrls = newThresholdRule.referenceUrls.join('');
+const expectedFalsePositives = newThresholdRule.falsePositivesExamples.join('');
+const expectedTags = newThresholdRule.tags.join('');
+const expectedMitre = newThresholdRule.mitre
+  .map(function (mitre) {
+    return mitre.tactic + mitre.techniques.join('');
+  })
+  .join('');
 
 describe('Detection rules, threshold', () => {
   before(() => {

x-pack/plugins/security_solution/cypress/screens/create_new_rule.ts

@@ -79,6 +79,8 @@ export const MITRE_TECHNIQUES_INPUT =
 export const REFERENCE_URLS_INPUT =
   '[data-test-subj="detectionEngineStepAboutRuleReferenceUrls"] input';
 
+export const REFRESH_BUTTON = '[data-test-subj=refreshButton]';
+
 export const RISK_INPUT = '.euiRangeInput';
 
 export const RISK_MAPPING_OVERRIDE_OPTION = '#risk_score-mapping-override';
@@ -94,6 +96,8 @@ export const RULE_NAME_INPUT =
 
 export const RULE_NAME_OVERRIDE = '[data-test-subj="detectionEngineStepAboutRuleRuleNameOverride"]';
 
+export const RULE_STATUS = '[data-test-subj=ruleStatus]';
+
 export const RULE_TIMESTAMP_OVERRIDE =
   '[data-test-subj="detectionEngineStepAboutRuleTimestampOverride"]';
 

x-pack/plugins/security_solution/cypress/tasks/alerts.ts

@@ -25,6 +25,7 @@ import {
   ALERT_RISK_SCORE_HEADER,
 } from '../screens/alerts';
 import { REFRESH_BUTTON } from '../screens/security_header';
+import { TIMELINE_COLUMN_SPINNER } from '../screens/timeline';
 
 export const closeFirstAlert = () => {
   cy.get(TIMELINE_CONTEXT_MENU_BTN).first().click({ force: true });
@@ -84,8 +85,8 @@ export const selectNumberOfAlerts = (numberOfAlerts: number) => {
 
 export const sortRiskScore = () => {
   cy.get(ALERT_RISK_SCORE_HEADER).click();
-  cy.get('[data-test-subj="timeline-loading-spinner"]').should('exist');
-  cy.get('[data-test-subj="timeline-loading-spinner"]').should('not.exist');
+  cy.get(TIMELINE_COLUMN_SPINNER).should('exist');
+  cy.get(TIMELINE_COLUMN_SPINNER).should('not.exist');
 };
 
 export const investigateFirstAlertInTimeline = () => {

x-pack/plugins/security_solution/cypress/tasks/create_new_rule.ts

@@ -13,7 +13,6 @@ import {
 } from '../objects/rule';
 import {
   ABOUT_CONTINUE_BTN,
-  ABOUT_EDIT_BUTTON,
   ABOUT_EDIT_TAB,
   ACTIONS_EDIT_TAB,
   ADD_FALSE_POSITIVE_BTN,
@@ -25,7 +24,6 @@ import {
   CUSTOM_QUERY_INPUT,
   DEFINE_CONTINUE_BUTTON,
   DEFINE_EDIT_TAB,
-  DEFINE_EDIT_BUTTON,
   FALSE_POSITIVES_INPUT,
   IMPORT_QUERY_FROM_SAVED_TIMELINE_LINK,
   INPUT,
@@ -40,12 +38,14 @@ import {
   MITRE_TACTIC_DROPDOWN,
   MITRE_TECHNIQUES_INPUT,
   REFERENCE_URLS_INPUT,
+  REFRESH_BUTTON,
   RISK_INPUT,
   RISK_MAPPING_OVERRIDE_OPTION,
   RISK_OVERRIDE,
   RULE_DESCRIPTION_INPUT,
   RULE_NAME_INPUT,
   RULE_NAME_OVERRIDE,
+  RULE_STATUS,
   RULE_TIMESTAMP_OVERRIDE,
   RUNS_EVERY_INTERVAL,
   RUNS_EVERY_TIME_TYPE,
@@ -203,20 +203,6 @@ export const fillScheduleRuleAndContinue = (rule: CustomRule | MachineLearningRu
   cy.get(LOOK_BACK_TIME_TYPE).select(rule.lookBack.timeType);
 };
 
-export const expectDefineFormToRepopulateAndContinue = (rule: CustomRule) => {
-  cy.get(DEFINE_EDIT_BUTTON).click();
-  cy.get(CUSTOM_QUERY_INPUT).invoke('text').should('eq', rule.customQuery);
-  cy.get(DEFINE_CONTINUE_BUTTON).should('exist').click({ force: true });
-  cy.get(DEFINE_CONTINUE_BUTTON).should('not.exist');
-};
-
-export const expectAboutFormToRepopulateAndContinue = (rule: CustomRule) => {
-  cy.get(ABOUT_EDIT_BUTTON).click();
-  cy.get(RULE_NAME_INPUT).invoke('val').should('eq', rule.name);
-  cy.get(ABOUT_CONTINUE_BTN).should('exist').click({ force: true });
-  cy.get(ABOUT_CONTINUE_BTN).should('not.exist');
-};
-
 export const fillDefineThresholdRuleAndContinue = (rule: ThresholdRule) => {
   const thresholdField = 0;
   const threshold = 1;
@@ -279,14 +265,10 @@ export const selectThresholdRuleType = () => {
 };
 
 export const waitForTheRuleToBeExecuted = () => {
-  cy.get('[data-test-subj=ruleStatus]')
-    .invoke('text')
-    .then((ruleStatus) => {
-      if (ruleStatus !== 'succeeded') {
-        cy.get('[data-test-subj=refreshButton]').click();
-        // cy.get('[data-test-subj=ruleStatus]').should('have.text', 'succeeded')
-      }
-    });
+  cy.get(RULE_STATUS).should((ruleStatus) => {
+    cy.get(REFRESH_BUTTON).click();
+    expect(ruleStatus).to.be('succeeded');
+  });
 };
 
 export const selectEqlRuleType = () => {