Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Jan 31, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions public/app/features/plugins/admin/__mocks__/mockHelpers.ts
View file
Open in desktop
@@ -1,4 +1,3 @@
import { mocked } from 'ts-jest/utils';
import { setBackendSrv } from '@grafana/runtime';
import { API_ROOT, GCOM_API_ROOT } from '../constants';
import {
Expand Down Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions public/app/plugins/datasource/grafana-azure-monitor-datasource/__mocks__/datasource.ts
View file
Open in desktop
@@ -1,5 +1,4 @@
import Datasource from '../datasource';
import { mocked } from 'ts-jest/utils';

type DeepPartial<T> = {
[P in keyof T]?: DeepPartial<T[P]>;
Expand Down Expand Up @@ -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 changes: 1 addition & 2 deletions ...tasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts
View file
Open in desktop
@@ -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';
Expand Down Expand Up @@ -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>;

Expand Down