diff --git a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts index 0a3b68801f7..e06d7a71324 100644 --- a/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts +++ b/packages/grafana-runtime/src/utils/DataSourceWithBackend.test.ts @@ -28,7 +28,7 @@ const backendSrv = { } as unknown as BackendSrv; jest.mock('../services', () => ({ - ...(jest.requireActual('../services') as any), + ...jest.requireActual('../services'), getBackendSrv: () => backendSrv, getDataSourceSrv: () => { return { diff --git a/packages/grafana-runtime/src/utils/PublicDashboardDataSource.test.ts b/packages/grafana-runtime/src/utils/PublicDashboardDataSource.test.ts index 343a6e4a022..5c4c6d0bd68 100644 --- a/packages/grafana-runtime/src/utils/PublicDashboardDataSource.test.ts +++ b/packages/grafana-runtime/src/utils/PublicDashboardDataSource.test.ts @@ -14,7 +14,7 @@ const backendSrv = { } as unknown as BackendSrv; jest.mock('../services', () => ({ - ...(jest.requireActual('../services') as any), + ...jest.requireActual('../services'), getBackendSrv: () => backendSrv, getDataSourceSrv: () => { return { diff --git a/packages/grafana-ui/src/components/GraphNG/utils.test.ts b/packages/grafana-ui/src/components/GraphNG/utils.test.ts index bb99a583c53..ae6ed7a938c 100644 --- a/packages/grafana-ui/src/components/GraphNG/utils.test.ts +++ b/packages/grafana-ui/src/components/GraphNG/utils.test.ts @@ -204,7 +204,7 @@ function mockDataFrame() { } jest.mock('@grafana/data', () => ({ - ...(jest.requireActual('@grafana/data') as any), + ...jest.requireActual('@grafana/data'), DefaultTimeZone: 'utc', })); diff --git a/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx b/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx index dc6298d1dc2..72be5fc2cc2 100644 --- a/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx +++ b/public/app/features/alerting/unified/RedirectToRuleViewer.test.tsx @@ -17,7 +17,7 @@ import { getRulesSourceByName } from './utils/datasource'; jest.mock('./hooks/useCombinedRule'); jest.mock('./utils/datasource'); jest.mock('react-router-dom', () => ({ - ...(jest.requireActual('react-router-dom') as any), + ...jest.requireActual('react-router-dom'), Redirect: jest.fn(({}) => `Redirected`), })); diff --git a/public/app/features/alerting/unified/RuleViewer.test.tsx b/public/app/features/alerting/unified/RuleViewer.test.tsx index df068a9952b..225b4ce02ca 100644 --- a/public/app/features/alerting/unified/RuleViewer.test.tsx +++ b/public/app/features/alerting/unified/RuleViewer.test.tsx @@ -16,7 +16,7 @@ import { GRAFANA_RULES_SOURCE_NAME } from './utils/datasource'; jest.mock('./hooks/useCombinedRule'); jest.mock('@grafana/runtime', () => ({ - ...(jest.requireActual('@grafana/runtime') as any), + ...jest.requireActual('@grafana/runtime'), getDataSourceSrv: () => { return { getInstanceSettings: () => ({ name: 'prometheus' }), diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.test.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.test.tsx index 9b2e9b08879..bdc90ebf183 100644 --- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.test.tsx +++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneOptions.test.tsx @@ -27,7 +27,7 @@ standardFieldConfigEditorRegistry.setInit(getAllStandardFieldConfigs); const mockStore = configureMockStore(); const OptionsPaneSelector = selectors.components.PanelEditor.OptionsPane; jest.mock('react-router-dom', () => ({ - ...(jest.requireActual('react-router-dom') as any), + ...jest.requireActual('react-router-dom'), useLocation: () => ({ pathname: 'localhost:3000/example/path', }), diff --git a/public/app/features/explore/utils/decorators.test.ts b/public/app/features/explore/utils/decorators.test.ts index 893a0894e10..5387767b6bb 100644 --- a/public/app/features/explore/utils/decorators.test.ts +++ b/public/app/features/explore/utils/decorators.test.ts @@ -23,7 +23,7 @@ import { } from './decorators'; jest.mock('@grafana/data', () => ({ - ...(jest.requireActual('@grafana/data') as any), + ...jest.requireActual('@grafana/data'), dateTimeFormat: () => 'format() jest mocked', dateTimeFormatTimeAgo: (ts: any) => 'fromNow() jest mocked', })); diff --git a/public/app/features/playlist/PlaylistEditPage.test.tsx b/public/app/features/playlist/PlaylistEditPage.test.tsx index 8cf0dbc155c..eedba69fa60 100644 --- a/public/app/features/playlist/PlaylistEditPage.test.tsx +++ b/public/app/features/playlist/PlaylistEditPage.test.tsx @@ -9,7 +9,7 @@ import { PlaylistEditPage } from './PlaylistEditPage'; import { Playlist } from './types'; jest.mock('@grafana/runtime', () => ({ - ...(jest.requireActual('@grafana/runtime') as any), + ...jest.requireActual('@grafana/runtime'), getBackendSrv: () => backendSrv, })); diff --git a/public/app/features/playlist/PlaylistNewPage.test.tsx b/public/app/features/playlist/PlaylistNewPage.test.tsx index 9dbb9cadab0..d70476bf5c8 100644 --- a/public/app/features/playlist/PlaylistNewPage.test.tsx +++ b/public/app/features/playlist/PlaylistNewPage.test.tsx @@ -17,7 +17,7 @@ jest.mock('./usePlaylist', () => ({ })); jest.mock('@grafana/runtime', () => ({ - ...(jest.requireActual('@grafana/runtime') as any), + ...jest.requireActual('@grafana/runtime'), getBackendSrv: () => backendSrv, })); diff --git a/public/app/features/query/state/PanelQueryRunner.test.ts b/public/app/features/query/state/PanelQueryRunner.test.ts index d86db370a6d..7d48d6f76fc 100644 --- a/public/app/features/query/state/PanelQueryRunner.test.ts +++ b/public/app/features/query/state/PanelQueryRunner.test.ts @@ -18,7 +18,7 @@ import { PanelQueryRunner } from './PanelQueryRunner'; jest.mock('@grafana/data', () => ({ __esModule: true, - ...(jest.requireActual('@grafana/data') as any), + ...jest.requireActual('@grafana/data'), applyFieldOverrides: applyFieldOverridesMock, })); diff --git a/public/app/features/query/state/queryAnalytics.test.ts b/public/app/features/query/state/queryAnalytics.test.ts index e9fa2e159bd..aa3a4f41f25 100644 --- a/public/app/features/query/state/queryAnalytics.test.ts +++ b/public/app/features/query/state/queryAnalytics.test.ts @@ -28,7 +28,7 @@ jest.mock('app/features/dashboard/services/DashboardSrv', () => ({ })); jest.mock('@grafana/runtime', () => ({ - ...(jest.requireActual('@grafana/runtime') as any), + ...jest.requireActual('@grafana/runtime'), reportMetaAnalytics: jest.fn(), })); @@ -36,7 +36,7 @@ const mockGetUrlSearchParams = jest.fn(() => { return {}; }); jest.mock('@grafana/data', () => ({ - ...(jest.requireActual('@grafana/data') as any), + ...jest.requireActual('@grafana/data'), urlUtil: { getUrlSearchParams: () => mockGetUrlSearchParams(), }, diff --git a/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx b/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx index 22a52251778..94b5233159e 100644 --- a/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx +++ b/public/app/plugins/datasource/jaeger/components/SearchForm.test.tsx @@ -15,7 +15,7 @@ import { JaegerQuery } from '../types'; import SearchForm from './SearchForm'; jest.mock('@grafana/runtime', () => ({ - ...(jest.requireActual('@grafana/runtime') as any), + ...jest.requireActual('@grafana/runtime'), getTemplateSrv: () => ({ replace: jest.fn(), containsTemplate: (val: string): boolean => { diff --git a/public/app/plugins/datasource/jaeger/datasource.test.ts b/public/app/plugins/datasource/jaeger/datasource.test.ts index d96e508da2a..6bfb651d824 100644 --- a/public/app/plugins/datasource/jaeger/datasource.test.ts +++ b/public/app/plugins/datasource/jaeger/datasource.test.ts @@ -23,7 +23,7 @@ import { import { JaegerQuery } from './types'; jest.mock('@grafana/runtime', () => ({ - ...(jest.requireActual('@grafana/runtime') as any), + ...jest.requireActual('@grafana/runtime'), getBackendSrv: () => backendSrv, getTemplateSrv: () => ({ replace: (val: string, subs: ScopedVars): string => { diff --git a/public/app/plugins/datasource/postgres/datasource.test.ts b/public/app/plugins/datasource/postgres/datasource.test.ts index deafceeb4e1..ff2cd958c71 100644 --- a/public/app/plugins/datasource/postgres/datasource.test.ts +++ b/public/app/plugins/datasource/postgres/datasource.test.ts @@ -6,7 +6,7 @@ import { backendSrv } from 'app/core/services/backend_srv'; import { PostgresDatasource } from './datasource'; jest.mock('@grafana/runtime', () => ({ - ...(jest.requireActual('@grafana/runtime') as any), + ...jest.requireActual('@grafana/runtime'), getBackendSrv: () => backendSrv, getTemplateSrv: () => ({ replace: (val: string): string => { diff --git a/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx b/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx index 408d48c0071..735133d40dc 100644 --- a/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx +++ b/public/app/plugins/datasource/prometheus/components/PromLink.test.tsx @@ -9,7 +9,7 @@ import { PromQuery } from '../types'; import PromLink from './PromLink'; jest.mock('@grafana/data', () => ({ - ...(jest.requireActual('@grafana/data') as any), + ...jest.requireActual('@grafana/data'), rangeUtil: { intervalToSeconds: jest.fn(() => 15), }, diff --git a/public/app/plugins/panel/barchart/utils.test.ts b/public/app/plugins/panel/barchart/utils.test.ts index 9bd75fe23db..7f21f76c68b 100644 --- a/public/app/plugins/panel/barchart/utils.test.ts +++ b/public/app/plugins/panel/barchart/utils.test.ts @@ -71,7 +71,7 @@ function mockDataFrame() { } jest.mock('@grafana/data', () => ({ - ...(jest.requireActual('@grafana/data') as any), + ...jest.requireActual('@grafana/data'), DefaultTimeZone: 'utc', }));