From c48e2c7d0dc658b01ddda033970b27d0c1397747 Mon Sep 17 00:00:00 2001 From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com> Date: Fri, 5 Jan 2024 17:11:58 +0100 Subject: [PATCH] Loki: Update mocks and move into __mocks__ (#79993) Loki: Update mocks and move into __mocks__ --- .../datasource/loki/LanguageProvider.test.ts | 3 +- .../loki/LogContextProvider.test.ts | 2 +- .../loki/LokiVariableSupport.test.ts | 3 +- .../datasource/loki/__mocks__/datasource.ts | 59 ++++++++++ .../loki/{mocks.ts => __mocks__/frames.ts} | 111 +----------------- .../loki/__mocks__/metadataRequest.ts | 26 ++++ .../loki/components/LokiQueryEditor.test.tsx | 2 +- .../components/LokiQueryEditorByApp.test.tsx | 2 +- .../loki/components/LokiQueryField.test.tsx | 2 +- .../components/VariableQueryEditor.test.tsx | 2 +- .../MonacoFieldWrapper.test.tsx | 2 +- .../MonacoQueryField.test.tsx | 2 +- .../CompletionDataProvider.test.ts | 2 +- .../completions.test.ts | 2 +- .../configuration/AlertingSettings.test.tsx | 2 +- .../loki/configuration/ConfigEditor.test.tsx | 2 +- .../datasource/loki/datasource.test.ts | 3 +- .../datasource/loki/querySplitting.test.ts | 3 +- .../datasource/loki/queryUtils.test.ts | 2 +- .../components/LabelBrowserModal.test.tsx | 2 +- .../components/LokiQueryBuilder.test.tsx | 2 +- .../LokiQueryBuilderContainer.test.tsx | 2 +- .../components/LokiQueryCodeEditor.test.tsx | 2 +- .../components/NestedQuery.test.tsx | 2 +- .../components/NestedQueryList.test.tsx | 2 +- .../components/UnwrapParamEditor.test.tsx | 2 +- .../datasource/loki/responseUtils.test.ts | 2 +- 27 files changed, 114 insertions(+), 134 deletions(-) create mode 100644 public/app/plugins/datasource/loki/__mocks__/datasource.ts rename public/app/plugins/datasource/loki/{mocks.ts => __mocks__/frames.ts} (58%) create mode 100644 public/app/plugins/datasource/loki/__mocks__/metadataRequest.ts diff --git a/public/app/plugins/datasource/loki/LanguageProvider.test.ts b/public/app/plugins/datasource/loki/LanguageProvider.test.ts index 1f60b8dc14f..313fea0da9a 100644 --- a/public/app/plugins/datasource/loki/LanguageProvider.test.ts +++ b/public/app/plugins/datasource/loki/LanguageProvider.test.ts @@ -2,8 +2,9 @@ import { AbstractLabelOperator, DataFrame, TimeRange, dateTime, getDefaultTimeRa import { config } from '@grafana/runtime'; import LanguageProvider from './LanguageProvider'; +import { createLokiDatasource } from './__mocks__/datasource'; +import { createMetadataRequest } from './__mocks__/metadataRequest'; import { DEFAULT_MAX_LINES_SAMPLE, LokiDatasource } from './datasource'; -import { createLokiDatasource, createMetadataRequest } from './mocks'; import { extractLogParserFromDataFrame, extractLabelKeysFromDataFrame, diff --git a/public/app/plugins/datasource/loki/LogContextProvider.test.ts b/public/app/plugins/datasource/loki/LogContextProvider.test.ts index 381aa11fbb0..0b03f5fa7c1 100644 --- a/public/app/plugins/datasource/loki/LogContextProvider.test.ts +++ b/public/app/plugins/datasource/loki/LogContextProvider.test.ts @@ -15,7 +15,7 @@ import { LOKI_LOG_CONTEXT_PRESERVED_LABELS, SHOULD_INCLUDE_PIPELINE_OPERATIONS, } from './LogContextProvider'; -import { createLokiDatasource } from './mocks'; +import { createLokiDatasource } from './__mocks__/datasource'; import { LokiQuery } from './types'; const defaultLanguageProviderMock = { diff --git a/public/app/plugins/datasource/loki/LokiVariableSupport.test.ts b/public/app/plugins/datasource/loki/LokiVariableSupport.test.ts index 51219f07a6c..0e874d898f5 100644 --- a/public/app/plugins/datasource/loki/LokiVariableSupport.test.ts +++ b/public/app/plugins/datasource/loki/LokiVariableSupport.test.ts @@ -3,8 +3,9 @@ import { firstValueFrom } from 'rxjs'; import { dateTime, getDefaultTimeRange } from '@grafana/data'; import { LokiVariableSupport } from './LokiVariableSupport'; +import { createLokiDatasource } from './__mocks__/datasource'; +import { createMetadataRequest } from './__mocks__/metadataRequest'; import { LokiDatasource } from './datasource'; -import { createLokiDatasource, createMetadataRequest } from './mocks'; import { LokiVariableQueryType } from './types'; describe('LokiVariableSupport', () => { diff --git a/public/app/plugins/datasource/loki/__mocks__/datasource.ts b/public/app/plugins/datasource/loki/__mocks__/datasource.ts new file mode 100644 index 00000000000..4b5a8f20031 --- /dev/null +++ b/public/app/plugins/datasource/loki/__mocks__/datasource.ts @@ -0,0 +1,59 @@ +import { DataSourceInstanceSettings, DataSourceSettings, PluginType } from '@grafana/data'; +import { TemplateSrv } from '@grafana/runtime'; + +import { LokiDatasource } from '../datasource'; +import { LokiOptions } from '../types'; + +export function createDefaultConfigOptions() { + return { + jsonData: { maxLines: '531' }, + secureJsonFields: {}, + } as DataSourceSettings; +} + +const defaultTemplateSrvMock = { + replace: (input: string) => input, + getVariables: () => [], +}; + +export function createLokiDatasource( + templateSrvMock: Partial = defaultTemplateSrvMock, + settings: Partial> = {} +): LokiDatasource { + const customSettings: DataSourceInstanceSettings = { + url: 'myloggingurl', + id: 0, + uid: '', + type: '', + name: '', + meta: { + id: 'id', + name: 'name', + type: PluginType.datasource, + module: '', + baseUrl: '', + info: { + author: { + name: 'Test', + }, + description: '', + links: [], + logos: { + large: '', + small: '', + }, + screenshots: [], + updated: '', + version: '', + }, + }, + readOnly: false, + jsonData: { + maxLines: '20', + }, + access: 'direct', + ...settings, + }; + + return new LokiDatasource(customSettings, templateSrvMock as TemplateSrv); +} diff --git a/public/app/plugins/datasource/loki/mocks.ts b/public/app/plugins/datasource/loki/__mocks__/frames.ts similarity index 58% rename from public/app/plugins/datasource/loki/mocks.ts rename to public/app/plugins/datasource/loki/__mocks__/frames.ts index cac99b2c227..7c95bce3bd1 100644 --- a/public/app/plugins/datasource/loki/mocks.ts +++ b/public/app/plugins/datasource/loki/__mocks__/frames.ts @@ -1,113 +1,4 @@ -import { - DataFrame, - DataFrameType, - DataSourceInstanceSettings, - DataSourceSettings, - FieldType, - PluginType, - toUtc, -} from '@grafana/data'; -import { TemplateSrv } from '@grafana/runtime'; - -import { getMockDataSource } from '../../../features/datasources/__mocks__'; - -import { LokiDatasource } from './datasource'; -import { LokiOptions } from './types'; - -export function createDefaultConfigOptions(): DataSourceSettings { - return getMockDataSource({ - jsonData: { maxLines: '531' }, - }); -} - -const rawRange = { - from: toUtc('2018-04-25 10:00'), - to: toUtc('2018-04-25 11:00'), -}; - -const defaultTimeSrvMock = { - timeRange: jest.fn().mockReturnValue({ - from: rawRange.from, - to: rawRange.to, - raw: rawRange, - }), -}; - -const defaultTemplateSrvMock = { - replace: (input: string) => input, - getVariables: () => [], -}; - -export function createLokiDatasource( - templateSrvMock: Partial = defaultTemplateSrvMock, - settings: Partial> = {}, - timeSrvStub = defaultTimeSrvMock -): LokiDatasource { - const customSettings: DataSourceInstanceSettings = { - url: 'myloggingurl', - id: 0, - uid: '', - type: '', - name: '', - meta: { - id: 'id', - name: 'name', - type: PluginType.datasource, - module: '', - baseUrl: '', - info: { - author: { - name: 'Test', - }, - description: '', - links: [], - logos: { - large: '', - small: '', - }, - screenshots: [], - updated: '', - version: '', - }, - }, - readOnly: false, - jsonData: { - maxLines: '20', - }, - access: 'direct', - ...settings, - }; - - // @ts-expect-error - return new LokiDatasource(customSettings, templateSrvMock, timeSrvStub); -} - -export function createMetadataRequest( - labelsAndValues: Record, - series?: Record>> -) { - // added % to allow urlencoded labelKeys. Note, that this is not confirm with Loki, as loki does not allow specialcharacters in labelKeys, but needed for tests. - const lokiLabelsAndValuesEndpointRegex = /^label\/([%\w]*)\/values/; - const lokiSeriesEndpointRegex = /^series/; - const lokiLabelsEndpoint = 'labels'; - const labels = Object.keys(labelsAndValues); - - return async function metadataRequestMock(url: string, params?: Record) { - if (url === lokiLabelsEndpoint) { - return labels; - } else { - const labelsMatch = url.match(lokiLabelsAndValuesEndpointRegex); - const seriesMatch = url.match(lokiSeriesEndpointRegex); - if (labelsMatch) { - return labelsAndValues[labelsMatch[1]] || []; - } else if (seriesMatch && series && params) { - return series[params['match[]']] || []; - } else { - throw new Error(`Unexpected url error, ${url}`); - } - } - }; -} +import { DataFrame, DataFrameType, FieldType } from '@grafana/data'; export function getMockFrames() { const logFrameA: DataFrame = { diff --git a/public/app/plugins/datasource/loki/__mocks__/metadataRequest.ts b/public/app/plugins/datasource/loki/__mocks__/metadataRequest.ts new file mode 100644 index 00000000000..94e5fedcb07 --- /dev/null +++ b/public/app/plugins/datasource/loki/__mocks__/metadataRequest.ts @@ -0,0 +1,26 @@ +export function createMetadataRequest( + labelsAndValues: Record, + series?: Record>> +) { + // added % to allow urlencoded labelKeys. Note, that this is not confirm with Loki, as loki does not allow specialcharacters in labelKeys, but needed for tests. + const lokiLabelsAndValuesEndpointRegex = /^label\/([%\w]*)\/values/; + const lokiSeriesEndpointRegex = /^series/; + const lokiLabelsEndpoint = 'labels'; + const labels = Object.keys(labelsAndValues); + + return async function metadataRequestMock(url: string, params?: Record) { + if (url === lokiLabelsEndpoint) { + return labels; + } else { + const labelsMatch = url.match(lokiLabelsAndValuesEndpointRegex); + const seriesMatch = url.match(lokiSeriesEndpointRegex); + if (labelsMatch) { + return labelsAndValues[labelsMatch[1]] || []; + } else if (seriesMatch && series && params) { + return series[params['match[]']] || []; + } else { + throw new Error(`Unexpected url error, ${url}`); + } + } + }; +} diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx index 1c9cf55ba43..a1339617b28 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx @@ -6,7 +6,7 @@ import React from 'react'; import { CoreApp } from '@grafana/data'; import { QueryEditorMode } from 'app/plugins/datasource/prometheus/querybuilder/shared/types'; -import { createLokiDatasource } from '../mocks'; +import { createLokiDatasource } from '../__mocks__/datasource'; import { EXPLAIN_LABEL_FILTER_CONTENT } from '../querybuilder/components/LokiQueryBuilderExplained'; import { LokiQuery, LokiQueryType } from '../types'; diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx index 062739a9655..171644d2802 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { CoreApp } from '@grafana/data'; -import { createLokiDatasource } from '../mocks'; +import { createLokiDatasource } from '../__mocks__/datasource'; import { testIds as regularTestIds } from './LokiQueryEditor'; import { LokiQueryEditorByApp } from './LokiQueryEditorByApp'; diff --git a/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx index 2ff6f0694cd..0e46eb28a9f 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryField.test.tsx @@ -3,7 +3,7 @@ import React, { ComponentProps } from 'react'; import { dateTime } from '@grafana/data'; -import { createLokiDatasource } from '../mocks'; +import { createLokiDatasource } from '../__mocks__/datasource'; import { LokiQueryField } from './LokiQueryField'; diff --git a/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx index 1e7c803a96b..56fc8bb84d1 100644 --- a/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx +++ b/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx @@ -5,7 +5,7 @@ import { selectOptionInTest } from 'test/helpers/selectOptionInTest'; import { TemplateSrv } from '@grafana/runtime'; -import { createLokiDatasource } from '../mocks'; +import { createLokiDatasource } from '../__mocks__/datasource'; import { LokiVariableQueryType } from '../types'; import { LokiVariableQueryEditor, Props } from './VariableQueryEditor'; diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoFieldWrapper.test.tsx b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoFieldWrapper.test.tsx index 088c46627b4..15c25be1d6c 100644 --- a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoFieldWrapper.test.tsx +++ b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoFieldWrapper.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; -import { createLokiDatasource } from '../../mocks'; +import { createLokiDatasource } from '../../__mocks__/datasource'; import { MonacoQueryFieldWrapper, Props } from './MonacoQueryFieldWrapper'; diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.test.tsx b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.test.tsx index b89ab68fdc4..eb938b59597 100644 --- a/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.test.tsx +++ b/public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; -import { createLokiDatasource } from '../../mocks'; +import { createLokiDatasource } from '../../__mocks__/datasource'; import MonacoQueryField from './MonacoQueryField'; import { Props } from './MonacoQueryFieldProps'; diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts index f406e91a701..5b2d1a62eb0 100644 --- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts +++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts @@ -1,8 +1,8 @@ import { HistoryItem, dateTime } from '@grafana/data'; import LokiLanguageProvider from '../../../LanguageProvider'; +import { createLokiDatasource } from '../../../__mocks__/datasource'; import { LokiDatasource } from '../../../datasource'; -import { createLokiDatasource } from '../../../mocks'; import { LokiQuery } from '../../../types'; import { CompletionDataProvider } from './CompletionDataProvider'; diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts index f3c6c3f94f3..c6a1fed74aa 100644 --- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts +++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts @@ -2,8 +2,8 @@ import { dateTime } from '@grafana/data'; import { Monaco, monacoTypes } from '@grafana/ui/src'; import LokiLanguageProvider from '../../../LanguageProvider'; +import { createLokiDatasource } from '../../../__mocks__/datasource'; import { LokiDatasource } from '../../../datasource'; -import { createLokiDatasource } from '../../../mocks'; import { CompletionDataProvider } from './CompletionDataProvider'; import { calculateRange } from './completionUtils'; diff --git a/public/app/plugins/datasource/loki/configuration/AlertingSettings.test.tsx b/public/app/plugins/datasource/loki/configuration/AlertingSettings.test.tsx index 71a9d48ca76..73686c4b3af 100644 --- a/public/app/plugins/datasource/loki/configuration/AlertingSettings.test.tsx +++ b/public/app/plugins/datasource/loki/configuration/AlertingSettings.test.tsx @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { createDefaultConfigOptions } from '../mocks'; +import { createDefaultConfigOptions } from '../__mocks__/datasource'; import { AlertingSettings } from './AlertingSettings'; diff --git a/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx b/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx index 3a974a94c85..8afc34bc0b1 100644 --- a/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx +++ b/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { createDefaultConfigOptions } from '../mocks'; +import { createDefaultConfigOptions } from '../__mocks__/datasource'; import { ConfigEditor } from './ConfigEditor'; diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts index 599d3ec1d70..70702abcc71 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -31,8 +31,9 @@ import { } from '@grafana/runtime'; import { LokiVariableSupport } from './LokiVariableSupport'; +import { createLokiDatasource } from './__mocks__/datasource'; +import { createMetadataRequest } from './__mocks__/metadataRequest'; import { LokiDatasource, REF_ID_DATA_SAMPLES } from './datasource'; -import { createLokiDatasource, createMetadataRequest } from './mocks'; import { runSplitQuery } from './querySplitting'; import { parseToNodeNamesArray } from './queryUtils'; import { LokiOptions, LokiQuery, LokiQueryType, LokiVariableQueryType, SupportingQueryType } from './types'; diff --git a/public/app/plugins/datasource/loki/querySplitting.test.ts b/public/app/plugins/datasource/loki/querySplitting.test.ts index 83c51e9e95a..43a58853702 100644 --- a/public/app/plugins/datasource/loki/querySplitting.test.ts +++ b/public/app/plugins/datasource/loki/querySplitting.test.ts @@ -3,10 +3,11 @@ import { getQueryOptions } from 'test/helpers/getQueryOptions'; import { dateTime, LoadingState } from '@grafana/data'; +import { createLokiDatasource } from './__mocks__/datasource'; +import { getMockFrames } from './__mocks__/frames'; import { LokiDatasource } from './datasource'; import * as logsTimeSplit from './logsTimeSplitting'; import * as metricTimeSplit from './metricTimeSplitting'; -import { createLokiDatasource, getMockFrames } from './mocks'; import { runSplitQuery } from './querySplitting'; import { trackGroupedQueries } from './tracking'; import { LokiQuery, LokiQueryType } from './types'; diff --git a/public/app/plugins/datasource/loki/queryUtils.test.ts b/public/app/plugins/datasource/loki/queryUtils.test.ts index 772c656ca94..8675b9e522e 100644 --- a/public/app/plugins/datasource/loki/queryUtils.test.ts +++ b/public/app/plugins/datasource/loki/queryUtils.test.ts @@ -1,6 +1,6 @@ import { String } from '@grafana/lezer-logql'; -import { createLokiDatasource } from './mocks'; +import { createLokiDatasource } from './__mocks__/datasource'; import { getHighlighterExpressionsFromQuery, getLokiQueryType, diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx index 17db0881046..16ef915193a 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx @@ -1,8 +1,8 @@ import { render, screen, waitFor } from '@testing-library/react'; import React from 'react'; +import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiDatasource } from '../../datasource'; -import { createLokiDatasource } from '../../mocks'; import { LokiQuery } from '../../types'; import { LabelBrowserModal, Props } from './LabelBrowserModal'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.test.tsx index c98cbeffc77..bacd008c6f4 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.test.tsx @@ -6,7 +6,7 @@ import { getSelectParent } from 'test/helpers/selectOptionInTest'; import { dateTime } from '@grafana/data'; import { MISSING_LABEL_FILTER_ERROR_MESSAGE } from '../../../prometheus/querybuilder/shared/LabelFilters'; -import { createLokiDatasource } from '../../mocks'; +import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiOperationId, LokiVisualQuery } from '../types'; import { LokiQueryBuilder } from './LokiQueryBuilder'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx index 9c7e788ee15..2ff57e8f5c0 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx @@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event'; import React from 'react'; import { getSelectParent } from 'test/helpers/selectOptionInTest'; -import { createLokiDatasource } from '../../mocks'; +import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiQueryBuilderContainer } from './LokiQueryBuilderContainer'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.test.tsx index 0ea262a76d5..2277f31a640 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import React from 'react'; -import { createLokiDatasource } from '../../mocks'; +import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiQuery } from '../../types'; import { EXPLAIN_LABEL_FILTER_CONTENT } from './LokiQueryBuilderExplained'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.test.tsx index ec39fff98e8..14b8ad536a7 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.test.tsx @@ -2,7 +2,7 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; -import { createLokiDatasource } from '../../mocks'; +import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiVisualQueryBinary } from '../types'; import { NestedQuery, Props as NestedQueryProps } from './NestedQuery'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.test.tsx index d1b2f3fb4b7..623a44cbea8 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.test.tsx @@ -2,8 +2,8 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; +import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiDatasource } from '../../datasource'; -import { createLokiDatasource } from '../../mocks'; import { LokiVisualQuery, LokiVisualQueryBinary } from '../types'; import { EXPLAIN_LABEL_FILTER_CONTENT } from './LokiQueryBuilderExplained'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx index cb43f4c3089..1ee163f7fc7 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx @@ -9,8 +9,8 @@ import { QueryBuilderOperationParamDef, } from 'app/plugins/datasource/prometheus/querybuilder/shared/types'; +import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiDatasource } from '../../datasource'; -import { createLokiDatasource } from '../../mocks'; import { LokiOperationId } from '../types'; import { UnwrapParamEditor } from './UnwrapParamEditor'; diff --git a/public/app/plugins/datasource/loki/responseUtils.test.ts b/public/app/plugins/datasource/loki/responseUtils.test.ts index b836b65cd71..4782975d5bb 100644 --- a/public/app/plugins/datasource/loki/responseUtils.test.ts +++ b/public/app/plugins/datasource/loki/responseUtils.test.ts @@ -2,7 +2,7 @@ import { cloneDeep } from 'lodash'; import { DataQueryResponse, QueryResultMetaStat, DataFrame, FieldType } from '@grafana/data'; -import { getMockFrames } from './mocks'; +import { getMockFrames } from './__mocks__/frames'; import { dataFrameHasLevelLabel, dataFrameHasLokiError,