Merge branch 'main' into lp-layout-2

inferno-framework · Sep 25, 2023 · 358c1e5 · 358c1e5
2 parents d34ec25 + 2f74dc9
commit 358c1e5
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 72 deletions.
diff --git a/client/src/components/App/__tests__/App.test.tsx b/client/src/components/App/__tests__/App.test.tsx
@@ -1,5 +1,7 @@
 import React from 'react';
+import { act } from 'react-dom/test-utils';
 import { render } from '@testing-library/react';
+
 import { vi } from 'vitest';
 import { SnackbarProvider } from 'notistack';
 
@@ -21,16 +23,17 @@ describe('The App Root Component', () => {
     vi.clearAllMocks();
   });
 
-  it('sets Test Suite state on mount', () => {
+  it('sets Test Suite state on mount', async () => {
     const getTestSuites = vi.spyOn(testSuitesApi, 'getTestSuites');
     getTestSuites.mockResolvedValue(testSuites);
-
-    render(
-      <ThemeProvider>
-        <SnackbarProvider>
-          <App />
-        </SnackbarProvider>
-      </ThemeProvider>
+    await act(() =>
+      render(
+        <ThemeProvider>
+          <SnackbarProvider>
+            <App />
+          </SnackbarProvider>
+        </ThemeProvider>
+      )
     );
 
     expect(getTestSuites).toBeCalledTimes(1);

diff --git a/client/src/components/TestSuite/TestSuiteDetails/TestListItem/__tests__/RequestList.test.tsx b/client/src/components/TestSuite/TestSuiteDetails/TestListItem/__tests__/RequestList.test.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import { act } from 'react-dom/test-utils';
 import { vi } from 'vitest';
 import userEvent from '@testing-library/user-event';
 import { render, screen, waitFor } from '@testing-library/react';
@@ -12,15 +13,17 @@ import {
 } from '~/components/RequestDetailModal/__mocked_data__/mockData';
 
 describe('The RequestsList component', () => {
-  test('it orders requests based on their index', () => {
+  test('it orders requests based on their index', async () => {
     const requests = [codeResponseWithHTML, mockedRequest];
 
-    render(
-      <ThemeProvider>
-        <SnackbarProvider>
-          <RequestList requests={requests} resultId="abc" updateRequest={() => {}} view="run" />
-        </SnackbarProvider>
-      </ThemeProvider>
+    await act(() =>
+      render(
+        <ThemeProvider>
+          <SnackbarProvider>
+            <RequestList requests={requests} resultId="abc" updateRequest={() => {}} view="run" />
+          </SnackbarProvider>
+        </ThemeProvider>
+      )
     );
 
     const renderedRequests = document.querySelectorAll('tbody > tr');
@@ -43,12 +46,14 @@ describe('The RequestsList component', () => {
       },
     });
 
-    render(
-      <ThemeProvider>
-        <SnackbarProvider>
-          <RequestList requests={requests} resultId="abc" updateRequest={() => {}} view="run" />
-        </SnackbarProvider>
-      </ThemeProvider>
+    await act(() =>
+      render(
+        <ThemeProvider>
+          <SnackbarProvider>
+            <RequestList requests={requests} resultId="abc" updateRequest={() => {}} view="run" />
+          </SnackbarProvider>
+        </ThemeProvider>
+      )
     );
 
     const buttons = screen.getAllByRole('button');
@@ -64,15 +69,17 @@ describe('The RequestsList component', () => {
     vi.resetAllMocks();
   });
 
-  test('shows details when button is clicked', () => {
+  test('shows details when button is clicked', async () => {
     const requests = [codeResponseWithHTML, mockedRequest];
 
-    render(
-      <ThemeProvider>
-        <SnackbarProvider>
-          <RequestList requests={requests} resultId="abc" updateRequest={() => {}} view="run" />
-        </SnackbarProvider>
-      </ThemeProvider>
+    await act(() =>
+      render(
+        <ThemeProvider>
+          <SnackbarProvider>
+            <RequestList requests={requests} resultId="abc" updateRequest={() => {}} view="run" />
+          </SnackbarProvider>
+        </ThemeProvider>
+      )
     );
 
     const buttons = screen.getAllByRole('button');

diff --git a/client/src/components/TestSuite/__tests__/TestSession.test.tsx b/client/src/components/TestSuite/__tests__/TestSession.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
+import { act } from 'react-dom/test-utils';
 import { SnackbarProvider } from 'notistack';
 import { render, screen } from '@testing-library/react';
 import { vi } from 'vitest';
@@ -10,42 +11,46 @@ import TestSessionWrapper from '../TestSessionWrapper';
 import { mockedTestSession, mockedResultsList } from '../__mocked_data__/mockData';
 
 describe('The TestSession Component', () => {
-  it('renders TestSessionWrapper', () => {
+  it('renders TestSessionWrapper', async () => {
     const getCoreVersion = vi.spyOn(versionsApi, 'getCoreVersion');
     getCoreVersion.mockResolvedValue('1.2.34');
 
-    render(
-      <BrowserRouter>
-        <ThemeProvider>
-          <SnackbarProvider>
-            <TestSessionWrapper />
-          </SnackbarProvider>
-        </ThemeProvider>
-      </BrowserRouter>
+    await act(() =>
+      render(
+        <BrowserRouter>
+          <ThemeProvider>
+            <SnackbarProvider>
+              <TestSessionWrapper />
+            </SnackbarProvider>
+          </ThemeProvider>
+        </BrowserRouter>
+      )
     );
 
     expect(getCoreVersion).toBeCalledTimes(1);
   });
 
-  it('renders TestSession', () => {
+  it('renders TestSession', async () => {
     let drawerOpen = true;
 
-    render(
-      <BrowserRouter>
-        <ThemeProvider>
-          <SnackbarProvider>
-            <TestSessionComponent
-              testSession={mockedTestSession}
-              previousResults={mockedResultsList}
-              initialTestRun={null}
-              sessionData={new Map()}
-              setSessionData={() => {}}
-              drawerOpen={drawerOpen}
-              toggleDrawer={() => (drawerOpen = !drawerOpen)}
-            />
-          </SnackbarProvider>
-        </ThemeProvider>
-      </BrowserRouter>
+    await act(() =>
+      render(
+        <BrowserRouter>
+          <ThemeProvider>
+            <SnackbarProvider>
+              <TestSessionComponent
+                testSession={mockedTestSession}
+                previousResults={mockedResultsList}
+                initialTestRun={null}
+                sessionData={new Map()}
+                setSessionData={() => {}}
+                drawerOpen={drawerOpen}
+                toggleDrawer={() => (drawerOpen = !drawerOpen)}
+              />
+            </SnackbarProvider>
+          </ThemeProvider>
+        </BrowserRouter>
+      )
     );
 
     const testSessionTitleComponentList = screen.getAllByTestId('navigable-group-item');

diff --git a/client/src/components/TestSuite/__tests__/TestSessionSmall.test.tsx b/client/src/components/TestSuite/__tests__/TestSessionSmall.test.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
+import { act } from 'react-dom/test-utils';
 import { render, renderHook, screen } from '@testing-library/react';
 import { SnackbarProvider } from 'notistack';
 import ThemeProvider from 'components/ThemeProvider';
@@ -13,25 +14,27 @@ beforeEach(() => {
   result.current.windowIsSmall = true;
 });
 
-test('renders narrow screen TestSession', () => {
+test('renders narrow screen TestSession', async () => {
   let drawerOpen = false;
 
-  render(
-    <MemoryRouter>
-      <ThemeProvider>
-        <SnackbarProvider>
-          <TestSessionComponent
-            testSession={mockedTestSession}
-            previousResults={mockedResultsList}
-            initialTestRun={null}
-            sessionData={new Map()}
-            setSessionData={() => {}}
-            drawerOpen={drawerOpen}
-            toggleDrawer={() => (drawerOpen = !drawerOpen)}
-          />
-        </SnackbarProvider>
-      </ThemeProvider>
-    </MemoryRouter>
+  await act(() =>
+    render(
+      <MemoryRouter>
+        <ThemeProvider>
+          <SnackbarProvider>
+            <TestSessionComponent
+              testSession={mockedTestSession}
+              previousResults={mockedResultsList}
+              initialTestRun={null}
+              sessionData={new Map()}
+              setSessionData={() => {}}
+              drawerOpen={drawerOpen}
+              toggleDrawer={() => (drawerOpen = !drawerOpen)}
+            />
+          </SnackbarProvider>
+        </ThemeProvider>
+      </MemoryRouter>
+    )
   );
 
   const testSessionTitleComponentList = screen.getAllByTestId('navigable-group-item');

diff --git a/codecov.yml b/codecov.yml
@@ -5,7 +5,7 @@ coverage:
 
 flag_management:
   default_rules:
-    carryforward: true;
+    carryforward: true
   individual_flags:
     - name: backend
       paths: