Merge pull request #7152 from pjonsson/fix-await-warnings

test: stop awaiting act()
TerriaJS · May 22, 2024 · e6b2cca · e6b2cca
2 parents a04930a + 9952ae5
commit e6b2cca
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/test/ReactViews/ToolSpec.tsx b/test/ReactViews/ToolSpec.tsx
@@ -22,7 +22,7 @@ describe("Tool", function () {
   // 16.3.2, we can enable them after migrating to a newer version.
   xit("renders the item returned by getToolComponent", async function () {
     let rendered: any;
-    await act(async () => {
+    act(async () => {
       rendered = createWithContexts(
         viewState,
         <Tool

diff --git a/test/ReactViews/Tools/ItemSearchTool/ItemSearchToolSpec.tsx b/test/ReactViews/Tools/ItemSearchTool/ItemSearchToolSpec.tsx
@@ -86,13 +86,18 @@ describe("ItemSearchTool", function () {
   it("initializes an describes the parameters when mounted", async function () {
     spyOn(itemSearchProvider, "initialize").and.callThrough();
     spyOn(itemSearchProvider, "describeParameters").and.callThrough();
-    await act(() => {
-      rendered = render({
-        item,
-        itemSearchProvider,
-        viewState
-      });
+    let renderPromise: Promise<void> | undefined;
+    act(() => {
+      renderPromise = new Promise((resolve) =>
+        render({
+          item,
+          itemSearchProvider,
+          viewState,
+          afterLoad: resolve
+        })
+      );
     });
+    await renderPromise;
     expect(itemSearchProvider.initialize).toHaveBeenCalledTimes(1);
     expect(itemSearchProvider.describeParameters).toHaveBeenCalledTimes(1);
   });
@@ -188,6 +193,6 @@ function renderAndLoad(
 async function submitForm(root: ReactTestInstance): Promise<ReactTestInstance> {
   const searchForm = root.findByType("form");
   expect(searchForm).toBeDefined();
-  await act(() => searchForm.props.onSubmit({ preventDefault: () => {} }));
+  act(() => searchForm.props.onSubmit({ preventDefault: () => {} }));
   return searchForm;
 }
diff --git a/test/ReactViews/Tools/ItemSearchTool/SearchResultsSpec.tsx b/test/ReactViews/Tools/ItemSearchTool/SearchResultsSpec.tsx
@@ -27,7 +27,7 @@ async function render(
   props: Omit<SearchResultsProps, "i18n" | "t" | "tReady">
 ): Promise<ReactTestRenderer> {
   let rendered: ReactTestRenderer;
-  await act(() => {
+  act(() => {
     rendered = create(<SearchResults {...props} />);
   });
   // @ts-ignore

diff --git a/test/ReactViews/Workflows/WorkflowPanelSpec.tsx b/test/ReactViews/Workflows/WorkflowPanelSpec.tsx
@@ -23,7 +23,7 @@ describe("WorkflowPanel", function () {
 
   it("sets isWorkflowPanelActive when opened", async function () {
     expect(viewState.terria.isWorkflowPanelActive).toBe(false);
-    await act(() => {
+    act(() => {
       TestRenderer.create(
         <WorkflowPanel
           viewState={viewState}
@@ -38,7 +38,7 @@ describe("WorkflowPanel", function () {
   });
 
   it("unsets isWorkflowPanelActive sidepanel when closed", async function () {
-    await act(() => {
+    act(() => {
       testRenderer = TestRenderer.create(
         <WorkflowPanel
           viewState={viewState}