test: refactor render with app context

setchy · setchy · commit 376e13805e46 · 2025-11-16T17:01:53.000-05:00
Signed-off-by: Adam Setch &lt;adam.setch@outlook.com&gt;
diff --git a/src/renderer/__helpers__/test-utils.tsx b/src/renderer/__helpers__/test-utils.tsx
@@ -67,3 +67,10 @@ export function renderWithAppContext(
     ),
   });
 }
+
+/**
+ * Ensure stable snapshots for our randomized emoji use-cases
+ */
+export function ensureStableEmojis() {
+  global.Math.random = jest.fn(() => 0.1);
+}
diff --git a/src/renderer/__mocks__/account-mocks.ts b/src/renderer/__mocks__/account-mocks.ts
@@ -6,11 +6,6 @@ import type {
   Hostname,
   Token,
 } from '../types';
-import {
-  mockEnterpriseNotifications,
-  mockGitHubNotifications,
-  mockSingleNotification,
-} from '../utils/api/__mocks__/response-mocks';
 import { mockGitifyUser } from './user-mocks';
 
 export const mockPersonalAccessTokenAccount: Account = {
@@ -59,27 +54,6 @@ export const mockGitHubAppAccount: Account = {
   hasRequiredScopes: true,
 };
 
-export const mockAccountNotifications: AccountNotifications[] = [
-  {
-    account: mockGitHubCloudAccount,
-    notifications: mockGitHubNotifications,
-    error: null,
-  },
-  {
-    account: mockGitHubEnterpriseServerAccount,
-    notifications: mockEnterpriseNotifications,
-    error: null,
-  },
-];
-
-export const mockSingleAccountNotifications: AccountNotifications[] = [
-  {
-    account: mockGitHubCloudAccount,
-    notifications: [mockSingleNotification],
-    error: null,
-  },
-];
-
 export function mockAccountWithError(error: GitifyError): AccountNotifications {
   return {
     account: mockGitHubCloudAccount,
diff --git a/src/renderer/__mocks__/notifications-mocks.ts b/src/renderer/__mocks__/notifications-mocks.ts
@@ -1,13 +1,21 @@
 import { Constants } from '../constants';
-import type { Hostname } from '../types';
+import type { AccountNotifications, Hostname } from '../types';
 import type {
   Notification,
   Repository,
   StateType,
   Subject,
   SubjectType,
 } from '../typesGitHub';
-import { mockGitHubCloudAccount } from './account-mocks';
+import {
+  mockEnterpriseNotifications,
+  mockGitHubNotifications,
+  mockSingleNotification,
+} from '../utils/api/__mocks__/response-mocks';
+import {
+  mockGitHubCloudAccount,
+  mockGitHubEnterpriseServerAccount,
+} from './account-mocks';
 import { mockToken } from './state-mocks';
 import { mockGitifyUser } from './user-mocks';
 
@@ -55,3 +63,24 @@ export function createMockNotificationForRepoName(
     account: mockGitHubCloudAccount,
   } as Notification;
 }
+
+export const mockAccountNotifications: AccountNotifications[] = [
+  {
+    account: mockGitHubCloudAccount,
+    notifications: mockGitHubNotifications,
+    error: null,
+  },
+  {
+    account: mockGitHubEnterpriseServerAccount,
+    notifications: mockEnterpriseNotifications,
+    error: null,
+  },
+];
+
+export const mockSingleAccountNotifications: AccountNotifications[] = [
+  {
+    account: mockGitHubCloudAccount,
+    notifications: [mockSingleNotification],
+    error: null,
+  },
+];
diff --git a/src/renderer/__mocks__/utils.ts b/src/renderer/__mocks__/utils.ts
diff --git a/src/renderer/components/AllRead.test.tsx b/src/renderer/components/AllRead.test.tsx
@@ -1,8 +1,10 @@
 import { act } from '@testing-library/react';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
+import {
+  ensureStableEmojis,
+  renderWithAppContext,
+} from '../__helpers__/test-utils';
 import { mockSettings } from '../__mocks__/state-mocks';
-import { ensureStableEmojis } from '../__mocks__/utils';
 import { AllRead } from './AllRead';
 
 describe('renderer/components/AllRead.tsx', () => {
diff --git a/src/renderer/components/Oops.test.tsx b/src/renderer/components/Oops.test.tsx
@@ -1,7 +1,9 @@
 import { act } from '@testing-library/react';
 
-import { renderWithAppContext } from '../__helpers__/test-utils';
-import { ensureStableEmojis } from '../__mocks__/utils';
+import {
+  ensureStableEmojis,
+  renderWithAppContext,
+} from '../__helpers__/test-utils';
 import { Oops } from './Oops';
 
 describe('renderer/components/Oops.tsx', () => {
diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
 
 import { renderWithAppContext } from '../__helpers__/test-utils';
-import { mockAccountNotifications } from '../__mocks__/account-mocks';
+import { mockAccountNotifications } from '../__mocks__/notifications-mocks';
 import * as comms from '../utils/comms';
 import { Sidebar } from './Sidebar';
 
diff --git a/src/renderer/components/filters/FilterSection.test.tsx b/src/renderer/components/filters/FilterSection.test.tsx
@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event';
 import { MarkGithubIcon } from '@primer/octicons-react';
 
 import { renderWithAppContext } from '../../__helpers__/test-utils';
-import { mockAccountNotifications } from '../../__mocks__/account-mocks';
+import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
 import { stateFilter } from '../../utils/notifications/filters';
 import { FilterSection } from './FilterSection';
diff --git a/src/renderer/components/filters/ReasonFilter.test.tsx b/src/renderer/components/filters/ReasonFilter.test.tsx
@@ -1,5 +1,5 @@
 import { renderWithAppContext } from '../../__helpers__/test-utils';
-import { mockAccountNotifications } from '../../__mocks__/account-mocks';
+import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { ReasonFilter } from './ReasonFilter';
 
 describe('renderer/components/filters/ReasonFilter.tsx', () => {
diff --git a/src/renderer/components/filters/StateFilter.test.tsx b/src/renderer/components/filters/StateFilter.test.tsx
@@ -1,5 +1,5 @@
 import { renderWithAppContext } from '../../__helpers__/test-utils';
-import { mockAccountNotifications } from '../../__mocks__/account-mocks';
+import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { StateFilter } from './StateFilter';
 
 describe('renderer/components/filters/StateFilter.tsx', () => {
diff --git a/src/renderer/components/filters/SubjectTypeFilter.test.tsx b/src/renderer/components/filters/SubjectTypeFilter.test.tsx
@@ -1,5 +1,5 @@
 import { renderWithAppContext } from '../../__helpers__/test-utils';
-import { mockAccountNotifications } from '../../__mocks__/account-mocks';
+import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { SubjectTypeFilter } from './SubjectTypeFilter';
 
 describe('renderer/components/filters/SubjectTypeFilter.tsx', () => {
diff --git a/src/renderer/components/filters/UserTypeFilter.test.tsx b/src/renderer/components/filters/UserTypeFilter.test.tsx
@@ -1,5 +1,5 @@
 import { renderWithAppContext } from '../../__helpers__/test-utils';
-import { mockAccountNotifications } from '../../__mocks__/account-mocks';
+import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { UserTypeFilter } from './UserTypeFilter';
 
 describe('renderer/components/filters/UserTypeFilter.tsx', () => {
diff --git a/src/renderer/components/notifications/AccountNotifications.test.tsx b/src/renderer/components/notifications/AccountNotifications.test.tsx
@@ -1,10 +1,12 @@
 import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { renderWithAppContext } from '../../__helpers__/test-utils';
+import {
+  ensureStableEmojis,
+  renderWithAppContext,
+} from '../../__helpers__/test-utils';
 import { mockGitHubCloudAccount } from '../../__mocks__/account-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
-import { ensureStableEmojis } from '../../__mocks__/utils';
 import { GroupBy } from '../../types';
 import { mockGitHubNotifications } from '../../utils/api/__mocks__/response-mocks';
 import * as links from '../../utils/links';
diff --git a/src/renderer/routes/Notifications.test.tsx b/src/renderer/routes/Notifications.test.tsx
@@ -1,5 +1,5 @@
 import { renderWithAppContext } from '../__helpers__/test-utils';
-import { mockAccountNotifications } from '../__mocks__/account-mocks';
+import { mockAccountNotifications } from '../__mocks__/notifications-mocks';
 import { mockSettings } from '../__mocks__/state-mocks';
 import { Errors } from '../utils/errors';
 import { NotificationsRoute } from './Notifications';
diff --git a/src/renderer/utils/notifications/native.test.ts b/src/renderer/utils/notifications/native.test.ts
@@ -3,7 +3,7 @@ import { waitFor } from '@testing-library/react';
 import {
   mockAccountNotifications,
   mockSingleAccountNotifications,
-} from '../../__mocks__/account-mocks';
+} from '../../__mocks__/notifications-mocks';
 import * as native from './native';
 
 describe('renderer/utils/notifications/native.ts', () => {
diff --git a/src/renderer/utils/notifications/notifications.test.ts b/src/renderer/utils/notifications/notifications.test.ts
@@ -4,11 +4,11 @@ import nock from 'nock';
 import {
   mockGitHubCloudAccount,
   mockGitHubEnterpriseServerAccount,
-  mockSingleAccountNotifications,
 } from '../../__mocks__/account-mocks';
 import {
   createMockNotificationForRepoName,
   createPartialMockNotification,
+  mockSingleAccountNotifications,
 } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
 import {
diff --git a/src/renderer/utils/notifications/remove.test.ts b/src/renderer/utils/notifications/remove.test.ts
@@ -1,7 +1,5 @@
-import {
-  mockGitHubEnterpriseServerAccount,
-  mockSingleAccountNotifications,
-} from '../../__mocks__/account-mocks';
+import { mockGitHubEnterpriseServerAccount } from '../../__mocks__/account-mocks';
+import { mockSingleAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
 import { mockSingleNotification } from '../api/__mocks__/response-mocks';
 import { removeNotificationsForAccount } from './remove';
