refactor: test mock helpers

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/renderer/__helpers__/test-utils.tsx

@@ -1,12 +1,10 @@
 import { render } from '@testing-library/react';
-import type { ReactElement, ReactNode } from 'react';
-import { useMemo } from 'react';
+import { type ReactElement, type ReactNode, useMemo } from 'react';
 
 import { BaseStyles, ThemeProvider } from '@primer/react';
 
 import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
-import type { AppContextState } from '../context/App';
-import { AppContext } from '../context/App';
+import { AppContext, type AppContextState } from '../context/App';
 
 /**
  * Props for the AppContextProvider wrapper

src/renderer/__mocks__/account-mocks.ts

@@ -54,7 +54,9 @@ export const mockGitHubAppAccount: Account = {
   hasRequiredScopes: true,
 };
 
-export function mockAccountWithError(error: GitifyError): AccountNotifications {
+export function createMockAccountWithError(
+  error: GitifyError,
+): AccountNotifications {
   return {
     account: mockGitHubCloudAccount,
     notifications: [],

src/renderer/__mocks__/notifications-mocks.ts

@@ -19,6 +19,27 @@ import {
 import { mockToken } from './state-mocks';
 import { mockGitifyUser } from './user-mocks';
 
+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 createMockSubject(mocks: {
   title?: string;
   type?: SubjectType;
@@ -63,24 +84,3 @@ 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,
-  },
-];

src/renderer/utils/errors.test.ts

@@ -1,4 +1,4 @@
-import { mockAccountWithError } from '../__mocks__/account-mocks';
+import { createMockAccountWithError } from '../__mocks__/account-mocks';
 import type { AccountNotifications } from '../types';
 import {
   areAllAccountErrorsSame,
@@ -14,17 +14,17 @@ describe('renderer/utils/errors.ts', () => {
 
     it('returns false when some accounts have no error', () => {
       const items: AccountNotifications[] = [
-        mockAccountWithError(Errors.NETWORK),
-        mockAccountWithError(null),
+        createMockAccountWithError(Errors.NETWORK),
+        createMockAccountWithError(null),
       ];
 
       expect(doesAllAccountsHaveErrors(items)).toBe(false);
     });
 
     it('returns true when every account has an error', () => {
       const items: AccountNotifications[] = [
-        mockAccountWithError(Errors.NETWORK),
-        mockAccountWithError(Errors.RATE_LIMITED),
+        createMockAccountWithError(Errors.NETWORK),
+        createMockAccountWithError(Errors.RATE_LIMITED),
       ];
 
       expect(doesAllAccountsHaveErrors(items)).toBe(true);
@@ -39,26 +39,26 @@ describe('renderer/utils/errors.ts', () => {
     it('returns true when all errors are identical object reference', () => {
       const err = Errors.NETWORK;
       const items: AccountNotifications[] = [
-        mockAccountWithError(err),
-        mockAccountWithError(err),
+        createMockAccountWithError(err),
+        createMockAccountWithError(err),
       ];
 
       expect(areAllAccountErrorsSame(items)).toBe(true);
     });
 
     it('returns false when errors differ', () => {
       const items: AccountNotifications[] = [
-        mockAccountWithError(Errors.NETWORK),
-        mockAccountWithError(Errors.RATE_LIMITED),
+        createMockAccountWithError(Errors.NETWORK),
+        createMockAccountWithError(Errors.RATE_LIMITED),
       ];
 
       expect(areAllAccountErrorsSame(items)).toBe(false);
     });
 
     it('returns false when one account has null error', () => {
       const items: AccountNotifications[] = [
-        mockAccountWithError(Errors.NETWORK),
-        mockAccountWithError(null),
+        createMockAccountWithError(Errors.NETWORK),
+        createMockAccountWithError(null),
       ];
 
       expect(areAllAccountErrorsSame(items)).toBe(false);