diff --git a/src/renderer/components/AllRead.test.tsx b/src/renderer/components/AllRead.test.tsx index 10cc58cb9..743e4d6cf 100644 --- a/src/renderer/components/AllRead.test.tsx +++ b/src/renderer/components/AllRead.test.tsx @@ -1,5 +1,4 @@ import { act, render } from '@testing-library/react'; -import { MemoryRouter } from 'react-router-dom'; import { mockSettings } from '../__mocks__/state-mocks'; import { ensureStableEmojis } from '../__mocks__/utils'; @@ -44,9 +43,7 @@ describe('renderer/components/AllRead.tsx', () => { }, }} > - - - + , ); }); diff --git a/src/renderer/components/filters/FilterSection.test.tsx b/src/renderer/components/filters/FilterSection.test.tsx index 1f8332428..0d28d4248 100644 --- a/src/renderer/components/filters/FilterSection.test.tsx +++ b/src/renderer/components/filters/FilterSection.test.tsx @@ -1,6 +1,5 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { MarkGithubIcon } from '@primer/octicons-react'; @@ -29,18 +28,16 @@ describe('renderer/components/filters/FilterSection.tsx', () => { notifications: mockAccountNotifications, }} > - - - + , ); @@ -88,15 +85,13 @@ describe('renderer/components/filters/FilterSection.tsx', () => { updateFilter, }} > - - - + , ); }); @@ -123,15 +118,13 @@ describe('renderer/components/filters/FilterSection.tsx', () => { updateFilter, }} > - - - + , ); }); diff --git a/src/renderer/components/filters/ReasonFilter.test.tsx b/src/renderer/components/filters/ReasonFilter.test.tsx index 9fe104f18..81beb41ce 100644 --- a/src/renderer/components/filters/ReasonFilter.test.tsx +++ b/src/renderer/components/filters/ReasonFilter.test.tsx @@ -1,5 +1,4 @@ import { render } from '@testing-library/react'; -import { MemoryRouter } from 'react-router-dom'; import { mockAccountNotifications } from '../../__mocks__/notifications-mocks'; import { mockSettings } from '../../__mocks__/state-mocks'; @@ -15,9 +14,7 @@ describe('renderer/components/filters/ReasonFilter.tsx', () => { notifications: mockAccountNotifications, }} > - - - + , ); diff --git a/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx b/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx index f0348091f..cd57cb5f8 100644 --- a/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx +++ b/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx @@ -1,5 +1,4 @@ import { render } from '@testing-library/react'; -import { MemoryRouter } from 'react-router-dom'; import { mockAccountNotifications } from '../../__mocks__/notifications-mocks'; import { mockSettings } from '../../__mocks__/state-mocks'; @@ -15,9 +14,7 @@ describe('renderer/components/filters/RequiresDetailedNotificationsWarning.tsx', notifications: mockAccountNotifications, }} > - - - + , ); diff --git a/src/renderer/components/filters/StateFilter.test.tsx b/src/renderer/components/filters/StateFilter.test.tsx index 264bafac3..a924580ac 100644 --- a/src/renderer/components/filters/StateFilter.test.tsx +++ b/src/renderer/components/filters/StateFilter.test.tsx @@ -1,5 +1,4 @@ import { render } from '@testing-library/react'; -import { MemoryRouter } from 'react-router-dom'; import { mockAccountNotifications } from '../../__mocks__/notifications-mocks'; import { mockSettings } from '../../__mocks__/state-mocks'; @@ -19,9 +18,7 @@ describe('renderer/components/filters/StateFilter.tsx', () => { notifications: mockAccountNotifications, }} > - - - + , ); diff --git a/src/renderer/components/filters/SubjectTypeFilter.test.tsx b/src/renderer/components/filters/SubjectTypeFilter.test.tsx index e6c86b800..1015df381 100644 --- a/src/renderer/components/filters/SubjectTypeFilter.test.tsx +++ b/src/renderer/components/filters/SubjectTypeFilter.test.tsx @@ -1,5 +1,4 @@ import { render } from '@testing-library/react'; -import { MemoryRouter } from 'react-router-dom'; import { mockAccountNotifications } from '../../__mocks__/notifications-mocks'; import { mockSettings } from '../../__mocks__/state-mocks'; @@ -18,9 +17,7 @@ describe('renderer/components/filters/SubjectTypeFilter.tsx', () => { notifications: mockAccountNotifications, }} > - - - + , ); diff --git a/src/renderer/components/filters/UserHandleFilter.test.tsx b/src/renderer/components/filters/UserHandleFilter.test.tsx index 796791cf2..86e5546fe 100644 --- a/src/renderer/components/filters/UserHandleFilter.test.tsx +++ b/src/renderer/components/filters/UserHandleFilter.test.tsx @@ -1,6 +1,5 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { mockAccountNotifications } from '../../__mocks__/notifications-mocks'; import { mockSettings } from '../../__mocks__/state-mocks'; @@ -27,9 +26,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => { notifications: mockAccountNotifications, }} > - - - + , ); @@ -47,9 +44,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => { notifications: mockAccountNotifications, }} > - - - + , ); @@ -71,9 +66,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => { updateFilter, }} > - - - + , ); }); @@ -103,9 +96,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => { updateFilter, }} > - - - + , ); }); @@ -133,9 +124,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => { updateFilter, }} > - - - + , ); }); @@ -165,9 +154,7 @@ describe('renderer/components/filters/UserHandleFilter.tsx', () => { updateFilter, }} > - - - + , ); }); diff --git a/src/renderer/components/filters/UserTypeFilter.test.tsx b/src/renderer/components/filters/UserTypeFilter.test.tsx index c1433500a..fa3009361 100644 --- a/src/renderer/components/filters/UserTypeFilter.test.tsx +++ b/src/renderer/components/filters/UserTypeFilter.test.tsx @@ -1,5 +1,4 @@ import { render } from '@testing-library/react'; -import { MemoryRouter } from 'react-router-dom'; import { mockAccountNotifications } from '../../__mocks__/notifications-mocks'; import { mockSettings } from '../../__mocks__/state-mocks'; @@ -19,9 +18,7 @@ describe('renderer/components/filters/UserTypeFilter.tsx', () => { notifications: mockAccountNotifications, }} > - - - + , ); diff --git a/src/renderer/components/settings/AppearanceSettings.test.tsx b/src/renderer/components/settings/AppearanceSettings.test.tsx index 210949b64..9aa4eacd7 100644 --- a/src/renderer/components/settings/AppearanceSettings.test.tsx +++ b/src/renderer/components/settings/AppearanceSettings.test.tsx @@ -1,6 +1,5 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { mockAuth, @@ -28,9 +27,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -56,9 +53,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -81,9 +76,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -111,9 +104,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -166,9 +157,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -191,9 +180,7 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => { updateSetting, }} > - - - + , ); }); diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx index 23ee6107b..0cdcc13cf 100644 --- a/src/renderer/components/settings/NotificationSettings.test.tsx +++ b/src/renderer/components/settings/NotificationSettings.test.tsx @@ -1,6 +1,5 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { mockAuth, mockSettings } from '../../__mocks__/state-mocks'; import { AppContext } from '../../context/App'; @@ -24,9 +23,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -47,9 +44,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -70,9 +65,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -93,9 +86,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -116,9 +107,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -139,9 +128,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -166,9 +153,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -200,9 +185,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -223,9 +206,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -248,9 +229,7 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => { updateSetting, }} > - - - + , ); }); diff --git a/src/renderer/components/settings/SettingsFooter.test.tsx b/src/renderer/components/settings/SettingsFooter.test.tsx index 35d2fdd89..4fec2ae51 100644 --- a/src/renderer/components/settings/SettingsFooter.test.tsx +++ b/src/renderer/components/settings/SettingsFooter.test.tsx @@ -1,6 +1,5 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { mockAuth, mockSettings } from '../../__mocks__/state-mocks'; import { AppContext } from '../../context/App'; @@ -35,9 +34,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -58,9 +55,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -82,9 +77,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -105,9 +98,7 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => { settings: mockSettings, }} > - - - + , ); }); diff --git a/src/renderer/components/settings/SettingsReset.test.tsx b/src/renderer/components/settings/SettingsReset.test.tsx index 471dacbb3..ef058dc2b 100644 --- a/src/renderer/components/settings/SettingsReset.test.tsx +++ b/src/renderer/components/settings/SettingsReset.test.tsx @@ -1,6 +1,5 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { mockAuth, mockSettings } from '../../__mocks__/state-mocks'; import { AppContext } from '../../context/App'; @@ -25,9 +24,7 @@ describe('renderer/components/settings/SettingsReset.tsx', () => { resetSettings, }} > - - - + , ); }); @@ -50,9 +47,7 @@ describe('renderer/components/settings/SettingsReset.tsx', () => { resetSettings, }} > - - - + , ); }); diff --git a/src/renderer/components/settings/SystemSettings.test.tsx b/src/renderer/components/settings/SystemSettings.test.tsx index 0a9d7d7d6..3ff4bfc04 100644 --- a/src/renderer/components/settings/SystemSettings.test.tsx +++ b/src/renderer/components/settings/SystemSettings.test.tsx @@ -1,6 +1,5 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { mockAuth, mockSettings } from '../../__mocks__/state-mocks'; import { AppContext } from '../../context/App'; @@ -23,9 +22,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -46,9 +43,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -69,9 +64,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -97,9 +90,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -120,9 +111,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); @@ -140,9 +129,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); @@ -158,9 +145,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); @@ -179,9 +164,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); @@ -203,9 +186,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); @@ -226,9 +207,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); }); @@ -249,9 +228,7 @@ describe('renderer/components/settings/SystemSettings.tsx', () => { updateSetting, }} > - - - + , ); }); diff --git a/src/renderer/routes/Accounts.test.tsx b/src/renderer/routes/Accounts.test.tsx index 1ae325703..a30413c06 100644 --- a/src/renderer/routes/Accounts.test.tsx +++ b/src/renderer/routes/Accounts.test.tsx @@ -1,6 +1,5 @@ import { act, render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { BaseStyles, ThemeProvider } from '@primer/react'; @@ -45,9 +44,7 @@ describe('renderer/routes/Accounts.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -64,9 +61,7 @@ describe('renderer/routes/Accounts.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -93,9 +88,7 @@ describe('renderer/routes/Accounts.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -123,9 +116,7 @@ describe('renderer/routes/Accounts.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -151,9 +142,7 @@ describe('renderer/routes/Accounts.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -188,9 +177,7 @@ describe('renderer/routes/Accounts.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -224,9 +211,7 @@ describe('renderer/routes/Accounts.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -251,9 +236,7 @@ describe('renderer/routes/Accounts.tsx', () => { settings: mockSettings, }} > - - - + , ); }); @@ -289,9 +272,7 @@ describe('renderer/routes/Accounts.tsx', () => { logoutFromAccount: logoutFromAccountMock, }} > - - - + , ); }); @@ -322,9 +303,7 @@ describe('renderer/routes/Accounts.tsx', () => { loginWithGitHubApp: mockLoginWithGitHubApp, }} > - - - + , @@ -348,9 +327,7 @@ describe('renderer/routes/Accounts.tsx', () => { settings: mockSettings, }} > - - - + , @@ -380,9 +357,7 @@ describe('renderer/routes/Accounts.tsx', () => { settings: mockSettings, }} > - - - + , diff --git a/src/renderer/routes/Filters.test.tsx b/src/renderer/routes/Filters.test.tsx index 25b6ba782..115c26d3e 100644 --- a/src/renderer/routes/Filters.test.tsx +++ b/src/renderer/routes/Filters.test.tsx @@ -1,6 +1,5 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { mockAuth, mockSettings } from '../__mocks__/state-mocks'; import { AppContext } from '../context/App'; @@ -31,9 +30,7 @@ describe('renderer/routes/Filters.tsx', () => { notifications: [], }} > - - - + , ); }); @@ -52,9 +49,7 @@ describe('renderer/routes/Filters.tsx', () => { fetchNotifications, }} > - - - + , ); }); @@ -78,9 +73,7 @@ describe('renderer/routes/Filters.tsx', () => { clearFilters, }} > - - - + , ); }); diff --git a/src/renderer/routes/Login.test.tsx b/src/renderer/routes/Login.test.tsx index ebe226cde..df3f75476 100644 --- a/src/renderer/routes/Login.test.tsx +++ b/src/renderer/routes/Login.test.tsx @@ -1,6 +1,5 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { AppContext } from '../context/App'; import * as comms from '../utils/comms'; @@ -18,11 +17,7 @@ describe('renderer/routes/Login.tsx', () => { }); it('should render itself & its children', () => { - const tree = render( - - - , - ); + const tree = render(); expect(tree).toMatchSnapshot(); }); @@ -32,17 +27,13 @@ describe('renderer/routes/Login.tsx', () => { const { rerender } = render( - - - + , ); rerender( - - - + , ); @@ -58,10 +49,7 @@ describe('renderer/routes/Login.tsx', () => { loginWithGitHubApp: mockLoginWithGitHubApp, }} > - - - - , + , ); @@ -71,11 +59,7 @@ describe('renderer/routes/Login.tsx', () => { }); it('should navigate to login with personal access token', async () => { - render( - - - , - ); + render(); await userEvent.click(screen.getByTestId('login-pat')); @@ -86,11 +70,7 @@ describe('renderer/routes/Login.tsx', () => { }); it('should navigate to login with oauth app', async () => { - render( - - - , - ); + render(); await userEvent.click(screen.getByTestId('login-oauth-app')); diff --git a/src/renderer/routes/LoginWithOAuthApp.test.tsx b/src/renderer/routes/LoginWithOAuthApp.test.tsx index 598e8821c..bdad525ea 100644 --- a/src/renderer/routes/LoginWithOAuthApp.test.tsx +++ b/src/renderer/routes/LoginWithOAuthApp.test.tsx @@ -1,6 +1,5 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { AppContext } from '../context/App'; import type { AuthState, ClientID, ClientSecret, Hostname } from '../types'; @@ -31,9 +30,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => { it('renders correctly', () => { const tree = render( - - - + , ); @@ -43,9 +40,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => { it('let us go back', async () => { render( - - - + , ); @@ -85,9 +80,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => { it('should be disabled if no hostname configured', async () => { render( - - - + , ); @@ -101,9 +94,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => { it('should open in browser if hostname configured', async () => { render( - - - + , ); @@ -126,9 +117,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => { loginWithOAuthApp: mockLoginWithOAuthApp, }} > - - - + , ); @@ -155,9 +144,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => { it('should render the form with errors', async () => { render( - - - + , ); @@ -182,9 +169,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => { it('should open help docs in the browser', async () => { render( - - - + , ); diff --git a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx index 59c54093c..229f4b78e 100644 --- a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx +++ b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx @@ -1,6 +1,5 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { AppContext } from '../context/App'; import * as comms from '../utils/comms'; @@ -26,21 +25,13 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => { }); it('renders correctly', () => { - const tree = render( - - - , - ); + const tree = render(); expect(tree).toMatchSnapshot(); }); it('let us go back', async () => { - render( - - - , - ); + render(); await userEvent.click(screen.getByTestId('header-nav-back')); @@ -76,9 +67,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => { loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken, }} > - - - + , ); @@ -96,9 +85,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => { loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken, }} > - - - + , ); @@ -117,9 +104,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => { loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken, }} > - - - + , ); @@ -151,9 +136,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => { loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken, }} > - - - + , ); @@ -177,11 +160,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => { }); it('should render the form with errors', async () => { - render( - - - , - ); + render(); const hostname = screen.getByTestId('login-hostname'); await userEvent.clear(hostname); @@ -203,9 +182,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => { loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken, }} > - - - + , ); diff --git a/src/renderer/routes/Settings.test.tsx b/src/renderer/routes/Settings.test.tsx index cbba9861d..ba03a471a 100644 --- a/src/renderer/routes/Settings.test.tsx +++ b/src/renderer/routes/Settings.test.tsx @@ -1,6 +1,5 @@ import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { MemoryRouter } from 'react-router-dom'; import { mockAuth, mockSettings } from '../__mocks__/state-mocks'; import { AppContext } from '../context/App'; @@ -23,9 +22,7 @@ describe('renderer/routes/Settings.tsx', () => { await act(async () => { render( - - - + , ); }); @@ -43,9 +40,7 @@ describe('renderer/routes/Settings.tsx', () => { fetchNotifications, }} > - - - + , ); }); diff --git a/src/renderer/utils/notifications/native.test.ts b/src/renderer/utils/notifications/native.test.ts index b1626dd43..37933406f 100644 --- a/src/renderer/utils/notifications/native.test.ts +++ b/src/renderer/utils/notifications/native.test.ts @@ -5,11 +5,6 @@ import { import { mockAuth } from '../../__mocks__/state-mocks'; import { defaultSettings } from '../../context/defaults'; import type { SettingsState } from '../../types'; -import { - mockGitHubNotifications, - mockSingleNotification, -} from '../api/__mocks__/response-mocks'; -import * as links from '../links'; import * as native from './native'; const raiseSoundNotificationMock = jest.spyOn(native, 'raiseSoundNotification'); @@ -33,6 +28,17 @@ describe('renderer/utils/notifications/native.ts', () => { }); expect(window.gitify.raiseNativeNotification).toHaveBeenCalledTimes(1); + expect(window.gitify.raiseNativeNotification).toHaveBeenCalledWith( + expect.stringContaining( + mockSingleAccountNotifications[0].notifications[0].repository + .full_name, + ), + expect.stringContaining( + mockSingleAccountNotifications[0].notifications[0].subject.title, + ), + null, + ); + expect(raiseSoundNotificationMock).toHaveBeenCalledTimes(1); expect(raiseSoundNotificationMock).toHaveBeenCalledWith(0.2); }); @@ -50,6 +56,12 @@ describe('renderer/utils/notifications/native.ts', () => { }); expect(window.gitify.raiseNativeNotification).toHaveBeenCalledTimes(1); + expect(window.gitify.raiseNativeNotification).toHaveBeenCalledWith( + 'Gitify', + 'You have 4 notifications', + null, + ); + expect(raiseSoundNotificationMock).toHaveBeenCalledTimes(1); expect(raiseSoundNotificationMock).toHaveBeenCalledWith(0.2); }); @@ -104,30 +116,4 @@ describe('renderer/utils/notifications/native.ts', () => { expect(window.gitify.raiseNativeNotification).not.toHaveBeenCalled(); }); }); - - describe.skip('raiseNativeNotification', () => { - it('should click on a native notification (with 1 notification)', () => { - jest.spyOn(links, 'openNotification'); - - const nativeNotification: Notification = native.raiseNativeNotification([ - mockSingleNotification, - ]); - nativeNotification.onclick(null); - - expect(links.openNotification).toHaveBeenCalledTimes(1); - expect(links.openNotification).toHaveBeenLastCalledWith( - mockSingleNotification, - ); - expect(window.gitify.app.hide).toHaveBeenCalledTimes(1); - }); - - it('should click on a native notification (with more than 1 notification)', () => { - const nativeNotification = native.raiseNativeNotification( - mockGitHubNotifications, - ); - nativeNotification.onclick(null); - - expect(window.gitify.app.show).toHaveBeenCalledTimes(1); - }); - }); }); diff --git a/src/renderer/utils/notifications/native.ts b/src/renderer/utils/notifications/native.ts index fcf804c4c..cee3e8638 100644 --- a/src/renderer/utils/notifications/native.ts +++ b/src/renderer/utils/notifications/native.ts @@ -65,7 +65,7 @@ export const raiseNativeNotification = (notifications: Notification[]) => { // TODO FIXME = set url to notification url } else { title = APPLICATION.NAME; - body = `You have ${notifications.length} notifications.`; + body = `You have ${notifications.length} notifications`; } return window.gitify.raiseNativeNotification(title, body, url);