test: fix test infrastructure after merge with main

Author: afonsojramos

src/hooks/useNotifications.test.ts

@@ -3,9 +3,14 @@ import { vi } from 'vitest';
 // Mock to use axios instead of Tauri HTTP plugin
 vi.mock('../utils/environment', () => ({ isTauriEnvironment: () => false }));
 
+// Mock decryptValue to return 'decrypted' for consistent test expectations
+vi.mock('../utils/comms', () => ({
+  decryptValue: vi.fn().mockResolvedValue('decrypted'),
+}));
+
 import { act, renderHook, waitFor } from '@testing-library/react';
 
-import axios, { AxiosError } from 'axios';
+import axios from 'axios';
 import nock from 'nock';
 
 import { mockAuth, mockSettings, mockState } from '../__mocks__/state-mocks';
@@ -27,6 +32,14 @@ describe('renderer/hooks/useNotifications.ts', () => {
 
     // Reset mock notification state between tests since it's mutated
     mockSingleNotification.unread = true;
+
+    // Disable real network connections to catch unmocked requests
+    nock.disableNetConnect();
+  });
+
+  afterEach(() => {
+    nock.cleanAll();
+    nock.enableNetConnect();
   });
 
   const id = mockSingleNotification.id;
@@ -120,33 +133,16 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should fetch notifications with same failures', async () => {
-      const code = AxiosError.ERR_BAD_REQUEST;
       const status = 401;
       const message = 'Bad credentials';
 
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .get('/notifications?participating=false')
-        .replyWithError({
-          code,
-          response: {
-            status,
-            data: {
-              message,
-            },
-          },
-        });
+        .reply(status, { message });
 
-      nock('https://github.gitify.io/api/v3/')
+      nock('https://github.gitify.io/api/v3')
         .get('/notifications?participating=false')
-        .replyWithError({
-          code,
-          response: {
-            status,
-            data: {
-              message,
-            },
-          },
-        });
+        .reply(status, { message });
 
       const { result } = renderHook(() => useNotifications());
 
@@ -165,31 +161,13 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should fetch notifications with different failures', async () => {
-      const code = AxiosError.ERR_BAD_REQUEST;
-
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .get('/notifications?participating=false')
-        .replyWithError({
-          code,
-          response: {
-            status: 400,
-            data: {
-              message: 'Oops! Something went wrong.',
-            },
-          },
-        });
+        .reply(400, { message: 'Oops! Something went wrong.' });
 
-      nock('https://github.gitify.io/api/v3/')
+      nock('https://github.gitify.io/api/v3')
         .get('/notifications?participating=false')
-        .replyWithError({
-          code,
-          response: {
-            status: 401,
-            data: {
-              message: 'Bad credentials',
-            },
-          },
-        });
+        .reply(401, { message: 'Bad credentials' });
 
       const { result } = renderHook(() => useNotifications());
 
@@ -203,14 +181,14 @@ describe('renderer/hooks/useNotifications.ts', () => {
         expect(result.current.status).toBe('error');
       });
 
