Cleanup properly after each test

elastic · May 16, 2023 · 694cbea · 694cbea
1 parent 9b526fe
commit 694cbea
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/...gration/security_and_spaces/group3/tests/maintenance_window/active_maintenance_windows.ts b/...gration/security_and_spaces/group3/tests/maintenance_window/active_maintenance_windows.ts
@@ -33,7 +33,6 @@ export default function activeMaintenanceWindowTests({ getService }: FtrProvider
     for (const scenario of UserAtSpaceScenarios) {
       const { user, space } = scenario;
       describe(scenario.id, () => {
-        afterEach(() => objectRemover.removeAll());
         it('should handle get active maintenance window request appropriately', async () => {
           // Create 2 active and 1 inactive maintenance window
           const { body: createdMaintenanceWindow1 } = await supertest

diff --git a/...gration/security_and_spaces/group3/tests/maintenance_window/archive_maintenance_window.ts b/...gration/security_and_spaces/group3/tests/maintenance_window/archive_maintenance_window.ts
@@ -27,7 +27,7 @@ export default function updateMaintenanceWindowTests({ getService }: FtrProvider
         freq: 2, // weekly
       },
     };
-    after(() => objectRemover.removeAll());
+    afterEach(() => objectRemover.removeAll());
 
     for (const scenario of UserAtSpaceScenarios) {
       const { user, space } = scenario;
@@ -144,6 +144,14 @@ export default function updateMaintenanceWindowTests({ getService }: FtrProvider
         })
         .expect(200);
 
+      objectRemover.add(
+        space1,
+        createdMaintenanceWindow.id,
+        'rules/maintenance_window',
+        'alerting',
+        true
+      );
+
       const { body: finish } = await supertest
         .post(
           `${getUrlPrefix(space1)}/internal/alerting/rules/maintenance_window/${

diff --git a/...egration/security_and_spaces/group3/tests/maintenance_window/create_maintenance_window.ts b/...egration/security_and_spaces/group3/tests/maintenance_window/create_maintenance_window.ts
@@ -26,7 +26,7 @@ export default function createMaintenanceWindowTests({ getService }: FtrProvider
         freq: 2, // weekly
       },
     };
-    after(() => objectRemover.removeAll());
+    afterEach(() => objectRemover.removeAll());
 
     for (const scenario of UserAtSpaceScenarios) {
       const { user, space } = scenario;

diff --git a/...egration/security_and_spaces/group3/tests/maintenance_window/delete_maintenance_window.ts b/...egration/security_and_spaces/group3/tests/maintenance_window/delete_maintenance_window.ts
@@ -26,7 +26,7 @@ export default function deleteMaintenanceWindowTests({ getService }: FtrProvider
         freq: 2, // weekly
       },
     };
-    after(() => objectRemover.removeAll());
+    afterEach(() => objectRemover.removeAll());
 
     for (const scenario of UserAtSpaceScenarios) {
       const { user, space } = scenario;

diff --git a/...tegration/security_and_spaces/group3/tests/maintenance_window/find_maintenance_windows.ts b/...tegration/security_and_spaces/group3/tests/maintenance_window/find_maintenance_windows.ts
@@ -26,12 +26,11 @@ export default function findMaintenanceWindowTests({ getService }: FtrProviderCo
         freq: 2, // weekly
       },
     };
-    after(() => objectRemover.removeAll());
+    afterEach(() => objectRemover.removeAll());
 
     for (const scenario of UserAtSpaceScenarios) {
       const { user, space } = scenario;
       describe(scenario.id, () => {
-        afterEach(() => objectRemover.removeAll());
         it('should handle find maintenance window request appropriately', async () => {
           const { body: createdMaintenanceWindow1 } = await supertest
             .post(`${getUrlPrefix(space.id)}/internal/alerting/rules/maintenance_window`)

diff --git a/...integration/security_and_spaces/group3/tests/maintenance_window/get_maintenance_window.ts b/...integration/security_and_spaces/group3/tests/maintenance_window/get_maintenance_window.ts
@@ -26,7 +26,7 @@ export default function getMaintenanceWindowTests({ getService }: FtrProviderCon
         freq: 2, // weekly
       },
     };
-    after(() => objectRemover.removeAll());
+    afterEach(() => objectRemover.removeAll());
 
     for (const scenario of UserAtSpaceScenarios) {
       const { user, space } = scenario;