Fix flaky test

bcgov · Nov 27, 2024 · d6b3711 · d6b3711
1 parent 0110304
commit d6b3711
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/source/frontend/src/components/common/ApiVersionInfo.test.tsx b/source/frontend/src/components/common/ApiVersionInfo.test.tsx
@@ -1,8 +1,8 @@
 import IApiVersion from '@/hooks/pims-api/interfaces/IApiVersion';
+import { useApiHealth } from '@/hooks/pims-api/useApiHealth';
+import { render, RenderOptions, waitForEffects } from '@/utils/test-utils';
 
 import { ApiVersionInfo } from './ApiVersionInfo';
-import { act, render, waitForEffects, RenderOptions } from '@/utils/test-utils';
-import { useApiHealth } from '@/hooks/pims-api/useApiHealth';
 
 const defaultVersion: IApiVersion = {
   environment: 'test',

diff --git a/source/frontend/src/components/layout/Footer/Footer.test.tsx b/source/frontend/src/components/layout/Footer/Footer.test.tsx
@@ -1,8 +1,10 @@
+import { createMemoryHistory } from 'history';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
+
 import IApiVersion from '@/hooks/pims-api/interfaces/IApiVersion';
-import { createMemoryHistory } from 'history';
-import { RenderOptions, render } from '@/utils/test-utils';
+import { RenderOptions, render, waitForEffects } from '@/utils/test-utils';
+
 import Footer from './Footer';
 
 const defaultVersion: IApiVersion = {
@@ -13,9 +15,7 @@ const defaultVersion: IApiVersion = {
   dbVersion: '93.00',
 };
 
-const mockGetVersion = vi.fn(async () => {
-  return Promise.resolve({ data: defaultVersion });
-});
+const mockGetVersion = vi.fn();
 
 const mockStore = configureMockStore([thunk]);
 const history = createMemoryHistory();
@@ -39,8 +39,18 @@ vi.mock('@/hooks/pims-api/useApiHealth', () => ({
 }));
 
 describe('Footer', () => {
-  it('renders correctly', () => {
+  afterEach(() => {
+    vi.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    import.meta.env.VITE_PACKAGE_VERSION = '11.1.1-93.999';
+    mockGetVersion.mockResolvedValue({ data: defaultVersion } as any);
+  });
+
+  it('renders correctly', async () => {
     const { asFragment } = setup({});
+    await waitForEffects();
     expect(asFragment()).toMatchSnapshot();
   });
 });
diff --git a/source/frontend/src/components/layout/Footer/__snapshots__/Footer.test.tsx.snap b/source/frontend/src/components/layout/Footer/__snapshots__/Footer.test.tsx.snap
@@ -191,7 +191,7 @@ exports[`Footer > renders correctly 1`] = `
           class="version"
           data-testid="version-tag"
         >
-          v5.7.0-94.5
+          v11.1.1-93.999
         </div>
         <div
           class="c2 c3"