Getting rid off before hook if is not loading an archive

elastic · Mar 18, 2024 · e85485e · e85485e
1 parent 6fe62d0
commit e85485e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 26 deletions.
diff --git a/...ss/cypress/e2e/detection_response/rule_management/authorization/all_rules_read_only.cy.ts b/...ss/cypress/e2e/detection_response/rule_management/authorization/all_rules_read_only.cy.ts
@@ -23,15 +23,14 @@ import {
 } from '../../../../tasks/common/callouts';
 import { login } from '../../../../tasks/login';
 import { visitRulesManagementTable } from '../../../../tasks/rules_management';
+import { deleteAlertsAndRules } from '../../../../tasks/api_calls/common';
 
 // TODO: https://github.com/elastic/kibana/issues/164451 We should find a way to make this spec work in Serverless
 // TODO: https://github.com/elastic/kibana/issues/161540
 describe('All rules - read only', { tags: ['@ess', '@serverless', '@skipInServerless'] }, () => {
-  before(() => {
-    createRule(getNewRule({ rule_id: '1', enabled: false }));
-  });
-
   beforeEach(() => {
+    deleteAlertsAndRules();
+    createRule(getNewRule({ rule_id: '1', enabled: false }));
     login(ROLES.t1_analyst);
     visitRulesManagementTable();
     cy.get(RULE_NAME).should('have.text', getNewRule().name);

diff --git a/...ss/e2e/detection_response/rule_management/related_integrations/related_integrations.cy.ts b/...ss/e2e/detection_response/rule_management/related_integrations/related_integrations.cy.ts
@@ -238,20 +238,17 @@ describe('Related integrations', { tags: ['@ess', '@serverless', '@brokenInServe
   });
 
   describe('related Integrations Advanced Setting is disabled', () => {
-    before(() => {
-      disableRelatedIntegrations();
-    });
-
-    after(() => {
-      enableRelatedIntegrations();
-    });
-
     describe('rules management table', () => {
       beforeEach(() => {
+        disableRelatedIntegrations();
         visitRulesManagementTable();
         disableAutoRefresh();
       });
 
+      afterEach(() => {
+        enableRelatedIntegrations();
+      });
+
       it('should not display a badge with the installed integrations', () => {
         cy.get(RULE_NAME).should('have.text', PREBUILT_RULE_NAME);
         cy.get(INTEGRATION_LINK).should('not.exist');

diff --git a/...cypress/e2e/detection_response/rule_management/rules_table/rules_table_auto_refresh.cy.ts b/...cypress/e2e/detection_response/rule_management/rules_table/rules_table_auto_refresh.cy.ts
@@ -29,23 +29,21 @@ import { login } from '../../../../tasks/login';
 
 import { createRule } from '../../../../tasks/api_calls/rules';
 import { getNewRule } from '../../../../objects/rule';
+import { deleteAlertsAndRules } from '../../../../tasks/api_calls/common';
 
 const RULES_TABLE_REFRESH_INTERVAL_MS = 60000;
 
 describe('Rules table: auto-refresh', { tags: ['@ess', '@serverless'] }, () => {
-  before(() => {
+  beforeEach(() => {
     login();
+    deleteAlertsAndRules();
     setRulesTableAutoRefreshIntervalSetting({
       enabled: true,
       refreshInterval: RULES_TABLE_REFRESH_INTERVAL_MS,
     });
     createRule(getNewRule({ name: 'Test rule 1', rule_id: '1', enabled: false }));
   });
 
-  beforeEach(() => {
-    login();
-  });
-
   it('gets deactivated when any rule selected and activated after rules unselected', () => {
     visitRulesManagementTable();
 

diff --git a/...ess/e2e/detection_response/rule_management/rules_table/rules_table_persistent_state.cy.ts b/...ess/e2e/detection_response/rule_management/rules_table/rules_table_persistent_state.cy.ts
@@ -41,6 +41,7 @@ import {
   setRowsPerPageTo,
   sortByTableColumn,
 } from '../../../../tasks/table_pagination';
+import { deleteAlertsAndRules } from '../../../../tasks/api_calls/common';
 
 function createTestRules(): void {
   createRule(getNewRule({ rule_id: '1', name: 'test 1', tags: ['tag-a'], enabled: false }));
@@ -96,11 +97,9 @@ function expectDefaultRulesTableState(): void {
 }
 
 describe('Rules table: persistent state', { tags: ['@ess', '@serverless'] }, () => {
-  before(() => {
-    createTestRules();
-  });
-
   beforeEach(() => {
+    deleteAlertsAndRules();
+    createTestRules();
     login();
     resetRulesTableState();
   });

diff --git a/...ress/cypress/e2e/detection_response/rule_management/rules_table/rules_table_sorting.cy.ts b/...ress/cypress/e2e/detection_response/rule_management/rules_table/rules_table_sorting.cy.ts
@@ -35,20 +35,18 @@ import {
   sortByTableColumn,
 } from '../../../../tasks/table_pagination';
 import { TABLE_FIRST_PAGE, TABLE_SECOND_PAGE } from '../../../../screens/table_pagination';
+import { deleteAlertsAndRules } from '../../../../tasks/api_calls/common';
 
 describe('Rules table: sorting', { tags: ['@ess', '@serverless'] }, () => {
-  before(() => {
+  beforeEach(() => {
     login();
+    deleteAlertsAndRules();
     createRule(getNewRule({ rule_id: '1', enabled: false }));
     createRule(getExistingRule({ rule_id: '2', enabled: false }));
     createRule(getNewOverrideRule({ rule_id: '3', enabled: false }));
     createRule(getNewThresholdRule({ rule_id: '4', enabled: false }));
   });
 
-  beforeEach(() => {
-    login();
-  });
-
   it('Sorts by enabled rules', () => {
     visit(RULES_MANAGEMENT_URL);