Fix unit tests #354

ral-facilities · Aug 19, 2020 · 9b4d7b3 · 9b4d7b3
1 parent 404fab2
commit 9b4d7b3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/src/setupTests.ts b/src/setupTests.ts
@@ -11,4 +11,18 @@ if (typeof window.URL.createObjectURL === 'undefined') {
   Object.defineProperty(window.URL, 'createObjectURL', { value: noOp });
 }
 
+Object.defineProperty(window, 'matchMedia', {
+  writable: true,
+  value: jest.fn().mockImplementation((query) => ({
+    matches: false,
+    media: query,
+    onchange: null,
+    addListener: jest.fn(),
+    removeListener: jest.fn(),
+    addEventListener: jest.fn(),
+    removeEventListener: jest.fn(),
+    dispatchEvent: jest.fn(),
+  })),
+});
+
 export const flushPromises = (): Promise<void> => new Promise(setImmediate);
diff --git a/src/state/actions/scigateway.actions.test.tsx b/src/state/actions/scigateway.actions.test.tsx
@@ -189,7 +189,7 @@ describe('scigateway actions', () => {
 
     await asyncAction(dispatch, getState);
 
-    expect(actions[1]).toEqual(
+    expect(actions[2]).toEqual(
       loadFeatureSwitches({ showContactButton: true })
     );
   });
@@ -211,7 +211,7 @@ describe('scigateway actions', () => {
 
     await asyncAction(dispatch, getState);
 
-    expect(actions[0]).toEqual(configureAnalytics('test-tracking-id'));
+    expect(actions[1]).toEqual(configureAnalytics('test-tracking-id'));
   });
 
   it('dispatches a site loading update after settings are loaded', async () => {
@@ -245,7 +245,7 @@ describe('scigateway actions', () => {
 
     await asyncAction(dispatch, getState);
 
-    expect(actions.length).toEqual(6);
+    expect(actions.length).toEqual(7);
     expect(actions).toContainEqual(authorised());
     expect(actions).toContainEqual(siteLoadingUpdate(false));
   });
@@ -276,7 +276,7 @@ describe('scigateway actions', () => {
 
     await asyncAction(dispatch, getState);
 
-    expect(actions.length).toEqual(5);
+    expect(actions.length).toEqual(6);
     expect(actions).toContainEqual(invalidToken());
     expect(actions).toContainEqual(siteLoadingUpdate(false));
   });

diff --git a/src/state/middleware/scigateway.middleware.test.tsx b/src/state/middleware/scigateway.middleware.test.tsx
@@ -203,7 +203,12 @@ describe('scigateway middleware', () => {
   });
 
   it('should send dark theme options when LoadDarkModePreferenceType action is sent and darkmode preference is true', () => {
-    Storage.prototype.getItem = jest.fn(() => 'true');
+    const loadDarkModePreferenceAction = {
+      type: LoadDarkModePreferenceType,
+      payload: {
+        darkMode: true,
+      },
+    };
 
     const theme = buildTheme(true);