Chore: Replace ts-jest mocked with jest.mocked (#44630)

grafana · Feb 1, 2022 · fff88d3 · fff88d3
1 parent ff1de46
commit fff88d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -1,5 +1,4 @@
 import Datasource from '../datasource';
-import { mocked } from 'ts-jest/utils';
 
 type DeepPartial<T> = {
   [P in keyof T]?: DeepPartial<T[P]>;
@@ -47,5 +46,5 @@ export default function createMockDatasource(overrides?: DeepPartial<Datasource>
 
   const mockDatasource = _mockDatasource as Datasource;
 
-  return mocked(mockDatasource, true);
+  return jest.mocked(mockDatasource, true);
 }
diff --git a/...tasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts b/...tasource/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<Datasource>;
+  let datasource: Datasource;
   let onChange: jest.Mock<any, any>;
   let setError: jest.Mock<any, any>;