before/beforeEach clean up (#90663)

elastic · Feb 9, 2021 · 4685e8c · 4685e8c
1 parent 19543d8
commit 4685e8c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/...lugins/security_solution/cypress/integration/detection_rules/indicator_match_rule.spec.ts b/...lugins/security_solution/cypress/integration/detection_rules/indicator_match_rule.spec.ts
@@ -96,7 +96,7 @@ import {
 import { esArchiverLoad, esArchiverUnload } from '../../tasks/es_archiver';
 import { loginAndWaitForPageWithoutDateRange } from '../../tasks/login';
 
-import { DETECTIONS_URL } from '../../urls/navigation';
+import { DETECTIONS_URL, RULE_CREATION } from '../../urls/navigation';
 
 describe('Detection rules, Indicator Match', () => {
   const expectedUrls = newThreatIndicatorRule.referenceUrls.join('');
@@ -106,25 +106,22 @@ describe('Detection rules, Indicator Match', () => {
   const expectedNumberOfRules = 1;
   const expectedNumberOfAlerts = 1;
 
-  beforeEach(() => {
+  before(() => {
     cleanKibana();
     esArchiverLoad('threat_indicator');
     esArchiverLoad('threat_data');
-    loginAndWaitForPageWithoutDateRange(DETECTIONS_URL);
-    waitForAlertsPanelToBeLoaded();
-    waitForAlertsIndexToBeCreated();
-    goToManageAlertsDetectionRules();
-    waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
-    goToCreateNewRule();
-    selectIndicatorMatchType();
   });
-
-  afterEach(() => {
+  after(() => {
     esArchiverUnload('threat_indicator');
     esArchiverUnload('threat_data');
   });
 
   describe('Creating new indicator match rules', () => {
+    beforeEach(() => {
+      loginAndWaitForPageWithoutDateRange(RULE_CREATION);
+      selectIndicatorMatchType();
+    });
+
     describe('Index patterns', () => {
       it('Contains a predefined index pattern', () => {
         getIndicatorIndex().should('have.text', indexPatterns.join(''));
@@ -355,6 +352,19 @@ describe('Detection rules, Indicator Match', () => {
         getIndicatorMappingComboField(2).should('not.exist');
       });
     });
+  });
+
+  describe('Generating signals', () => {
+    beforeEach(() => {
+      cleanKibana();
+      loginAndWaitForPageWithoutDateRange(DETECTIONS_URL);
+      waitForAlertsPanelToBeLoaded();
+      waitForAlertsIndexToBeCreated();
+      goToManageAlertsDetectionRules();
+      waitForLoadElasticPrebuiltDetectionRulesTableToBeLoaded();
+      goToCreateNewRule();
+      selectIndicatorMatchType();
+    });
 
     it('Creates and activates a new Indicator Match rule', () => {
       fillDefineIndicatorMatchRuleAndContinue(newThreatIndicatorRule);

diff --git a/x-pack/plugins/security_solution/cypress/urls/navigation.ts b/x-pack/plugins/security_solution/cypress/urls/navigation.ts
@@ -24,5 +24,6 @@ export const KIBANA_HOME = '/app/home#/';
 export const ADMINISTRATION_URL = '/app/security/administration';
 export const NETWORK_URL = '/app/security/network';
 export const OVERVIEW_URL = '/app/security/overview';
+export const RULE_CREATION = 'app/security/detections/rules/create';
 export const TIMELINES_URL = '/app/security/timelines';
 export const TIMELINE_TEMPLATES_URL = '/app/security/timelines/template';