chore(test): update web test to use act from react

ar-io · Sep 25, 2024 · 91e49af · 91e49af
1 parent 0595db7
commit 91e49af
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 30 deletions.
diff --git a/tests/e2e/web/src/App.test.tsx b/tests/e2e/web/src/App.test.tsx
@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom';
-import { act, render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import { act } from 'react';
 import { DockerComposeEnvironment, Wait } from 'testcontainers';
 import { beforeAll, describe, expect, it } from 'vitest';
 

diff --git a/tests/e2e/web/src/App.tsx b/tests/e2e/web/src/App.tsx
@@ -30,35 +30,38 @@ function App() {
   const [registryLoaded, setRegistryLoaded] = useState<boolean>(false);
 
   useEffect(() => {
-    io.getInfo()
-      .then((state: any) => {
-        setContract(`\`\`\`json\n${JSON.stringify(state, null, 2)}`);
-        setIoContractSuccess(true);
-      })
-      .catch((error: any) => {
-        console.error(error);
-        setIoContractSuccess(false);
-        setContract('Error loading contract state');
-      })
-      .finally(() => {
-        setLoaded(true);
-      });
-    antRegistry
-      .accessControlList({
-        address: ANT_REGISTRY_ID,
-      })
-      .then((affiliatedAnts: { Owned: string[]; Controlled: string[] }) => {
-        setAnts(`\`\`\`json\n${JSON.stringify(affiliatedAnts, null, 2)}`);
-        setAntRegistrySuccess(true);
-      })
-      .catch((error: any) => {
-        console.error(error);
-        setAntRegistrySuccess(false);
-        setAnts('Error loading affiliated ants');
-      })
-      .finally(() => {
-        setRegistryLoaded(true);
-      });
+    Promise.all([
+      io
+        .getInfo()
+        .then((state: any) => {
+          setContract(`\`\`\`json\n${JSON.stringify(state, null, 2)}`);
+          setIoContractSuccess(true);
+        })
+        .catch((error: any) => {
+          console.error(error);
+          setIoContractSuccess(false);
+          setContract('Error loading contract state');
+        })
+        .finally(() => {
+          setLoaded(true);
+        }),
+      antRegistry
+        .accessControlList({
+          address: ANT_REGISTRY_ID,
+        })
+        .then((affiliatedAnts: { Owned: string[]; Controlled: string[] }) => {
+          setAnts(`\`\`\`json\n${JSON.stringify(affiliatedAnts, null, 2)}`);
+          setAntRegistrySuccess(true);
+        })
+        .catch((error: any) => {
+          console.error(error);
+          setAntRegistrySuccess(false);
+          setAnts('Error loading affiliated ants');
+        })
+        .finally(() => {
+          setRegistryLoaded(true);
+        }),
+    ]);
   }, []);
 
   return (