fix: cleanup all schedules in tests (#27)

theapexlab · Nov 20, 2023 · 876bd43 · 876bd43
1 parent a1d4f90
commit 876bd43
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/tests/integration/askPresentIdeas.test.ts b/tests/integration/askPresentIdeas.test.ts
@@ -8,7 +8,7 @@ import { constructPresentIdeaSavedMessage } from "@/services/slack/constructPres
 import { timeout } from "@/testUtils/constants";
 import { deleteLastDm } from "@/testUtils/integration/deleteLastDm";
 import {
-  cleanUpSchedule,
+  cleanUpSchedules,
   getSchedule,
 } from "@/testUtils/integration/scheduler";
 import { sendCronEvent } from "@/testUtils/integration/sendCronEvent";
@@ -87,7 +87,7 @@ describe("Present ideas", () => {
         "Block doesn't contain save button",
       ).toBe(presentIdeasSaveButtonActionId);
 
-      await cleanUpSchedule(`${eventId}_askPresentAndSquadJoinFromTeam`);
+      await cleanUpSchedules(eventId);
     },
     timeout,
   );
@@ -205,7 +205,7 @@ describe("Present ideas", () => {
         "After completion should be DELETE",
       ).toEqual("DELETE");
 
-      await cleanUpSchedule(`${eventId}_askPresentAndSquadJoinFromTeam`);
+      await cleanUpSchedules(eventId);
     },
     timeout,
   );
@@ -249,7 +249,7 @@ describe("Present ideas", () => {
         "After completion should be DELETE",
       ).toEqual("DELETE");
 
-      await cleanUpSchedule(`${eventId}_createBirthdaySquad`);
+      await cleanUpSchedules(eventId);
     },
     timeout,
   );
@@ -293,7 +293,7 @@ describe("Present ideas", () => {
         "After completion should be DELETE",
       ).toEqual("DELETE");
 
-      await cleanUpSchedule(`${eventId}_birthdayCleanup`);
+      await cleanUpSchedules(eventId);
     },
     timeout,
   );

diff --git a/tests/utils/integration/scheduler.ts b/tests/utils/integration/scheduler.ts
@@ -13,9 +13,21 @@ export const getSchedule = async (name: string) =>
     }),
   );
 
-export const cleanUpSchedule = async (name: string) =>
-  schedulerClient.send(
-    new DeleteScheduleCommand({
-      Name: name,
-    }),
-  );
+export const cleanUpSchedules = async (eventId: string) =>
+  Promise.all([
+    schedulerClient.send(
+      new DeleteScheduleCommand({
+        Name: `${eventId}_askPresentAndSquadJoinFromTeam`,
+      }),
+    ),
+    schedulerClient.send(
+      new DeleteScheduleCommand({
+        Name: `${eventId}_createBirthdaySquad`,
+      }),
+    ),
+    schedulerClient.send(
+      new DeleteScheduleCommand({
+        Name: `${eventId}_birthdayCleanup`,
+      }),
+    ),
+  ]);