From b890696445f7a001896e002c55d977f9e15e1c79 Mon Sep 17 00:00:00 2001
From: Ben Irvin <ben@innerdvations.com>
Date: Tue, 26 Jul 2022 09:28:06 +0200
Subject: [PATCH] clean up tests

---
 .../core/utils/lib/__tests__/visitors.test.js | 75 ++++++++-----------
 1 file changed, 32 insertions(+), 43 deletions(-)

diff --git a/packages/core/utils/lib/__tests__/visitors.test.js b/packages/core/utils/lib/__tests__/visitors.test.js
index c3d63bb58a..0d0bf4d5c0 100644
--- a/packages/core/utils/lib/__tests__/visitors.test.js
+++ b/packages/core/utils/lib/__tests__/visitors.test.js
@@ -18,59 +18,48 @@ describe('Sanitize visitors util', () => {
     };
 
     test('keeps creator relations with populateCreatorFields true', async () => {
+      const populateCreatorFields = true;
+      const creatorKeys = [keyCreatedBy, keyUpdatedBy];
       const remove = jest.fn();
       const set = jest.fn();
       const rrr = visitors.removeRestrictedRelations(auth);
-      await rrr(
-        {
-          data,
-          key: keyCreatedBy,
-          attribute,
-          schema: { options: { populateCreatorFields: true } },
-        },
-        { remove, set }
-      );
-      await rrr(
-        {
-          data,
-          key: keyUpdatedBy,
-          attribute,
-          schema: { options: { populateCreatorFields: true } },
-        },
-        { remove, set }
-      );
-      expect(remove).toBeCalledTimes(0);
+      const promises = creatorKeys.map(async key => {
+        await rrr(
+          {
+            data,
+            key,
+            attribute,
+            schema: { options: { populateCreatorFields } },
+          },
+          { remove, set }
+        );
+      });
+      await Promise.all(promises);
+
+      expect(remove).toHaveBeenCalledTimes(0);
       expect(set).toBeCalledTimes(0);
     });
     test('removes creator relations with populateCreatorFields false', async () => {
+      const populateCreatorFields = false;
+      const creatorKeys = [keyCreatedBy, keyUpdatedBy];
       const remove = jest.fn();
       const set = jest.fn();
       const rrr = visitors.removeRestrictedRelations(auth);
-      await rrr(
-        {
-          data,
-          key: keyCreatedBy,
-          attribute,
-          schema: { options: { populateCreatorFields: false } },
-        },
-        { remove, set }
-      );
-      expect(remove).toHaveBeenCalledTimes(1);
-      expect(remove).toHaveBeenCalledWith(keyCreatedBy);
-
-      remove.mockClear();
-      await rrr(
-        {
-          data,
-          key: keyUpdatedBy,
-          attribute,
-          schema: { options: { populateCreatorFields: false } },
-        },
-        { remove, set }
-      );
-      expect(remove).toHaveBeenCalledTimes(1);
-      expect(remove).toHaveBeenCalledWith(keyUpdatedBy);
+      const promises = creatorKeys.map(async key => {
+        await rrr(
+          {
+            data,
+            key,
+            attribute,
+            schema: { options: { populateCreatorFields } },
+          },
+          { remove, set }
+        );
+      });
+      await Promise.all(promises);
 
+      expect(remove).toHaveBeenCalledTimes(creatorKeys.length);
+      creatorKeys.forEach(key => expect(remove).toHaveBeenCalledWith(key));
       expect(set).toBeCalledTimes(0);
     });
   });