-      expect(result.current.globalError).toBeNull();
+      expect(result.current.globalError).toBeUndefined();
       expect(rendererLogErrorSpy).toHaveBeenCalledTimes(4);
     });
   });
 
   describe('markNotificationsAsRead', () => {
     it('should mark notifications as read with success', async () => {
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .patch(`/notifications/threads/${id}`)
         .reply(200);
 
@@ -230,7 +208,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should mark notifications as read with failure', async () => {
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .patch(`/notifications/threads/${id}`)
         .reply(400);
 
@@ -243,17 +221,16 @@ describe('renderer/hooks/useNotifications.ts', () => {
       });
 
       await waitFor(() => {
-        expect(result.current.status).toBe('success');
+        expect(result.current.status).toBe('error');
       });
 
-      expect(result.current.notifications.length).toBe(0);
       expect(rendererLogErrorSpy).toHaveBeenCalledTimes(1);
     });
   });
 
   describe('markNotificationsAsDone', () => {
     it('should mark notifications as done with success', async () => {
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .delete(`/notifications/threads/${id}`)
         .reply(200);
 
@@ -273,7 +250,7 @@ describe('renderer/hooks/useNotifications.ts', () => {
     });
 
     it('should mark notifications as done with failure', async () => {
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .delete(`/notifications/threads/${id}`)
         .reply(400);
 
@@ -286,25 +263,22 @@ describe('renderer/hooks/useNotifications.ts', () => {
       });
 
       await waitFor(() => {
-        expect(result.current.status).toBe('success');
+        expect(result.current.status).toBe('error');
       });
 
-      expect(result.current.notifications.length).toBe(0);
       expect(rendererLogErrorSpy).toHaveBeenCalledTimes(1);
     });
   });
 
   describe('unsubscribeNotification', () => {
-    const id = 'notification-123';
-
     it('should unsubscribe from a notification with success - markAsDoneOnUnsubscribe = false', async () => {
       // The unsubscribe endpoint call.
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .put(`/notifications/threads/${id}/subscription`)
         .reply(200);
 
       // The mark read endpoint call.
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .patch(`/notifications/threads/${id}`)
         .reply(200);
 
@@ -326,12 +300,12 @@ describe('renderer/hooks/useNotifications.ts', () => {
 
     it('should unsubscribe from a notification with success - markAsDoneOnUnsubscribe = true', async () => {
       // The unsubscribe endpoint call.
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .put(`/notifications/threads/${id}/subscription`)
         .reply(200);
 
       // The mark done endpoint call.
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .delete(`/notifications/threads/${id}`)
         .reply(200);
 
@@ -359,12 +333,12 @@ describe('renderer/hooks/useNotifications.ts', () => {
 
     it('should unsubscribe from a notification with failure', async () => {
       // The unsubscribe endpoint call.
-      nock('https://api.github.com/')
+      nock('https://api.github.com')
         .put(`/notifications/threads/${id}/subscription`)
         .reply(400);
 
-      // The mark read endpoint call.
-      nock('https://api.github.com/')
+      // The mark read endpoint call (won't be called since unsubscribe fails first).
+      nock('https://api.github.com')
         .patch(`/notifications/threads/${id}`)
         .reply(400);
 
@@ -378,10 +352,9 @@ describe('renderer/hooks/useNotifications.ts', () => {
       });
 
       await waitFor(() => {
-        expect(result.current.status).toBe('success');
+        expect(result.current.status).toBe('error');
       });
 
-      expect(result.current.notifications.length).toBe(0);
       expect(rendererLogErrorSpy).toHaveBeenCalledTimes(1);
     });
   });

src/utils/api/request.test.ts

@@ -1,4 +1,13 @@
 import { vi } from 'vitest';
+
+// Mock to use axios instead of Tauri HTTP plugin
+vi.mock('../environment', () => ({ isTauriEnvironment: () => false }));
+
+// Mock decryptValue to return 'decrypted' for consistent test expectations
+vi.mock('../comms', () => ({
+  decryptValue: vi.fn().mockResolvedValue('decrypted'),
+}));
+
 import axios from 'axios';
 
 import { mockToken } from '../../__mocks__/state-mocks';
@@ -20,9 +29,6 @@ import {
 
 vi.mock('axios');
 
-// Mock to use axios instead of Tauri HTTP plugin in tests
-vi.mock('../environment', () => ({ isTauriEnvironment: () => false }));
-
 const url = 'https://example.com' as Link;
 const method = 'get';
 

src/utils/links.test.ts

@@ -88,9 +88,9 @@ describe('renderer/utils/links.ts', () => {
 
   it('openDeveloperSettings', () => {
     const mockSettingsURL = 'https://github.com/settings/tokens' as Link;
-    jest
-      .spyOn(authUtils, 'getDeveloperSettingsURL')
-      .mockReturnValue(mockSettingsURL);
+    vi.spyOn(authUtils, 'getDeveloperSettingsURL').mockReturnValue(
+      mockSettingsURL,
+    );
 
     openDeveloperSettings(mockGitHubCloudAccount);
 
@@ -110,9 +110,9 @@ describe('renderer/utils/links.ts', () => {
 
   it('openNotification', async () => {
     const mockNotificationUrl = mockSingleNotification.repository.htmlUrl;
-    jest
-      .spyOn(helpers, 'generateGitHubWebUrl')
-      .mockResolvedValue(mockNotificationUrl);
+    vi.spyOn(helpers, 'generateGitHubWebUrl').mockResolvedValue(
+      mockNotificationUrl,
+    );
 
     await openNotification(mockSingleNotification);
 

src/utils/notifications/handlers/checkSuite.test.ts

@@ -1,7 +1,7 @@
 import { vi } from 'vitest';
 
 // Mock to use axios instead of Tauri HTTP plugin
-vi.mock('../../../environment', () => ({ isTauriEnvironment: () => false }));
+vi.mock('../../environment', () => ({ isTauriEnvironment: () => false }));
 
 import { createPartialMockNotification } from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';

src/utils/notifications/handlers/commit.test.ts

@@ -1,7 +1,7 @@
 import { vi } from 'vitest';
 
 // Mock to use axios instead of Tauri HTTP plugin
-vi.mock('../../../environment', () => ({ isTauriEnvironment: () => false }));
+vi.mock('../../environment', () => ({ isTauriEnvironment: () => false }));
 
 import axios from 'axios';
 import nock from 'nock';
@@ -45,7 +45,7 @@ describe('renderer/utils/notifications/handlers/commit.ts', () => {
       const result = await commitHandler.enrich(mockNotification, mockSettings);
 
       expect(result).toEqual({
-        state: null,
+        state: undefined,
         user: {
           login: mockCommenter.login,
           htmlUrl: mockCommenter.html_url,
@@ -72,7 +72,7 @@ describe('renderer/utils/notifications/handlers/commit.ts', () => {
       const result = await commitHandler.enrich(mockNotification, mockSettings);
 
       expect(result).toEqual({
-        state: null,
+        state: undefined,
         user: {
           login: mockAuthor.login,
           htmlUrl: mockAuthor.html_url,

src/utils/notifications/handlers/default.test.ts

@@ -1,7 +1,7 @@
 import { vi } from 'vitest';
 
 // Mock to use axios instead of Tauri HTTP plugin
-vi.mock('../../../environment', () => ({ isTauriEnvironment: () => false }));
+vi.mock('../../environment', () => ({ isTauriEnvironment: () => false }));
 
 import { createPartialMockNotification } from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';

src/utils/notifications/handlers/discussion.test.ts

@@ -1,7 +1,7 @@
 import { vi } from 'vitest';
 
 // Mock to use axios instead of Tauri HTTP plugin
-vi.mock('../../../environment', () => ({ isTauriEnvironment: () => false }));
+vi.mock('../../environment', () => ({ isTauriEnvironment: () => false }));
 
 import axios from 'axios';
 import nock from 'nock';

src/utils/notifications/handlers/issue.test.ts

@@ -1,7 +1,7 @@
 import { vi } from 'vitest';
 
 // Mock to use axios instead of Tauri HTTP plugin
-vi.mock('../../../environment', () => ({ isTauriEnvironment: () => false }));
+vi.mock('../../environment', () => ({ isTauriEnvironment: () => false }));
 
 import axios from 'axios';
 import nock from 'nock';

src/utils/notifications/handlers/pullRequest.test.ts

@@ -1,7 +1,7 @@
 import { vi } from 'vitest';
 
 // Mock to use axios instead of Tauri HTTP plugin
-vi.mock('../../../environment', () => ({ isTauriEnvironment: () => false }));
+vi.mock('../../environment', () => ({ isTauriEnvironment: () => false }));
 
 import axios from 'axios';
 import nock from 'nock';

src/utils/notifications/handlers/release.test.ts

@@ -1,7 +1,7 @@
 import { vi } from 'vitest';
 
 // Mock to use axios instead of Tauri HTTP plugin
-vi.mock('../../../environment', () => ({ isTauriEnvironment: () => false }));
+vi.mock('../../environment', () => ({ isTauriEnvironment: () => false }));
 
 import axios from 'axios';
 import nock from 'nock';
@@ -41,7 +41,7 @@ describe('renderer/utils/notifications/handlers/release.ts', () => {
       );
 
       expect(result).toEqual({
-        state: null,
+        state: undefined,
         user: {
           login: mockAuthor.login,
           htmlUrl: mockAuthor.html_url,