diff --git a/src/components/Repository.test.tsx b/src/components/Repository.test.tsx index 16d579c81..f6f7f5c69 100644 --- a/src/components/Repository.test.tsx +++ b/src/components/Repository.test.tsx @@ -1,8 +1,8 @@ import { fireEvent, render, screen } from '@testing-library/react'; +import { shell } from 'electron'; import { mockedGitHubNotifications } from '../__mocks__/mockedData'; import { AppContext } from '../context/App'; import { RepositoryNotifications } from './Repository'; -const { shell } = require('electron'); jest.mock('./NotificationRow', () => ({ NotificationRow: () =>
NotificationRow
, diff --git a/src/components/Sidebar.test.tsx b/src/components/Sidebar.test.tsx index 463fe4054..3b8c59a6b 100644 --- a/src/components/Sidebar.test.tsx +++ b/src/components/Sidebar.test.tsx @@ -1,6 +1,6 @@ import { fireEvent, render, screen } from '@testing-library/react'; +import { ipcRenderer, shell } from 'electron'; import { MemoryRouter } from 'react-router-dom'; -const { shell, ipcRenderer } = require('electron'); import { mockSettings } from '../__mocks__/mock-state'; import { mockedAccountNotifications } from '../__mocks__/mockedData'; import { AppContext } from '../context/App'; diff --git a/src/routes/Login.test.tsx b/src/routes/Login.test.tsx index 588d2e5e1..d6d064632 100644 --- a/src/routes/Login.test.tsx +++ b/src/routes/Login.test.tsx @@ -1,6 +1,6 @@ import { fireEvent, render, screen } from '@testing-library/react'; +import { ipcRenderer } from 'electron'; import { MemoryRouter } from 'react-router-dom'; -const { ipcRenderer } = require('electron'); import { AppContext } from '../context/App'; import { LoginRoute } from './Login'; diff --git a/src/routes/Login.tsx b/src/routes/Login.tsx index 3e9506dcd..8e70f9f33 100644 --- a/src/routes/Login.tsx +++ b/src/routes/Login.tsx @@ -1,5 +1,5 @@ -const { ipcRenderer } = require('electron'); import { KeyIcon, PersonIcon } from '@primer/octicons-react'; +import { ipcRenderer } from 'electron'; import { type FC, useContext, useEffect } from 'react'; import { useNavigate } from 'react-router-dom'; import { Logo } from '../components/Logo'; diff --git a/src/routes/LoginWithOAuthApp.test.tsx b/src/routes/LoginWithOAuthApp.test.tsx index 0f25f652b..957c4bd0a 100644 --- a/src/routes/LoginWithOAuthApp.test.tsx +++ b/src/routes/LoginWithOAuthApp.test.tsx @@ -1,7 +1,7 @@ import { fireEvent, render, screen } from '@testing-library/react'; -import { MemoryRouter } from 'react-router-dom'; -const { ipcRenderer } = require('electron'); +import { ipcRenderer } from 'electron'; import { shell } from 'electron'; +import { MemoryRouter } from 'react-router-dom'; import { mockedEnterpriseAccounts } from '../__mocks__/mockedData'; import { AppContext } from '../context/App'; import type { AuthState } from '../types'; diff --git a/src/routes/LoginWithOAuthApp.tsx b/src/routes/LoginWithOAuthApp.tsx index c4e35fa09..3f66d6eb5 100644 --- a/src/routes/LoginWithOAuthApp.tsx +++ b/src/routes/LoginWithOAuthApp.tsx @@ -1,10 +1,10 @@ -const ipcRenderer = require('electron').ipcRenderer; import { ArrowLeftIcon, BookIcon, PersonIcon, SignInIcon, } from '@primer/octicons-react'; +import ipcRenderer from 'electron'; import { type FC, useCallback, useContext, useEffect } from 'react'; import { Form, type FormRenderProps } from 'react-final-form'; import { useNavigate } from 'react-router-dom'; @@ -65,7 +65,7 @@ export const LoginWithOAuthApp: FC = () => { useEffect(() => { if (enterpriseAccounts.length) { - ipcRenderer.send('reopen-window'); + ipcRenderer.ipcRenderer.send('reopen-window'); navigate(-1); } }, [enterpriseAccounts]); diff --git a/src/routes/Settings.test.tsx b/src/routes/Settings.test.tsx index cbeb5b006..a8701a277 100644 --- a/src/routes/Settings.test.tsx +++ b/src/routes/Settings.test.tsx @@ -1,7 +1,6 @@ import { act, fireEvent, render, screen } from '@testing-library/react'; +import { ipcRenderer, shell } from 'electron'; import { MemoryRouter } from 'react-router-dom'; -const { ipcRenderer } = require('electron'); -import { shell } from 'electron'; import { mockAccounts, mockSettings } from '../__mocks__/mock-state'; import { AppContext } from '../context/App'; import { SettingsRoute } from './Settings';