From f5a9528422f5a67526a47fbdaaa5e3ef128f59b8 Mon Sep 17 00:00:00 2001
From: Josh <37798644+joshuaellis@users.noreply.github.com>
Date: Mon, 12 Jun 2023 14:55:22 +0100
Subject: [PATCH] test: update to remove `act` calls

---
 .../useEnterprise/tests/useEnterprise.test.js | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/packages/core/admin/admin/src/hooks/useEnterprise/tests/useEnterprise.test.js b/packages/core/admin/admin/src/hooks/useEnterprise/tests/useEnterprise.test.js
index 027a1dc660..47a8d20824 100644
--- a/packages/core/admin/admin/src/hooks/useEnterprise/tests/useEnterprise.test.js
+++ b/packages/core/admin/admin/src/hooks/useEnterprise/tests/useEnterprise.test.js
@@ -1,4 +1,4 @@
-import { act, renderHook } from '@testing-library/react';
+import { renderHook, waitFor } from '@testing-library/react';
 
 import { useEnterprise } from '../useEnterprise';
 
@@ -29,11 +29,9 @@ describe('useEnterprise (EE)', () => {
   test('Returns default data on first render and EE data on second', async () => {
     const { result } = setup(CE_DATA_FIXTURE, async () => EE_DATA_FIXTURE);
 
-    await act(async () => {
-      expect(result.current).toBe(null);
-    });
+    expect(result.current).toBe(null);
 
-    expect(result.current).toBe(EE_DATA_FIXTURE);
+    await waitFor(() => expect(result.current).toBe(EE_DATA_FIXTURE));
   });
 
   test('Combines CE and EE data', async () => {
@@ -43,30 +41,26 @@ describe('useEnterprise (EE)', () => {
       },
     });
 
-    await act(async () => {
-      expect(result.current).toBe(null);
-    });
+    expect(result.current).toBe(null);
 
-    expect(result.current).toStrictEqual([...CE_DATA_FIXTURE, ...EE_DATA_FIXTURE]);
+    await waitFor(() =>
+      expect(result.current).toStrictEqual([...CE_DATA_FIXTURE, ...EE_DATA_FIXTURE])
+    );
   });
 
   test('Returns EE data without custom combine', async () => {
     const { result } = setup(CE_DATA_FIXTURE, async () => EE_DATA_FIXTURE);
 
-    await act(async () => {});
-
-    await act(async () => {
-      expect(result.current).toStrictEqual(EE_DATA_FIXTURE);
-    });
+    await waitFor(() => expect(result.current).toStrictEqual(EE_DATA_FIXTURE));
   });
 
-  test('Returns a custom defaultValue on first render', async () => {
+  test('Returns a custom defaultValue on first render followed by the EE data', async () => {
     const { result } = setup(CE_DATA_FIXTURE, async () => EE_DATA_FIXTURE, {
       defaultValue: false,
     });
 
-    await act(async () => {
-      expect(result.current).toBe(false);
-    });
+    expect(result.current).toBe(false);
+
+    await waitFor(() => expect(result.current).toStrictEqual(EE_DATA_FIXTURE));
   });
 });