refactor: rename markRepoNotifications to markRepoNotificationsRead

gitify-app · Jun 8, 2024 · 8ff06ac · 8ff06ac
1 parent 665d7a5
commit 8ff06ac
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/src/components/Repository.test.tsx b/src/components/Repository.test.tsx
@@ -9,7 +9,7 @@ jest.mock('./NotificationRow', () => ({
 }));
 
 describe('components/Repository.tsx', () => {
-  const markRepoNotifications = jest.fn();
+  const markRepoNotificationsRead = jest.fn();
   const markRepoNotificationsDone = jest.fn();
 
   const props = {
@@ -19,7 +19,7 @@ describe('components/Repository.tsx', () => {
   };
 
   beforeEach(() => {
-    markRepoNotifications.mockReset();
+    markRepoNotificationsRead.mockReset();
 
     jest.spyOn(shell, 'openExternal');
   });
@@ -50,14 +50,14 @@ describe('components/Repository.tsx', () => {
 
   it('should mark a repo as read', () => {
     render(
-      <AppContext.Provider value={{ markRepoNotifications }}>
+      <AppContext.Provider value={{ markRepoNotificationsRead }}>
         <RepositoryNotifications {...props} />
       </AppContext.Provider>,
     );
 
     fireEvent.click(screen.getByTitle('Mark Repository as Read'));
 
-    expect(markRepoNotifications).toHaveBeenCalledWith(
+    expect(markRepoNotificationsRead).toHaveBeenCalledWith(
       'gitify-app/notifications-test',
       'github.com',
     );

diff --git a/src/components/Repository.tsx b/src/components/Repository.tsx
@@ -17,7 +17,7 @@ export const RepositoryNotifications: FC<IProps> = ({
   repoNotifications,
   hostname,
 }) => {
-  const { markRepoNotifications, markRepoNotificationsDone } =
+  const { markRepoNotificationsRead, markRepoNotificationsDone } =
     useContext(AppContext);
 
   const openBrowser = useCallback(() => {
@@ -27,7 +27,7 @@ export const RepositoryNotifications: FC<IProps> = ({
 
   const markRepoAsRead = useCallback(() => {
     const repoSlug = repoNotifications[0].repository.full_name;
-    markRepoNotifications(repoSlug, hostname);
+    markRepoNotificationsRead(repoSlug, hostname);
   }, [repoNotifications, hostname]);
 
   const markRepoAsDone = useCallback(() => {

diff --git a/src/context/App.test.tsx b/src/context/App.test.tsx
@@ -45,7 +45,7 @@ describe('context/App.tsx', () => {
     const markNotificationReadMock = jest.fn();
     const markNotificationDoneMock = jest.fn();
     const unsubscribeNotificationMock = jest.fn();
-    const markRepoNotificationsMock = jest.fn();
+    const markRepoNotificationsReadMock = jest.fn();
     const markRepoNotificationsDoneMock = jest.fn();
 
     const mockDefaultState = {
@@ -59,7 +59,7 @@ describe('context/App.tsx', () => {
         markNotificationRead: markNotificationReadMock,
         markNotificationDone: markNotificationDoneMock,
         unsubscribeNotification: unsubscribeNotificationMock,
-        markRepoNotifications: markRepoNotificationsMock,
+        markRepoNotificationsRead: markRepoNotificationsReadMock,
         markRepoNotificationsDone: markRepoNotificationsDoneMock,
       });
     });
@@ -198,15 +198,15 @@ describe('context/App.tsx', () => {
       );
     });
 
-    it('should call markRepoNotifications', async () => {
+    it('should call markRepoNotificationsRead', async () => {
       const TestComponent = () => {
-        const { markRepoNotifications } = useContext(AppContext);
+        const { markRepoNotificationsRead } = useContext(AppContext);
 
         return (
           <button
             type="button"
             onClick={() =>
-              markRepoNotifications(
+              markRepoNotificationsRead(
                 'gitify-app/notifications-test',
                 'github.com',
               )
@@ -219,12 +219,12 @@ describe('context/App.tsx', () => {
 
       const { getByText } = customRender(<TestComponent />);
 
-      markRepoNotificationsMock.mockReset();
+      markRepoNotificationsReadMock.mockReset();
 
       fireEvent.click(getByText('Test Case'));
 
-      expect(markRepoNotificationsMock).toHaveBeenCalledTimes(1);
-      expect(markRepoNotificationsMock).toHaveBeenCalledWith(
+      expect(markRepoNotificationsReadMock).toHaveBeenCalledTimes(1);
+      expect(markRepoNotificationsReadMock).toHaveBeenCalledWith(
         mockDefaultState,
         'gitify-app/notifications-test',
         'github.com',

diff --git a/src/context/App.tsx b/src/context/App.tsx
@@ -79,7 +79,7 @@ interface AppContextState {
   markNotificationRead: (id: string, hostname: string) => Promise<void>;
   markNotificationDone: (id: string, hostname: string) => Promise<void>;
   unsubscribeNotification: (id: string, hostname: string) => Promise<void>;
-  markRepoNotifications: (id: string, hostname: string) => Promise<void>;
+  markRepoNotificationsRead: (id: string, hostname: string) => Promise<void>;
   markRepoNotificationsDone: (id: string, hostname: string) => Promise<void>;
 
   settings: SettingsState;
@@ -103,7 +103,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     markNotificationRead,
     markNotificationDone,
     unsubscribeNotification,
-    markRepoNotifications,
+    markRepoNotificationsRead,
     markRepoNotificationsDone,
   } = useNotifications();
 
@@ -248,9 +248,9 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
     [auth, notifications],
   );
 
-  const markRepoNotificationsWithAccounts = useCallback(
+  const markRepoNotificationsReadWithAccounts = useCallback(
     async (repoSlug: string, hostname: string) =>
-      await markRepoNotifications({ auth, settings }, repoSlug, hostname),
+      await markRepoNotificationsRead({ auth, settings }, repoSlug, hostname),
     [auth, notifications],
   );
 
@@ -279,7 +279,7 @@ export const AppProvider = ({ children }: { children: ReactNode }) => {
         markNotificationRead: markNotificationReadWithAccounts,
         markNotificationDone: markNotificationDoneWithAccounts,
         unsubscribeNotification: unsubscribeNotificationWithAccounts,
-        markRepoNotifications: markRepoNotificationsWithAccounts,
+        markRepoNotificationsRead: markRepoNotificationsReadWithAccounts,
         markRepoNotificationsDone: markRepoNotificationsDoneWithAccounts,
 
         settings,

diff --git a/src/hooks/useNotifications.test.ts b/src/hooks/useNotifications.test.ts
@@ -467,7 +467,7 @@ describe('hooks/useNotifications.ts', () => {
     });
   });
 
-  describe('markRepoNotifications', () => {
+  describe('markRepoNotificationsRead', () => {
     const hostname = 'github.com';
     const repoSlug = 'gitify-app/notifications-test';
 
@@ -479,7 +479,7 @@ describe('hooks/useNotifications.ts', () => {
       const { result } = renderHook(() => useNotifications());
 
       act(() => {
-        result.current.markRepoNotifications(mockState, repoSlug, hostname);
+        result.current.markRepoNotificationsRead(mockState, repoSlug, hostname);
       });
 
       await waitFor(() => {
@@ -497,7 +497,7 @@ describe('hooks/useNotifications.ts', () => {
       const { result } = renderHook(() => useNotifications());
 
       act(() => {
-        result.current.markRepoNotifications(mockState, repoSlug, hostname);
+        result.current.markRepoNotificationsRead(mockState, repoSlug, hostname);
       });
 
       await waitFor(() => {

diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
@@ -45,7 +45,7 @@ interface NotificationsState {
     id: string,
     hostname: string,
   ) => Promise<void>;
-  markRepoNotifications: (
+  markRepoNotificationsRead: (
     state: GitifyState,
     repoSlug: string,
     hostname: string,
@@ -154,7 +154,7 @@ export const useNotifications = (): NotificationsState => {
     [notifications],
   );
 
-  const markRepoNotifications = useCallback(
+  const markRepoNotificationsRead = useCallback(
     async (state: GitifyState, repoSlug: string, hostname: string) => {
       setStatus('loading');
 
@@ -251,7 +251,7 @@ export const useNotifications = (): NotificationsState => {
     markNotificationRead,
     markNotificationDone,
     unsubscribeNotification,
-    markRepoNotifications,
+    markRepoNotificationsRead,
     markRepoNotificationsDone,
   };
 };