refactor: notification handlers

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

Author: setchy

src/renderer/__helpers__/jest.setup.ts

@@ -1,14 +1,6 @@
 import '@testing-library/jest-dom';
 import { TextDecoder, TextEncoder } from 'node:util';
 
-import axios from 'axios';
-
-/**
- * axios will default to using the XHR adapter which can't be intercepted
- * by nock. So, configure axios to use the node adapter.
- */
-axios.defaults.adapter = 'http';
-
 /**
  * Prevent the following errors with jest:
  * - ReferenceError: TextEncoder is not defined

src/renderer/utils/auth/utils.test.ts

@@ -1,6 +1,7 @@
 import { ipcRenderer } from 'electron';
 
 import type { AxiosPromise, AxiosResponse } from 'axios';
+import axios from 'axios';
 import nock from 'nock';
 
 import {
@@ -168,6 +169,10 @@ describe('renderer/utils/auth/utils.ts', () => {
       mockAuthState = {
         accounts: [],
       };
+
+      // axios will default to using the XHR adapter which can't be intercepted
+      // by nock. So, configure axios to use the node adapter.
+      axios.defaults.adapter = 'http';
     });
 
     describe('should add GitHub Cloud account', () => {

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

@@ -1,3 +1,4 @@
+import axios from 'axios';
 import nock from 'nock';
 
 import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
@@ -14,6 +15,12 @@ describe('renderer/utils/notifications/handlers/commit.ts', () => {
     const mockAuthor = partialMockUser('some-author');
     const mockCommenter = partialMockUser('some-commenter');
 
+    beforeEach(() => {
+      // axios will default to using the XHR adapter which can't be intercepted
+      // by nock. So, configure axios to use the node adapter.
+      axios.defaults.adapter = 'http';
+    });
+
     it('get commit commenter', async () => {
       const mockNotification = partialMockNotification({
         title: 'This is a commit with comments',

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

@@ -1,3 +1,4 @@
+import axios from 'axios';
 import nock from 'nock';
 
 import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
@@ -34,6 +35,12 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
       ...(partialRepository as Repository),
     };
 
+    beforeEach(() => {
+      // axios will default to using the XHR adapter which can't be intercepted
+      // by nock. So, configure axios to use the node adapter.
+      axios.defaults.adapter = 'http';
+    });
+
     it('answered discussion state', async () => {
       nock('https://api.github.com')
         .post('/graphql')

src/renderer/utils/notifications/handlers/index.ts

@@ -14,7 +14,7 @@ import { workflowRunHandler } from './workflowRun';
 
 export function createNotificationHandler(
   notification: Notification,
-): NotificationTypeHandler | null {
+): NotificationTypeHandler {
   switch (notification.subject.type) {
     case 'CheckSuite':
       return checkSuiteHandler;

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

@@ -1,3 +1,4 @@
+import axios from 'axios';
 import nock from 'nock';
 
 import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
@@ -25,6 +26,10 @@ describe('renderer/utils/notifications/handlers/issue.ts', () => {
         latest_comment_url:
           'https://api.github.com/repos/gitify-app/notifications-test/issues/comments/302888448' as Link,
       });
+
+      // axios will default to using the XHR adapter which can't be intercepted
+      // by nock. So, configure axios to use the node adapter.
+      axios.defaults.adapter = 'http';
     });
 
     it('open issue state', async () => {

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

@@ -1,3 +1,4 @@
+import axios from 'axios';
 import nock from 'nock';
 
 import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
@@ -31,6 +32,12 @@ describe('renderer/utils/notifications/handlers/pullRequest.ts', () => {
     const mockAuthor = partialMockUser('some-author');
     const mockCommenter = partialMockUser('some-commenter');
 
+    beforeEach(() => {
+      // axios will default to using the XHR adapter which can't be intercepted
+      // by nock. So, configure axios to use the node adapter.
+      axios.defaults.adapter = 'http';
+    });
+
     it('closed pull request state', async () => {
       nock('https://api.github.com')
         .get('/repos/gitify-app/notifications-test/pulls/1')

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

@@ -1,3 +1,4 @@
+import axios from 'axios';
 import nock from 'nock';
 
 import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
@@ -13,6 +14,12 @@ describe('renderer/utils/notifications/handlers/release.ts', () => {
   describe('enrich', () => {
     const mockAuthor = partialMockUser('some-author');
 
+    beforeEach(() => {
+      // axios will default to using the XHR adapter which can't be intercepted
+      // by nock. So, configure axios to use the node adapter.
+      axios.defaults.adapter = 'http';
+    });
+
     it('release notification', async () => {
       const mockNotification = partialMockNotification({
         title: 'This is a mock release',

src/renderer/utils/notifications/notifications.test.ts

@@ -1,3 +1,4 @@
+import axios from 'axios';
 import nock from 'nock';
 
 import * as logger from '../../../shared/logger';
@@ -9,6 +10,12 @@ import type { Repository } from '../../typesGitHub';
 import { enrichNotification, getNotificationCount } from './notifications';
 
 describe('renderer/utils/notifications/notifications.ts', () => {
+  beforeEach(() => {
+    // axios will default to using the XHR adapter which can't be intercepted
+    // by nock. So, configure axios to use the node adapter.
+    axios.defaults.adapter = 'http';
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
   });

src/renderer/utils/notifications/notifications.ts

@@ -120,9 +120,7 @@ export async function enrichNotification(
 
   try {
     const handler = createNotificationHandler(notification);
-    if (handler) {
-      additionalSubjectDetails = await handler.enrich(notification, settings);
-    }
+    additionalSubjectDetails = await handler.enrich(notification, settings);
   } catch (err) {
     logError(
       'enrichNotification',