IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Josh Hunt 2022-01-31 19:28:58 +11:00 committed by GitHub
parent 64e1e91403
commit d2f80c3a6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/plugins/admin/__mocks__/mockHelpers.ts
View File

@ -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);

3
public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts
View File

@ -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);
}

3
public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts
View File

@ -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>;