diff --git a/packages/insomnia-app/app/test-utils.ts b/packages/insomnia-app/app/test-utils.ts index 63c4f040d11..bd7192b7329 100644 --- a/packages/insomnia-app/app/test-utils.ts +++ b/packages/insomnia-app/app/test-utils.ts @@ -1,16 +1,14 @@ -import * as modals from './ui/components/modals'; -import type { ErrorModalOptions } from './ui/components/modals/error-modal'; -import { PromptModalOptions } from './ui/components/modals/prompt-modal'; +import { showAlert, showError, showModal, showPrompt } from './ui/components/modals'; -export const getAndClearShowPromptMockArgs = (): PromptModalOptions => { - const mockFn = modals.showPrompt as jest.Mock; - const options = mockFn.mock.calls[0][0] as PromptModalOptions; +export const getAndClearShowPromptMockArgs = () => { + const mockFn = showPrompt as jest.Mock>; + const options = mockFn.mock.calls[0][0]; mockFn.mockClear(); return options; }; export const getAndClearShowAlertMockArgs = () => { - const mockFn = modals.showAlert as jest.Mock; + const mockFn = showAlert as jest.Mock>; const { title, okLabel, addCancel, message, onConfirm } = mockFn.mock.calls[0][0]; mockFn.mockClear(); return { @@ -22,15 +20,15 @@ export const getAndClearShowAlertMockArgs = () => { }; }; -export const getAndClearShowErrorMockArgs = (): ErrorModalOptions => { - const mockFn = modals.showError as jest.Mock; - const options: ErrorModalOptions = mockFn.mock.calls[0][0]; +export const getAndClearShowErrorMockArgs = () => { + const mockFn = showError as jest.Mock>; + const options = mockFn.mock.calls[0][0]; mockFn.mockClear(); return options; }; export const getAndClearShowModalMockArgs = () => { - const mockFn = modals.showModal as jest.Mock; + const mockFn = showModal as jest.Mock>; const args = mockFn.mock.calls[0][1]; mockFn.mockClear(); return args;