fix tests

Author: camd

package.json

@@ -48,15 +48,11 @@
     "react-hot-keys": "2.7.3",
     "react-lazylog": "4.5.3",
     "react-linkify": "0.2.2",
-    "react-redux": "8.0.7",
     "react-resizable-panels": "3.0.6",
     "react-router-dom": "6.28.0",
     "react-table-6": "6.11.0",
     "react-tabs": "6.1.0",
     "redoc": "2.4.0",
-    "redux": "4.2.1",
-    "redux-debounce": "1.0.1",
-    "redux-thunk": "2.4.2",
     "stream-browserify": "3.0.0",
     "styled-components": "6.1.19",
     "taskcluster-client-web": "87.1.3",
@@ -106,7 +102,6 @@
     "markdownlint-cli": "0.43.0",
     "prettier": "2.2.1",
     "puppeteer": "24.2.1",
-    "redux-mock-store": "1.5.5",
     "sass": "1.93.2",
     "sass-loader": "16.0.6",
     "setup-polly-jest": "0.11.0",

pnpm-lock.yaml

@@ -1,15 +1,16 @@
 import React from 'react';
 import fetchMock from 'fetch-mock';
 import { render, waitFor } from '@testing-library/react';
-import { Provider, ReactReduxContext } from 'react-redux';
 import { MemoryRouter, useLocation } from 'react-router-dom';
 
 import { AppRoutes } from '../../../ui/App';
 import pushListFixture from '../mock/push_list';
 import reposFixture from '../mock/repositories';
 import { getApiUrl } from '../../../ui/helpers/url';
 import { getProjectUrl } from '../../../ui/helpers/location';
-import { configureStore } from '../../../ui/job-view/redux/configureStore';
+import { usePushStore } from '../../../ui/job-view/stores/pushStore';
+import { useSelectedJobStore } from '../../../ui/job-view/stores/selectedJobStore';
+import { usePinnedJobsStore } from '../../../ui/job-view/stores/pinnedJobsStore';
 
 // Component to capture location for testing
 let testLocation;
@@ -19,14 +20,11 @@ const LocationCapture = () => {
 };
 
 const testApp = (initialEntries) => {
-  const store = configureStore();
   return (
-    <Provider store={store} context={ReactReduxContext}>
-      <MemoryRouter initialEntries={initialEntries}>
-        <LocationCapture />
-        <AppRoutes />
-      </MemoryRouter>
-    </Provider>
+    <MemoryRouter initialEntries={initialEntries}>
+      <LocationCapture />
+      <AppRoutes />
+    </MemoryRouter>
   );
 };
 
@@ -75,6 +73,23 @@ describe('history', () => {
 
   beforeEach(() => {
     testLocation = null;
+
+    // Reset Zustand stores
+    usePushStore.setState({
+      pushList: [],
+      jobMap: {},
+      decisionTaskMap: {},
+      revisionTips: [],
+      allUnclassifiedFailureCount: 0,
+      filteredUnclassifiedFailureCount: 0,
+    });
+    useSelectedJobStore.setState({
+      selectedJob: null,
+    });
+    usePinnedJobsStore.setState({
+      pinnedJobs: {},
+      isPinBoardVisible: false,
+    });
   });
 
   afterAll(() => {

tests/ui/job-view/AppHistory_test.jsx

@@ -1,14 +1,15 @@
 import React from 'react';
 import fetchMock from 'fetch-mock';
 import { render, waitFor } from '@testing-library/react';
-import { Provider, ReactReduxContext } from 'react-redux';
 import { MemoryRouter, useLocation } from 'react-router-dom';
 
 import { AppRoutes } from '../../../ui/App';
 import reposFixture from '../mock/repositories';
 import { getApiUrl } from '../../../ui/helpers/url';
 import { getProjectUrl } from '../../../ui/helpers/location';
-import { configureStore } from '../../../ui/job-view/redux/configureStore';
+import { usePushStore } from '../../../ui/job-view/stores/pushStore';
+import { useSelectedJobStore } from '../../../ui/job-view/stores/selectedJobStore';
+import { usePinnedJobsStore } from '../../../ui/job-view/stores/pinnedJobsStore';
 
 // Component to capture location for testing
 let testLocation;
@@ -18,14 +19,11 @@ const LocationCapture = () => {
 };
 
 const testApp = (initialEntries) => {
-  const store = configureStore();
   return (
-    <Provider store={store} context={ReactReduxContext}>
-      <MemoryRouter initialEntries={initialEntries}>
-        <LocationCapture />
-        <AppRoutes />
-      </MemoryRouter>
-    </Provider>
+    <MemoryRouter initialEntries={initialEntries}>
+      <LocationCapture />
+      <AppRoutes />
+    </MemoryRouter>
   );
 };
 
@@ -58,6 +56,23 @@ describe('Test for backwards-compatible routes for other apps', () => {
 
   beforeEach(() => {
     testLocation = null;
+
+    // Reset Zustand stores
+    usePushStore.setState({
+      pushList: [],
+      jobMap: {},
+      decisionTaskMap: {},
+      revisionTips: [],
+      allUnclassifiedFailureCount: 0,
+      filteredUnclassifiedFailureCount: 0,
+    });
+    useSelectedJobStore.setState({
+      selectedJob: null,
+    });
+    usePinnedJobsStore.setState({
+      pinnedJobs: {},
+      isPinBoardVisible: false,
+    });
   });
 
   test('old push health url should redirect to correct url', async () => {