From fff88d3dadcad32fa65f58bea52227b7bd57ae46 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Mon, 31 Jan 2022 19:28:58 +1100 Subject: [PATCH] Chore: Replace ts-jest mocked with jest.mocked (#44630) --- public/app/features/plugins/admin/__mocks__/mockHelpers.ts | 3 +-- .../grafana-azure-monitor-datasource/__mocks__/datasource.ts | 3 +-- .../components/MetricsQueryEditor/dataHooks.test.ts | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/public/app/features/plugins/admin/__mocks__/mockHelpers.ts b/public/app/features/plugins/admin/__mocks__/mockHelpers.ts index 04d1e227a806..ac18a5988570 100644 --- a/public/app/features/plugins/admin/__mocks__/mockHelpers.ts +++ b/public/app/features/plugins/admin/__mocks__/mockHelpers.ts @@ -1,4 +1,3 @@ -import { mocked } from 'ts-jest/utils'; import { setBackendSrv } from '@grafana/runtime'; import { API_ROOT, GCOM_API_ROOT } from '../constants'; import { @@ -110,7 +109,7 @@ type UserAccessTestContext = { jest.mock('../permissions'); export function mockUserPermissions(options: UserAccessTestContext): void { - const mock = mocked(permissions); + const mock = jest.mocked(permissions); mock.isDataSourceEditor.mockReturnValue(options.isDataSourceEditor); mock.isOrgAdmin.mockReturnValue(options.isOrgAdmin); mock.isGrafanaAdmin.mockReturnValue(options.isAdmin); diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts index a3b36de80130..1353b8c71d46 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts @@ -1,5 +1,4 @@ import Datasource from '../datasource'; -import { mocked } from 'ts-jest/utils'; type DeepPartial = { [P in keyof T]?: DeepPartial; @@ -47,5 +46,5 @@ export default function createMockDatasource(overrides?: DeepPartial const mockDatasource = _mockDatasource as Datasource; - return mocked(mockDatasource, true); + return jest.mocked(mockDatasource, true); } diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts index 3625d0d60baf..6de964895cdc 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts @@ -1,5 +1,4 @@ import { renderHook } from '@testing-library/react-hooks'; -import { MockedObjectDeep } from 'ts-jest/dist/utils/testing'; import createMockDatasource from '../../__mocks__/datasource'; import Datasource from '../../datasource'; @@ -282,7 +281,7 @@ describe('AzureMonitor: metrics dataHooks', () => { }, ]; - let datasource: MockedObjectDeep; + let datasource: Datasource; let onChange: jest.Mock; let setError: jest.Mock;