From bfd33467fb7fa501b79bb6ac4f6dc56c99ed43c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= Date: Wed, 2 Jul 2025 09:25:25 +0200 Subject: [PATCH] Tests: removes jest duplicate manual mock warning (#107459) * Tests: removes jest duplicate manual mock warning * Trigger build * Trigger build --- .betterer.results | 247 +++++++++++++++--- .../MetricsBrowserContext.test.tsx | 2 +- .../useMetricsLabelsValues.test.ts | 2 +- .../completions.test.ts | 2 +- .../AlertingSettingsOverhaul.test.tsx | 2 +- .../src/configuration/PromSettings.test.tsx | 2 +- .../grafana-prometheus/src/datasource.test.ts | 2 +- .../components/MetricCombobox.test.tsx | 2 +- .../metrics-modal/MetricsModal.test.tsx | 2 +- .../shared/OperationList.test.tsx | 2 +- .../test/{__mocks__ => mocks}/datasource.ts | 0 .../ChangePasswordPage.test.tsx | 2 +- .../components/Signup/SignupPage.test.tsx | 2 +- .../{__mocks__ => mocks}/routeProps.ts | 0 public/app/core/services/FetchQueue.test.ts | 2 +- .../app/core/services/ResponseQueue.test.ts | 2 +- .../{__mocks__ => mocks}/search_srv.ts | 0 .../{__mocks__ => mocks}/subscribeTester.ts | 0 public/app/core/utils/shortLinks.test.ts | 2 +- .../admin/Users/OrgUsersTable.test.tsx | 2 +- .../alerting/unified/Receivers.test.tsx | 2 +- .../alerting/unified/Settings.test.tsx | 4 +- .../contact-points/ContactPoints.test.tsx | 6 +- .../alertmanager.mimir.config.mock.json | 0 .../alertmanager.vanilla.mock.json | 0 .../mimirFlavoredServer.ts | 0 .../{__mocks__ => mocks}/receivers.mock.json | 0 .../vanillaAlertmanagerServer.ts | 0 .../settings/AlertmanagerConfig.test.tsx | 2 +- .../grafana/config/api/v1/alerts.json | 0 .../alertmanager/grafana/config/history.json | 0 .../provisioned/config/api/v1/alerts.json | 0 .../vanilla prometheus/api/v2/status.json | 0 .../{__mocks__ => mocks}/api/datasources.json | 0 .../api/v1/ngalert/admin_config.json | 0 .../api/v1/ngalert/alertmanagers.json | 0 .../settings/{__mocks__ => mocks}/server.ts | 0 .../mocks/server/handlers/alertmanagers.ts | 2 +- .../unified/state/AlertingQueryRunner.test.ts | 2 +- .../executeAnnotationQuery.test.ts | 2 +- .../features/connections/Connections.test.tsx | 6 +- .../store.navIndex.mock.ts | 0 .../tabs/ConnectData/ConnectData.test.tsx | 2 +- .../correlations/CorrelationsPage.test.tsx | 2 +- .../useCorrelations.mocks.ts | 0 .../pages/DashboardScenePage.test.tsx | 2 +- .../pages/PublicDashboardScenePage.test.tsx | 2 +- .../version-history/HistorySrv.test.ts | 2 +- .../dashboardHistoryMocks.ts | 0 .../VersionsSettings.test.tsx | 2 +- .../{__mocks__ => mocks}/versions.ts | 0 .../containers/DashboardPage.test.tsx | 2 +- .../containers/PublicDashboardPage.test.tsx | 2 +- .../containers/SoloPanelPage.test.tsx | 2 +- .../features/datasources/__mocks__/index.ts | 2 - .../components/DataSourceDashboards.test.tsx | 2 +- .../DataSourceTestingStatus.test.tsx | 2 +- .../components/DataSourcesList.test.tsx | 2 +- .../components/EditDataSource.test.tsx | 2 +- .../{__mocks__ => mocks}/dataSourcesMocks.ts | 0 .../store.navIndex.mock.ts | 0 .../datasources/state/actions.test.ts | 2 +- .../datasources/state/reducers.test.ts | 2 +- .../features/explore/Logs/LiveLogs.test.tsx | 2 +- .../explore/Logs/PopoverMenu.test.tsx | 2 +- .../explore/{__mocks__ => mocks}/data.ts | 0 .../explore/{__mocks__ => mocks}/makeLogs.ts | 0 .../explore/{__mocks__ => mocks}/mockData.ts | 0 .../app/features/explore/state/query.test.ts | 2 +- .../utils/supplementaryQueries.test.ts | 2 +- .../utils/supplementaryQueries_legacy.test.ts | 2 +- .../features/invites/InviteesTable.test.tsx | 2 +- .../features/invites/state/reducers.test.ts | 2 +- .../logs/components/InfiniteScroll.test.tsx | 2 +- .../logs/components/LogDetails.test.tsx | 2 +- .../logs/components/LogDetailsRow.test.tsx | 2 +- .../features/logs/components/LogRow.test.tsx | 2 +- .../logs/components/LogRowMessage.test.tsx | 2 +- .../LogRowMessageDisplayedFields.test.tsx | 2 +- .../features/logs/components/LogRows.test.tsx | 2 +- .../logs/components/logParser.test.ts | 2 +- .../components/{__mocks__ => mocks}/logRow.ts | 0 .../logs/components/panel/LogLine.test.tsx | 2 +- .../components/panel/LogLineMenu.test.tsx | 2 +- .../logs/components/panel/LogList.test.tsx | 2 +- .../components/panel/LogListContext.test.tsx | 2 +- .../components/panel/LogListControls.test.tsx | 2 +- .../logs/components/panel/grammar.test.ts | 2 +- .../logs/components/panel/processing.test.ts | 2 +- .../components/panel/virtualization.test.ts | 2 +- public/app/features/logs/logsModel.test.ts | 2 +- public/app/features/logs/utils.test.ts | 2 +- .../features/plugins/admin/__mocks__/index.ts | 3 - .../admin/components/ConnectionsTab.test.tsx | 4 +- .../InstallControlsButton.test.tsx | 2 +- .../components/PluginDetailsBody.test.tsx | 2 +- .../features/plugins/admin/helpers.test.ts | 2 +- .../catalogPlugin.mock.ts | 0 .../{__mocks__ => mocks}/localPlugin.mock.ts | 0 .../admin/{__mocks__ => mocks}/mockHelpers.ts | 0 .../{__mocks__ => mocks}/remotePlugin.mock.ts | 0 .../plugins/admin/pages/Browse.test.tsx | 2 +- .../admin/pages/PluginDetails.test.tsx | 2 +- .../plugins/admin/state/selectors.test.ts | 2 +- .../profile/UserProfileEditPage.test.tsx | 2 +- .../features/profile/state/reducers.test.ts | 2 +- .../query/components/QueryEditorRows.test.tsx | 2 +- .../{__mocks__ => mocks}/mockDataSource.ts | 0 .../features/query/state/runRequest.test.ts | 2 +- .../app/features/teams/TeamGroupSync.test.tsx | 2 +- public/app/features/teams/TeamList.test.tsx | 2 +- public/app/features/teams/TeamPages.test.tsx | 2 +- .../app/features/teams/TeamSettings.test.tsx | 2 +- .../{__mocks__ => mocks}/navModelMock.ts | 0 .../teams/{__mocks__ => mocks}/teamMocks.ts | 0 .../app/features/teams/state/reducers.test.ts | 2 +- .../features/teams/state/selectors.test.ts | 2 +- .../users/{__mocks__ => mocks}/userMocks.ts | 0 .../app/features/users/state/reducers.test.ts | 2 +- .../azure_log_analytics_datasource.test.ts | 8 +- .../{__mocks__ => mocks}/schema.ts | 0 .../azure_monitor_datasource.test.ts | 6 +- .../azure_resource_graph_datasource.test.ts | 10 +- .../ArgQueryEditor/ArgQueryEditor.test.tsx | 4 +- .../ConfigEditor/BasicLogsToggle.test.tsx | 2 +- .../ConfigEditor/DefaultSubscription.test.tsx | 2 +- .../ConfigEditor/MonitorConfig.test.tsx | 2 +- .../LogsQueryEditor/LogsManagement.test.tsx | 4 +- .../LogsQueryEditor/LogsQueryEditor.test.tsx | 4 +- .../LogsQueryEditor/TimeManagement.test.tsx | 6 +- .../components/LogsQueryEditor/mocks.ts | 6 +- .../AggregationField.test.tsx | 4 +- .../DimensionFields.test.tsx | 6 +- .../MetricNameField.test.tsx | 4 +- .../MetricNamespaceField.test.tsx | 4 +- .../MetricsQueryEditor.test.tsx | 6 +- .../TimeGrainField.test.tsx | 4 +- .../MetricsQueryEditor/dataHooks.test.ts | 2 +- .../QueryEditor/QueryEditor.test.tsx | 6 +- .../ResourcePicker/ResourcePicker.test.tsx | 10 +- .../components/ResourcePicker/utils.test.ts | 2 +- .../TracesQueryEditor/Filters.test.tsx | 4 +- .../TracesQueryEditor/TraceTypeField.test.tsx | 4 +- .../TracesQueryEditor.test.tsx | 4 +- .../VariableEditor/VariableEditor.test.tsx | 2 +- .../components/shared/FormatAsField.test.tsx | 4 +- .../azuremonitor/datasource.test.ts | 6 +- .../grafanaTemplateVariables.test.ts | 2 +- .../argResourcePickerResponse.ts | 0 .../{__mocks__ => mocks}/datasource.ts | 0 .../datasourceSettings.ts | 0 .../{__mocks__ => mocks}/errors.ts | 0 .../{__mocks__ => mocks}/instanceSettings.ts | 0 .../{__mocks__ => mocks}/panelData.ts | 0 .../{__mocks__ => mocks}/query.ts | 0 .../resourcePickerRows.ts | 0 .../{__mocks__ => mocks}/utils.ts | 0 .../{__mocks__ => mocks}/variables.ts | 0 .../resourcePicker/resourcePickerData.test.ts | 12 +- .../azuremonitor/utils/common.test.ts | 2 +- .../utils/messageFromError.test.ts | 2 +- .../datasource/azuremonitor/variables.test.ts | 4 +- .../annotationSupport.test.ts | 2 +- .../components/Alignment.test.tsx | 6 +- .../components/AnnotationQueryEditor.test.tsx | 4 +- .../components/GroupBy.test.tsx | 2 +- .../components/MetricQueryEditor.test.tsx | 4 +- .../components/Preprocessor.test.tsx | 4 +- .../components/QueryEditor.test.tsx | 4 +- .../components/QueryHeader.test.tsx | 2 +- .../VisualMetricQueryEditor.test.tsx | 6 +- .../cloud-monitoring/datasource.test.ts | 4 +- .../cloudMonitoringDatasource.ts | 0 .../cloudMonitoringInstanceSettings.ts | 0 .../cloudMonitoringMetricDescriptor.ts | 0 .../cloudMonitoringQuery.ts | 0 .../AnnotationQueryEditor.test.tsx | 2 +- .../ConfigEditor/ConfigEditor.test.tsx | 4 +- .../LogsQueryEditor/CloudWatchLink.test.tsx | 6 +- .../MetricsQueryEditor.test.tsx | 4 +- .../SQLBuilderEditor.test.tsx | 2 +- .../SQLBuilderSelectRow.test.tsx | 2 +- .../SQLBuilderEditor/SQLGroupBy.test.tsx | 4 +- .../QueryEditor/QueryEditor.test.tsx | 8 +- .../QueryEditor/QueryHeader.test.tsx | 4 +- .../VariableQueryEditor/MultiFilter.test.tsx | 2 +- .../VariableQueryEditor.test.tsx | 2 +- .../shared/Dimensions/Dimensions.test.tsx | 2 +- .../shared/Dimensions/FilterItem.test.tsx | 2 +- .../shared/LogGroups/LogGroupsField.test.tsx | 2 +- .../MetricStatEditor.test.tsx | 4 +- .../datasource/cloudwatch/datasource.test.ts | 8 +- .../datasource/cloudwatch/hooks.test.ts | 18 +- .../completion/CompletionItemProvider.test.ts | 16 +- .../completion/statementPosition.test.ts | 18 +- .../CloudWatchLogsLanguageProvider.test.ts | 2 +- .../PPLCompletionItemProvider.test.ts | 10 +- .../completion/statementPosition.test.ts | 8 +- .../cloudwatch-sql/SQLGenerator.test.ts | 6 +- .../completion/statementPosition.test.ts | 6 +- .../completion/tokenUtils.test.ts | 6 +- .../CompletionItemProvider.test.ts | 6 +- .../completion/CompletionItemProvider.test.ts | 8 +- .../logs/completion/statementPosition.test.ts | 6 +- .../completion/CompletionItemProvider.test.ts | 8 +- .../completion/statementPosition.test.ts | 6 +- .../monarch/linkedTokenBuilder.test.ts | 6 +- .../AnnotationQueryRunner.ts | 0 .../CloudWatchDataSource.ts | 3 +- .../CloudWatchVariables.ts | 0 .../{__mocks__ => mocks}/LogsQueryRunner.ts | 0 .../MetricsQueryRunner.ts | 0 .../{__mocks__ => mocks}/Request.ts | 0 .../{__mocks__ => mocks}/ResourcesAPI.ts | 0 .../commentOnlyQuery.ts | 0 .../multiLineFullQuery.ts | 0 .../multiLineFullQueryWithCaseClause.ts | 0 .../partialQueryWithFunction.ts | 0 .../partialQueryWithSubquery.ts | 0 .../singleLineFullQuery.ts | 0 .../whitespaceQuery.ts | 0 .../commentOnlyQuery.ts | 0 .../cloudwatch-logs-test-data/empty.ts | 0 .../cloudwatch-logs-test-data/filterQuery.ts | 0 .../cloudwatch-logs-test-data/index.ts | 0 .../multiLineFullQuery.ts | 0 .../newCommandQuery.ts | 0 .../singleLineFullQuery.ts | 0 .../cloudwatch-logs-test-data/sortQuery.ts | 0 .../whitespaceQuery.ts | 0 .../multilineQueries.ts | 0 .../newCommandQuery.ts | 0 .../singleLineQueries.ts | 0 .../cloudwatch-sql-test-data/index.ts | 0 .../multiLineFullQuery.ts | 0 ...ultiLineIncompleteQueryWithoutNamespace.ts | 0 .../singleLineEmptyQuery.ts | 0 .../singleLineFullQuery.ts | 0 .../singleLineTwoQueries.ts | 0 .../dashboardOnLoadedEvent.ts | 0 .../afterLabelValue.ts | 0 .../dynamic-label-test-data/index.ts | 0 .../insideLabelValue.ts | 0 .../{__mocks__ => mocks}/logsTestContext.ts | 0 .../afterFunctionQuery.ts | 0 .../metric-math-test-data/index.ts | 0 .../secondArgAfterSearchQuery.ts | 0 .../metric-math-test-data/secondArgQuery.ts | 0 .../singleLineEmptyQuery.ts | 0 .../thirdArgAfterSearchQuery.ts | 0 .../withinStringQuery.ts | 0 .../{__mocks__ => mocks}/monarch/Monaco.ts | 0 .../{__mocks__ => mocks}/monarch/TextModel.ts | 0 .../{__mocks__ => mocks}/queries.ts | 0 .../{__mocks__ => mocks}/sqlUtils.ts | 0 .../{__mocks__ => mocks}/timeRange.ts | 0 .../CloudWatchAnnotationQueryRunner.test.ts | 4 +- .../CloudWatchLogsQueryRunner.test.ts | 8 +- .../CloudWatchMetricsQueryRunner.test.ts | 8 +- .../cloudwatch/resources/ResourceAPI.test.ts | 2 +- .../datasource/cloudwatch/tracking.test.ts | 2 +- .../utils/templateVariableUtils.test.ts | 2 +- .../datasource/cloudwatch/variables.test.ts | 9 +- .../configuration/ConfigEditor.test.tsx | 2 +- .../configuration/ElasticDetails.test.tsx | 2 +- .../configuration/LogsConfig.test.tsx | 2 +- .../{__mocks__ => mocks}/configOptions.ts | 0 .../QueryEditor.test.tsx | 2 +- .../{__mocks__ => mocks}/scenarios.ts | 0 .../datasource/influxdb/__mocks__/query.ts | 32 --- .../visual/VisualInfluxQLEditor.test.tsx | 2 +- .../datasource/influxdb/datasource.test.ts | 6 +- .../influxdb/datasource_sql.test.ts | 6 +- .../fsql/datasource.flightsql.test.ts | 4 +- .../influxdb/influxql_metadata_query.test.ts | 2 +- .../influxdb/influxql_query_builder.test.ts | 2 +- .../{__mocks__ => mocks}/datasource.ts | 0 .../influxdb/{__mocks__ => mocks}/request.ts | 0 .../influxdb/{__mocks__ => mocks}/response.ts | 0 .../influxdb/response_parser.test.ts | 2 +- .../datasource/loki/LanguageProvider.test.ts | 8 +- .../loki/LogContextProvider.test.ts | 2 +- .../loki/LokiVariableSupport.test.ts | 4 +- .../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 | 4 +- .../datasource/loki/mergeResponses.test.ts | 2 +- ...reateDetectedFieldValuesMetadataRequest.ts | 0 .../createDetectedFieldsMetadataRequest.ts | 0 .../loki/{__mocks__ => mocks}/datasource.ts | 0 .../loki/{__mocks__ => mocks}/frames.ts | 0 .../{__mocks__ => mocks}/metadataRequest.ts | 0 .../datasource/loki/querySplitting.test.ts | 4 +- .../components/LabelBrowserModal.test.tsx | 2 +- .../components/LabelParamEditor.test.tsx | 2 +- .../components/LokiQueryBuilder.test.tsx | 2 +- .../LokiQueryBuilderContainer.test.tsx | 2 +- .../LokiQueryBuilderOptions.test.tsx | 2 +- .../components/LokiQueryCodeEditor.test.tsx | 2 +- .../components/NestedQuery.test.tsx | 2 +- .../components/NestedQueryList.test.tsx | 2 +- .../components/UnwrapParamEditor.test.tsx | 2 +- .../loki/shardQuerySplitting.test.ts | 4 +- 311 files changed, 549 insertions(+), 419 deletions(-) rename packages/grafana-prometheus/src/test/{__mocks__ => mocks}/datasource.ts (100%) rename public/app/core/navigation/{__mocks__ => mocks}/routeProps.ts (100%) rename public/app/core/services/{__mocks__ => mocks}/search_srv.ts (100%) rename public/app/core/services/{__mocks__ => mocks}/subscribeTester.ts (100%) rename public/app/features/alerting/unified/components/contact-points/{__mocks__ => mocks}/alertmanager.mimir.config.mock.json (100%) rename public/app/features/alerting/unified/components/contact-points/{__mocks__ => mocks}/alertmanager.vanilla.mock.json (100%) rename public/app/features/alerting/unified/components/contact-points/{__mocks__ => mocks}/mimirFlavoredServer.ts (100%) rename public/app/features/alerting/unified/components/contact-points/{__mocks__ => mocks}/receivers.mock.json (100%) rename public/app/features/alerting/unified/components/contact-points/{__mocks__ => mocks}/vanillaAlertmanagerServer.ts (100%) rename public/app/features/alerting/unified/components/settings/{__mocks__ => mocks}/api/alertmanager/grafana/config/api/v1/alerts.json (100%) rename public/app/features/alerting/unified/components/settings/{__mocks__ => mocks}/api/alertmanager/grafana/config/history.json (100%) rename public/app/features/alerting/unified/components/settings/{__mocks__ => mocks}/api/alertmanager/provisioned/config/api/v1/alerts.json (100%) rename public/app/features/alerting/unified/components/settings/{__mocks__ => mocks}/api/alertmanager/vanilla prometheus/api/v2/status.json (100%) rename public/app/features/alerting/unified/components/settings/{__mocks__ => mocks}/api/datasources.json (100%) rename public/app/features/alerting/unified/components/settings/{__mocks__ => mocks}/api/v1/ngalert/admin_config.json (100%) rename public/app/features/alerting/unified/components/settings/{__mocks__ => mocks}/api/v1/ngalert/alertmanagers.json (100%) rename public/app/features/alerting/unified/components/settings/{__mocks__ => mocks}/server.ts (100%) rename public/app/features/connections/{__mocks__ => mocks}/store.navIndex.mock.ts (100%) rename public/app/features/correlations/{__mocks__ => mocks}/useCorrelations.mocks.ts (100%) rename public/app/features/dashboard-scene/settings/version-history/{__mocks__ => mocks}/dashboardHistoryMocks.ts (100%) rename public/app/features/dashboard/components/DashboardSettings/{__mocks__ => mocks}/versions.ts (100%) delete mode 100644 public/app/features/datasources/__mocks__/index.ts rename public/app/features/datasources/{__mocks__ => mocks}/dataSourcesMocks.ts (100%) rename public/app/features/datasources/{__mocks__ => mocks}/store.navIndex.mock.ts (100%) rename public/app/features/explore/{__mocks__ => mocks}/data.ts (100%) rename public/app/features/explore/{__mocks__ => mocks}/makeLogs.ts (100%) rename public/app/features/explore/{__mocks__ => mocks}/mockData.ts (100%) rename public/app/features/logs/components/{__mocks__ => mocks}/logRow.ts (100%) delete mode 100644 public/app/features/plugins/admin/__mocks__/index.ts rename public/app/features/plugins/admin/{__mocks__ => mocks}/catalogPlugin.mock.ts (100%) rename public/app/features/plugins/admin/{__mocks__ => mocks}/localPlugin.mock.ts (100%) rename public/app/features/plugins/admin/{__mocks__ => mocks}/mockHelpers.ts (100%) rename public/app/features/plugins/admin/{__mocks__ => mocks}/remotePlugin.mock.ts (100%) rename public/app/features/query/state/{__mocks__ => mocks}/mockDataSource.ts (100%) rename public/app/features/teams/{__mocks__ => mocks}/navModelMock.ts (100%) rename public/app/features/teams/{__mocks__ => mocks}/teamMocks.ts (100%) rename public/app/features/users/{__mocks__ => mocks}/userMocks.ts (100%) rename public/app/plugins/datasource/azuremonitor/azure_log_analytics/{__mocks__ => mocks}/schema.ts (100%) rename public/app/plugins/datasource/azuremonitor/{__mocks__ => mocks}/argResourcePickerResponse.ts (100%) rename public/app/plugins/datasource/azuremonitor/{__mocks__ => mocks}/datasource.ts (100%) rename public/app/plugins/datasource/azuremonitor/{__mocks__ => mocks}/datasourceSettings.ts (100%) rename public/app/plugins/datasource/azuremonitor/{__mocks__ => mocks}/errors.ts (100%) rename public/app/plugins/datasource/azuremonitor/{__mocks__ => mocks}/instanceSettings.ts (100%) rename public/app/plugins/datasource/azuremonitor/{__mocks__ => mocks}/panelData.ts (100%) rename public/app/plugins/datasource/azuremonitor/{__mocks__ => mocks}/query.ts (100%) rename public/app/plugins/datasource/azuremonitor/{__mocks__ => mocks}/resourcePickerRows.ts (100%) rename public/app/plugins/datasource/azuremonitor/{__mocks__ => mocks}/utils.ts (100%) rename public/app/plugins/datasource/azuremonitor/{__mocks__ => mocks}/variables.ts (100%) rename public/app/plugins/datasource/cloud-monitoring/{__mocks__ => mocks}/cloudMonitoringDatasource.ts (100%) rename public/app/plugins/datasource/cloud-monitoring/{__mocks__ => mocks}/cloudMonitoringInstanceSettings.ts (100%) rename public/app/plugins/datasource/cloud-monitoring/{__mocks__ => mocks}/cloudMonitoringMetricDescriptor.ts (100%) rename public/app/plugins/datasource/cloud-monitoring/{__mocks__ => mocks}/cloudMonitoringQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/AnnotationQueryRunner.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/CloudWatchDataSource.ts (99%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/CloudWatchVariables.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/LogsQueryRunner.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/MetricsQueryRunner.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/Request.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/ResourcesAPI.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-sql-test-data/commentOnlyQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-sql-test-data/multiLineFullQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-sql-test-data/partialQueryWithFunction.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-sql-test-data/partialQueryWithSubquery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-sql-test-data/singleLineFullQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-sql-test-data/whitespaceQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-test-data/commentOnlyQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-test-data/empty.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-test-data/filterQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-test-data/index.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-test-data/multiLineFullQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-test-data/newCommandQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-test-data/singleLineFullQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-test-data/sortQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-logs-test-data/whitespaceQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-ppl-test-data/multilineQueries.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-ppl-test-data/newCommandQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-ppl-test-data/singleLineQueries.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-sql-test-data/index.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-sql-test-data/multiLineFullQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-sql-test-data/multiLineIncompleteQueryWithoutNamespace.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-sql-test-data/singleLineEmptyQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-sql-test-data/singleLineFullQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/cloudwatch-sql-test-data/singleLineTwoQueries.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/dashboardOnLoadedEvent.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/dynamic-label-test-data/afterLabelValue.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/dynamic-label-test-data/index.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/dynamic-label-test-data/insideLabelValue.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/logsTestContext.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/metric-math-test-data/afterFunctionQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/metric-math-test-data/index.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/metric-math-test-data/secondArgAfterSearchQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/metric-math-test-data/secondArgQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/metric-math-test-data/singleLineEmptyQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/metric-math-test-data/thirdArgAfterSearchQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/metric-math-test-data/withinStringQuery.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/monarch/Monaco.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/monarch/TextModel.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/queries.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/sqlUtils.ts (100%) rename public/app/plugins/datasource/cloudwatch/{__mocks__ => mocks}/timeRange.ts (100%) rename public/app/plugins/datasource/elasticsearch/configuration/{__mocks__ => mocks}/configOptions.ts (100%) rename public/app/plugins/datasource/grafana-testdata-datasource/{__mocks__ => mocks}/scenarios.ts (100%) delete mode 100644 public/app/plugins/datasource/influxdb/__mocks__/query.ts rename public/app/plugins/datasource/influxdb/{__mocks__ => mocks}/datasource.ts (100%) rename public/app/plugins/datasource/influxdb/{__mocks__ => mocks}/request.ts (100%) rename public/app/plugins/datasource/influxdb/{__mocks__ => mocks}/response.ts (100%) rename public/app/plugins/datasource/loki/{__mocks__ => mocks}/createDetectedFieldValuesMetadataRequest.ts (100%) rename public/app/plugins/datasource/loki/{__mocks__ => mocks}/createDetectedFieldsMetadataRequest.ts (100%) rename public/app/plugins/datasource/loki/{__mocks__ => mocks}/datasource.ts (100%) rename public/app/plugins/datasource/loki/{__mocks__ => mocks}/frames.ts (100%) rename public/app/plugins/datasource/loki/{__mocks__ => mocks}/metadataRequest.ts (100%) diff --git a/.betterer.results b/.betterer.results index f5c2127333f..8dd6ca5fe4b 100644 --- a/.betterer.results +++ b/.betterer.results @@ -489,6 +489,9 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "6"], [0, 0, 0, "Unexpected any. Specify a different type.", "7"] ], + "packages/grafana-prometheus/src/test/mocks/datasource.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], "packages/grafana-prometheus/src/types.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"], @@ -958,6 +961,9 @@ exports[`better eslint`] = { [0, 0, 0, "Do not re-export imported variable (\`profiler\`)", "6"], [0, 0, 0, "Do not re-export imported variable (\`updateLegendValues\`)", "7"] ], + "public/app/core/navigation/mocks/routeProps.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], "public/app/core/navigation/types.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"] ], @@ -1566,6 +1572,9 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"], [0, 0, 0, "Do not use export all (\`export * from ...\`)", "1"] ], + "public/app/features/correlations/mocks/useCorrelations.mocks.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], "public/app/features/correlations/types.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"] @@ -2223,10 +2232,6 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"], [0, 0, 0, "Do not use export all (\`export * from ...\`)", "1"] ], - "public/app/features/datasources/__mocks__/index.ts:5381": [ - [0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"], - [0, 0, 0, "Do not use export all (\`export * from ...\`)", "1"] - ], "public/app/features/datasources/components/DataSourceTypeCard.tsx:5381": [ [0, 0, 0, "Add noMargin prop to Card components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "0"], [0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "1"] @@ -2597,11 +2602,6 @@ exports[`better eslint`] = { [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "1"], [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "2"] ], - "public/app/features/plugins/admin/__mocks__/index.ts:5381": [ - [0, 0, 0, "Do not re-export imported variable (\`./localPlugin.mock\`)", "0"], - [0, 0, 0, "Do not re-export imported variable (\`./remotePlugin.mock\`)", "1"], - [0, 0, 0, "Do not use export all (\`export * from ...\`)", "2"] - ], "public/app/features/plugins/admin/components/Badges/index.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`./PluginDeprecatedBadge\`)", "0"], [0, 0, 0, "Do not re-export imported variable (\`./PluginDisabledBadge\`)", "1"], @@ -2622,6 +2622,16 @@ exports[`better eslint`] = { "public/app/features/plugins/admin/components/PluginDetailsPage.tsx:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"] ], + "public/app/features/plugins/admin/mocks/catalogPlugin.mock.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"] + ], + "public/app/features/plugins/admin/mocks/localPlugin.mock.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/features/plugins/admin/mocks/remotePlugin.mock.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], "public/app/features/plugins/admin/pages/Browse.tsx:5381": [ [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "0"], [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "1"], @@ -2972,6 +2982,12 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "2"], [0, 0, 0, "Do not use any type assertions.", "3"] ], + "public/app/features/users/mocks/userMocks.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "Do not use any type assertions.", "2"], + [0, 0, 0, "Do not use any type assertions.", "3"] + ], "public/app/features/variables/adapters.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"], @@ -3196,6 +3212,21 @@ exports[`better eslint`] = { [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "5"], [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "6"] ], + "public/app/plugins/datasource/azuremonitor/mocks/datasource.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/azuremonitor/mocks/panelData.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "Do not use any type assertions.", "2"] + ], + "public/app/plugins/datasource/azuremonitor/mocks/utils.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"] + ], + "public/app/plugins/datasource/azuremonitor/mocks/variables.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], "public/app/plugins/datasource/azuremonitor/types/index.ts:5381": [ [0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"], [0, 0, 0, "Do not use export all (\`export * from ...\`)", "1"], @@ -3260,6 +3291,14 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Do not use any type assertions.", "1"] ], + "public/app/plugins/datasource/cloud-monitoring/mocks/cloudMonitoringDatasource.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "Do not use any type assertions.", "2"] + ], + "public/app/plugins/datasource/cloud-monitoring/mocks/cloudMonitoringInstanceSettings.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], "public/app/plugins/datasource/cloud-monitoring/types/query.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`../dataquery.gen\`)", "0"], [0, 0, 0, "Do not re-export imported variable (\`../dataquery.gen\`)", "1"], @@ -3271,35 +3310,6 @@ exports[`better eslint`] = { "public/app/plugins/datasource/cloud-monitoring/webpack.config.ts:5381": [ [0, 0, 0, "Do not re-export imported variable (\`config\`)", "0"] ], - "public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/index.ts:5381": [ - [0, 0, 0, "Do not re-export imported variable (\`./commentOnlyQuery\`)", "0"], - [0, 0, 0, "Do not re-export imported variable (\`./empty\`)", "1"], - [0, 0, 0, "Do not re-export imported variable (\`./filterQuery\`)", "2"], - [0, 0, 0, "Do not re-export imported variable (\`./multiLineFullQuery\`)", "3"], - [0, 0, 0, "Do not re-export imported variable (\`./newCommandQuery\`)", "4"], - [0, 0, 0, "Do not re-export imported variable (\`./singleLineFullQuery\`)", "5"], - [0, 0, 0, "Do not re-export imported variable (\`./sortQuery\`)", "6"], - [0, 0, 0, "Do not re-export imported variable (\`./whitespaceQuery\`)", "7"] - ], - "public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/index.ts:5381": [ - [0, 0, 0, "Do not re-export imported variable (\`./multiLineFullQuery\`)", "0"], - [0, 0, 0, "Do not re-export imported variable (\`./multiLineIncompleteQueryWithoutNamespace\`)", "1"], - [0, 0, 0, "Do not re-export imported variable (\`./singleLineEmptyQuery\`)", "2"], - [0, 0, 0, "Do not re-export imported variable (\`./singleLineFullQuery\`)", "3"], - [0, 0, 0, "Do not re-export imported variable (\`./singleLineTwoQueries\`)", "4"] - ], - "public/app/plugins/datasource/cloudwatch/__mocks__/dynamic-label-test-data/index.ts:5381": [ - [0, 0, 0, "Do not re-export imported variable (\`./afterLabelValue\`)", "0"], - [0, 0, 0, "Do not re-export imported variable (\`./insideLabelValue\`)", "1"] - ], - "public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/index.ts:5381": [ - [0, 0, 0, "Do not re-export imported variable (\`./afterFunctionQuery\`)", "0"], - [0, 0, 0, "Do not re-export imported variable (\`./secondArgAfterSearchQuery\`)", "1"], - [0, 0, 0, "Do not re-export imported variable (\`./secondArgQuery\`)", "2"], - [0, 0, 0, "Do not re-export imported variable (\`./singleLineEmptyQuery\`)", "3"], - [0, 0, 0, "Do not re-export imported variable (\`./thirdArgAfterSearchQuery\`)", "4"], - [0, 0, 0, "Do not re-export imported variable (\`./withinStringQuery\`)", "5"] - ], "public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.tsx:5381": [ [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "0"], [0, 0, 0, "Add noMargin prop to Field components to remove built-in margins. Use layout components like Stack or Grid with the gap prop instead for consistent spacing.", "1"], @@ -3337,6 +3347,153 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "1"], [0, 0, 0, "Unexpected any. Specify a different type.", "2"] ], + "public/app/plugins/datasource/cloudwatch/mocks/CloudWatchVariables.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/commentOnlyQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/multiLineFullQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/partialQueryWithFunction.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/partialQueryWithSubquery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/singleLineFullQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/whitespaceQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/commentOnlyQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/filterQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/index.ts:5381": [ + [0, 0, 0, "Do not re-export imported variable (\`./commentOnlyQuery\`)", "0"], + [0, 0, 0, "Do not re-export imported variable (\`./empty\`)", "1"], + [0, 0, 0, "Do not re-export imported variable (\`./filterQuery\`)", "2"], + [0, 0, 0, "Do not re-export imported variable (\`./multiLineFullQuery\`)", "3"], + [0, 0, 0, "Do not re-export imported variable (\`./newCommandQuery\`)", "4"], + [0, 0, 0, "Do not re-export imported variable (\`./singleLineFullQuery\`)", "5"], + [0, 0, 0, "Do not re-export imported variable (\`./sortQuery\`)", "6"], + [0, 0, 0, "Do not re-export imported variable (\`./whitespaceQuery\`)", "7"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/multiLineFullQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/newCommandQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/singleLineFullQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/sortQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/whitespaceQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-ppl-test-data/multilineQueries.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-ppl-test-data/newCommandQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-ppl-test-data/singleLineQueries.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"], + [0, 0, 0, "Do not use any type assertions.", "2"], + [0, 0, 0, "Do not use any type assertions.", "3"], + [0, 0, 0, "Do not use any type assertions.", "4"], + [0, 0, 0, "Do not use any type assertions.", "5"], + [0, 0, 0, "Do not use any type assertions.", "6"], + [0, 0, 0, "Do not use any type assertions.", "7"], + [0, 0, 0, "Do not use any type assertions.", "8"], + [0, 0, 0, "Do not use any type assertions.", "9"], + [0, 0, 0, "Do not use any type assertions.", "10"], + [0, 0, 0, "Do not use any type assertions.", "11"], + [0, 0, 0, "Do not use any type assertions.", "12"], + [0, 0, 0, "Do not use any type assertions.", "13"], + [0, 0, 0, "Do not use any type assertions.", "14"], + [0, 0, 0, "Do not use any type assertions.", "15"], + [0, 0, 0, "Do not use any type assertions.", "16"], + [0, 0, 0, "Do not use any type assertions.", "17"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/index.ts:5381": [ + [0, 0, 0, "Do not re-export imported variable (\`./multiLineFullQuery\`)", "0"], + [0, 0, 0, "Do not re-export imported variable (\`./multiLineIncompleteQueryWithoutNamespace\`)", "1"], + [0, 0, 0, "Do not re-export imported variable (\`./singleLineEmptyQuery\`)", "2"], + [0, 0, 0, "Do not re-export imported variable (\`./singleLineFullQuery\`)", "3"], + [0, 0, 0, "Do not re-export imported variable (\`./singleLineTwoQueries\`)", "4"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/multiLineFullQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/multiLineIncompleteQueryWithoutNamespace.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/singleLineEmptyQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/singleLineFullQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/singleLineTwoQueries.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/dashboardOnLoadedEvent.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/dynamic-label-test-data/afterLabelValue.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/dynamic-label-test-data/index.ts:5381": [ + [0, 0, 0, "Do not re-export imported variable (\`./afterLabelValue\`)", "0"], + [0, 0, 0, "Do not re-export imported variable (\`./insideLabelValue\`)", "1"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/dynamic-label-test-data/insideLabelValue.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/afterFunctionQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/index.ts:5381": [ + [0, 0, 0, "Do not re-export imported variable (\`./afterFunctionQuery\`)", "0"], + [0, 0, 0, "Do not re-export imported variable (\`./secondArgAfterSearchQuery\`)", "1"], + [0, 0, 0, "Do not re-export imported variable (\`./secondArgQuery\`)", "2"], + [0, 0, 0, "Do not re-export imported variable (\`./singleLineEmptyQuery\`)", "3"], + [0, 0, 0, "Do not re-export imported variable (\`./thirdArgAfterSearchQuery\`)", "4"], + [0, 0, 0, "Do not re-export imported variable (\`./withinStringQuery\`)", "5"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/secondArgAfterSearchQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/secondArgQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/singleLineEmptyQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/thirdArgAfterSearchQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/withinStringQuery.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], + "public/app/plugins/datasource/cloudwatch/mocks/monarch/Monaco.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"] + ], "public/app/plugins/datasource/cloudwatch/types.ts:5381": [ [0, 0, 0, "Do not use export all (\`export * from ...\`)", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"], @@ -3409,6 +3566,9 @@ exports[`better eslint`] = { "public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/reducer.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"] ], + "public/app/plugins/datasource/elasticsearch/configuration/mocks/configOptions.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], "public/app/plugins/datasource/elasticsearch/datasource.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"], @@ -3628,6 +3788,10 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "7"], [0, 0, 0, "Unexpected any. Specify a different type.", "8"] ], + "public/app/plugins/datasource/influxdb/mocks/datasource.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"] + ], "public/app/plugins/datasource/influxdb/query_part.ts:5381": [ [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"], @@ -3695,6 +3859,13 @@ exports[`better eslint`] = { [0, 0, 0, "Unexpected any. Specify a different type.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"] ], + "public/app/plugins/datasource/loki/mocks/datasource.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"], + [0, 0, 0, "Do not use any type assertions.", "1"] + ], + "public/app/plugins/datasource/loki/mocks/metadataRequest.ts:5381": [ + [0, 0, 0, "Do not use any type assertions.", "0"] + ], "public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"] ], diff --git a/packages/grafana-prometheus/src/components/metrics-browser/MetricsBrowserContext.test.tsx b/packages/grafana-prometheus/src/components/metrics-browser/MetricsBrowserContext.test.tsx index 68d88b3e123..4a1536edc10 100644 --- a/packages/grafana-prometheus/src/components/metrics-browser/MetricsBrowserContext.test.tsx +++ b/packages/grafana-prometheus/src/components/metrics-browser/MetricsBrowserContext.test.tsx @@ -7,7 +7,7 @@ import { TimeRange } from '@grafana/data'; import { DEFAULT_SERIES_LIMIT, LAST_USED_LABELS_KEY, METRIC_LABEL } from '../../constants'; import { PrometheusDatasource } from '../../datasource'; import { PrometheusLanguageProviderInterface } from '../../language_provider'; -import { getMockTimeRange } from '../../test/__mocks__/datasource'; +import { getMockTimeRange } from '../../test/mocks/datasource'; import { MetricsBrowserProvider, useMetricsBrowser } from './MetricsBrowserContext'; diff --git a/packages/grafana-prometheus/src/components/metrics-browser/useMetricsLabelsValues.test.ts b/packages/grafana-prometheus/src/components/metrics-browser/useMetricsLabelsValues.test.ts index 6cd2ab01869..e43b2bd0cc3 100644 --- a/packages/grafana-prometheus/src/components/metrics-browser/useMetricsLabelsValues.test.ts +++ b/packages/grafana-prometheus/src/components/metrics-browser/useMetricsLabelsValues.test.ts @@ -5,7 +5,7 @@ import { TimeRange } from '@grafana/data'; import { DEFAULT_SERIES_LIMIT, EMPTY_SELECTOR, LAST_USED_LABELS_KEY, METRIC_LABEL } from '../../constants'; import { PrometheusDatasource } from '../../datasource'; import { PrometheusLanguageProvider, PrometheusLanguageProviderInterface } from '../../language_provider'; -import { getMockTimeRange } from '../../test/__mocks__/datasource'; +import { getMockTimeRange } from '../../test/mocks/datasource'; import * as selectorBuilderModule from './selectorBuilder'; import { useMetricsLabelsValues } from './useMetricsLabelsValues'; diff --git a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/completions.test.ts b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/completions.test.ts index 28b55e16f73..88303e2503b 100644 --- a/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/completions.test.ts +++ b/packages/grafana-prometheus/src/components/monaco-query-field/monaco-completion-provider/completions.test.ts @@ -2,7 +2,7 @@ import { config } from '@grafana/runtime'; import { SUGGESTIONS_LIMIT } from '../../../constants'; import { FUNCTIONS } from '../../../promql'; -import { getMockTimeRange } from '../../../test/__mocks__/datasource'; +import { getMockTimeRange } from '../../../test/mocks/datasource'; import { filterMetricNames, getCompletions } from './completions'; import { DataProvider, type DataProviderParams } from './data_provider'; diff --git a/packages/grafana-prometheus/src/configuration/AlertingSettingsOverhaul.test.tsx b/packages/grafana-prometheus/src/configuration/AlertingSettingsOverhaul.test.tsx index 6cbf7715552..6ff15e9f063 100644 --- a/packages/grafana-prometheus/src/configuration/AlertingSettingsOverhaul.test.tsx +++ b/packages/grafana-prometheus/src/configuration/AlertingSettingsOverhaul.test.tsx @@ -3,7 +3,7 @@ import { render } from '@testing-library/react'; import { selectors } from '@grafana/e2e-selectors'; import { config } from '@grafana/runtime'; -import { createDefaultConfigOptions } from '../test/__mocks__/datasource'; +import { createDefaultConfigOptions } from '../test/mocks/datasource'; import { AlertingSettingsOverhaul } from './AlertingSettingsOverhaul'; diff --git a/packages/grafana-prometheus/src/configuration/PromSettings.test.tsx b/packages/grafana-prometheus/src/configuration/PromSettings.test.tsx index 0b860a34d82..ab6303d5c3a 100644 --- a/packages/grafana-prometheus/src/configuration/PromSettings.test.tsx +++ b/packages/grafana-prometheus/src/configuration/PromSettings.test.tsx @@ -7,7 +7,7 @@ import { selectors } from '@grafana/e2e-selectors'; import { config } from '@grafana/runtime'; import { countError } from '../constants'; -import { createDefaultConfigOptions } from '../test/__mocks__/datasource'; +import { createDefaultConfigOptions } from '../test/mocks/datasource'; import { getValueFromEventItem, PromSettings } from './PromSettings'; diff --git a/packages/grafana-prometheus/src/datasource.test.ts b/packages/grafana-prometheus/src/datasource.test.ts index a9c184781db..5b18f5e2e97 100644 --- a/packages/grafana-prometheus/src/datasource.test.ts +++ b/packages/grafana-prometheus/src/datasource.test.ts @@ -24,7 +24,7 @@ import { createDefaultPromResponse, fetchMockCalledWith, getMockTimeRange, -} from './test/__mocks__/datasource'; +} from './test/mocks/datasource'; import { PromApplication, PrometheusCacheLevel, diff --git a/packages/grafana-prometheus/src/querybuilder/components/MetricCombobox.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/MetricCombobox.test.tsx index 8c49e0f437f..d07b1ecf402 100644 --- a/packages/grafana-prometheus/src/querybuilder/components/MetricCombobox.test.tsx +++ b/packages/grafana-prometheus/src/querybuilder/components/MetricCombobox.test.tsx @@ -8,7 +8,7 @@ import { DataSourceInstanceSettings } from '@grafana/data'; import { PrometheusDatasource } from '../../datasource'; import { PrometheusLanguageProviderInterface } from '../../language_provider'; import { EmptyLanguageProviderMock } from '../../language_provider.mock'; -import { getMockTimeRange } from '../../test/__mocks__/datasource'; +import { getMockTimeRange } from '../../test/mocks/datasource'; import { PromOptions } from '../../types'; import { MetricCombobox, MetricComboboxProps } from './MetricCombobox'; diff --git a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.test.tsx b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.test.tsx index 4a1470fb82d..ae35490c097 100644 --- a/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.test.tsx +++ b/packages/grafana-prometheus/src/querybuilder/components/metrics-modal/MetricsModal.test.tsx @@ -7,7 +7,7 @@ import { DataSourceInstanceSettings, DataSourcePluginMeta } from '@grafana/data' import { PrometheusDatasource } from '../../../datasource'; import { PrometheusLanguageProviderInterface } from '../../../language_provider'; import { EmptyLanguageProviderMock } from '../../../language_provider.mock'; -import { getMockTimeRange } from '../../../test/__mocks__/datasource'; +import { getMockTimeRange } from '../../../test/mocks/datasource'; import { PromOptions } from '../../../types'; import { PromVisualQuery } from '../../types'; diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationList.test.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationList.test.tsx index 484e829e72f..b0858fb093b 100644 --- a/packages/grafana-prometheus/src/querybuilder/shared/OperationList.test.tsx +++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationList.test.tsx @@ -7,7 +7,7 @@ import { DataSourceApi, DataSourceInstanceSettings } from '@grafana/data'; import { PrometheusDatasource } from '../../datasource'; import { PrometheusLanguageProviderInterface } from '../../language_provider'; import { EmptyLanguageProviderMock } from '../../language_provider.mock'; -import { getMockTimeRange } from '../../test/__mocks__/datasource'; +import { getMockTimeRange } from '../../test/mocks/datasource'; import { PromOptions } from '../../types'; import { addOperationInQueryBuilder } from '../testUtils'; import { PromVisualQuery } from '../types'; diff --git a/packages/grafana-prometheus/src/test/__mocks__/datasource.ts b/packages/grafana-prometheus/src/test/mocks/datasource.ts similarity index 100% rename from packages/grafana-prometheus/src/test/__mocks__/datasource.ts rename to packages/grafana-prometheus/src/test/mocks/datasource.ts diff --git a/public/app/core/components/ForgottenPassword/ChangePasswordPage.test.tsx b/public/app/core/components/ForgottenPassword/ChangePasswordPage.test.tsx index 401843d80c3..b3e7f4e2347 100644 --- a/public/app/core/components/ForgottenPassword/ChangePasswordPage.test.tsx +++ b/public/app/core/components/ForgottenPassword/ChangePasswordPage.test.tsx @@ -1,7 +1,7 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps'; +import { getRouteComponentProps } from 'app/core/navigation/mocks/routeProps'; import { ChangePasswordPage, Props } from './ChangePasswordPage'; diff --git a/public/app/core/components/Signup/SignupPage.test.tsx b/public/app/core/components/Signup/SignupPage.test.tsx index 167bd584491..d8947e55ffa 100644 --- a/public/app/core/components/Signup/SignupPage.test.tsx +++ b/public/app/core/components/Signup/SignupPage.test.tsx @@ -1,6 +1,6 @@ import { render, fireEvent, screen, waitFor, userEvent } from 'test/test-utils'; -import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps'; +import { getRouteComponentProps } from 'app/core/navigation/mocks/routeProps'; import { SignupPage } from './SignupPage'; diff --git a/public/app/core/navigation/__mocks__/routeProps.ts b/public/app/core/navigation/mocks/routeProps.ts similarity index 100% rename from public/app/core/navigation/__mocks__/routeProps.ts rename to public/app/core/navigation/mocks/routeProps.ts diff --git a/public/app/core/services/FetchQueue.test.ts b/public/app/core/services/FetchQueue.test.ts index a7a93371e6d..af4e8eaaa90 100644 --- a/public/app/core/services/FetchQueue.test.ts +++ b/public/app/core/services/FetchQueue.test.ts @@ -3,7 +3,7 @@ import { take } from 'rxjs/operators'; import { BackendSrvRequest } from '@grafana/runtime'; import { FetchQueue, FetchQueueUpdate, FetchStatus } from './FetchQueue'; -import { subscribeTester } from './__mocks__/subscribeTester'; +import { subscribeTester } from './mocks/subscribeTester'; describe('FetchQueue', () => { describe('add', () => { diff --git a/public/app/core/services/ResponseQueue.test.ts b/public/app/core/services/ResponseQueue.test.ts index 09a32847891..5a5bb30a7b9 100644 --- a/public/app/core/services/ResponseQueue.test.ts +++ b/public/app/core/services/ResponseQueue.test.ts @@ -5,7 +5,7 @@ import { BackendSrvRequest } from '@grafana/runtime'; import { FetchQueue, FetchQueueUpdate } from './FetchQueue'; import { ResponseQueue } from './ResponseQueue'; -import { subscribeTester } from './__mocks__/subscribeTester'; +import { subscribeTester } from './mocks/subscribeTester'; const getTestContext = () => { const id = 'id'; diff --git a/public/app/core/services/__mocks__/search_srv.ts b/public/app/core/services/mocks/search_srv.ts similarity index 100% rename from public/app/core/services/__mocks__/search_srv.ts rename to public/app/core/services/mocks/search_srv.ts diff --git a/public/app/core/services/__mocks__/subscribeTester.ts b/public/app/core/services/mocks/subscribeTester.ts similarity index 100% rename from public/app/core/services/__mocks__/subscribeTester.ts rename to public/app/core/services/mocks/subscribeTester.ts diff --git a/public/app/core/utils/shortLinks.test.ts b/public/app/core/utils/shortLinks.test.ts index 1e68c787edb..38d459b906a 100644 --- a/public/app/core/utils/shortLinks.test.ts +++ b/public/app/core/utils/shortLinks.test.ts @@ -1,6 +1,6 @@ import { LogRowModel } from '@grafana/data'; import { config } from '@grafana/runtime'; -import { createLogRow } from 'app/features/logs/components/__mocks__/logRow'; +import { createLogRow } from 'app/features/logs/components/mocks/logRow'; import { createShortLink, createAndCopyShortLink, getLogsPermalinkRange } from './shortLinks'; diff --git a/public/app/features/admin/Users/OrgUsersTable.test.tsx b/public/app/features/admin/Users/OrgUsersTable.test.tsx index 8652688ab6e..ea64232081e 100644 --- a/public/app/features/admin/Users/OrgUsersTable.test.tsx +++ b/public/app/features/admin/Users/OrgUsersTable.test.tsx @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { OrgUser } from '../../../types'; -import { getMockUsers } from '../../users/__mocks__/userMocks'; +import { getMockUsers } from '../../users/mocks/userMocks'; import { OrgUsersTable, Props } from './OrgUsersTable'; diff --git a/public/app/features/alerting/unified/Receivers.test.tsx b/public/app/features/alerting/unified/Receivers.test.tsx index 21d3c92b5b0..0363e772509 100644 --- a/public/app/features/alerting/unified/Receivers.test.tsx +++ b/public/app/features/alerting/unified/Receivers.test.tsx @@ -6,7 +6,7 @@ import { PROVISIONED_MIMIR_ALERTMANAGER_UID, mockDataSources, setupVanillaAlertmanagerServer, -} from 'app/features/alerting/unified/components/settings/__mocks__/server'; +} from 'app/features/alerting/unified/components/settings/mocks/server'; import { setupMswServer } from 'app/features/alerting/unified/mockApi'; import { grantUserPermissions } from 'app/features/alerting/unified/mocks'; import { setupDataSources } from 'app/features/alerting/unified/testSetup/datasources'; diff --git a/public/app/features/alerting/unified/Settings.test.tsx b/public/app/features/alerting/unified/Settings.test.tsx index d086ba7663d..0d362c74b45 100644 --- a/public/app/features/alerting/unified/Settings.test.tsx +++ b/public/app/features/alerting/unified/Settings.test.tsx @@ -3,8 +3,8 @@ import { render } from 'test/test-utils'; import { byRole, byTestId, byText } from 'testing-library-selector'; import SettingsPage from './Settings'; -import DataSourcesResponse from './components/settings/__mocks__/api/datasources.json'; -import { setupGrafanaManagedServer, withExternalOnlySetting } from './components/settings/__mocks__/server'; +import DataSourcesResponse from './components/settings/mocks/api/datasources.json'; +import { setupGrafanaManagedServer, withExternalOnlySetting } from './components/settings/mocks/server'; import { setupMswServer } from './mockApi'; import { grantUserRole } from './mocks'; diff --git a/public/app/features/alerting/unified/components/contact-points/ContactPoints.test.tsx b/public/app/features/alerting/unified/components/contact-points/ContactPoints.test.tsx index 1e6f0344865..87f1ebfff59 100644 --- a/public/app/features/alerting/unified/components/contact-points/ContactPoints.test.tsx +++ b/public/app/features/alerting/unified/components/contact-points/ContactPoints.test.tsx @@ -17,11 +17,11 @@ import { DataSourceType, GRAFANA_RULES_SOURCE_NAME } from '../../utils/datasourc import { ContactPoint } from './ContactPoint'; import { ContactPointsPageContents } from './ContactPoints'; -import setupMimirFlavoredServer from './__mocks__/mimirFlavoredServer'; +import { RECEIVER_META_KEY } from './constants'; +import setupMimirFlavoredServer from './mocks/mimirFlavoredServer'; import setupVanillaAlertmanagerFlavoredServer, { VANILLA_ALERTMANAGER_DATASOURCE_UID, -} from './__mocks__/vanillaAlertmanagerServer'; -import { RECEIVER_META_KEY } from './constants'; +} from './mocks/vanillaAlertmanagerServer'; import { ContactPointWithMetadata, ReceiverConfigWithMetadata, RouteReference } from './utils'; /** diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.mimir.config.mock.json b/public/app/features/alerting/unified/components/contact-points/mocks/alertmanager.mimir.config.mock.json similarity index 100% rename from public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.mimir.config.mock.json rename to public/app/features/alerting/unified/components/contact-points/mocks/alertmanager.mimir.config.mock.json diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.vanilla.mock.json b/public/app/features/alerting/unified/components/contact-points/mocks/alertmanager.vanilla.mock.json similarity index 100% rename from public/app/features/alerting/unified/components/contact-points/__mocks__/alertmanager.vanilla.mock.json rename to public/app/features/alerting/unified/components/contact-points/mocks/alertmanager.vanilla.mock.json diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/mimirFlavoredServer.ts b/public/app/features/alerting/unified/components/contact-points/mocks/mimirFlavoredServer.ts similarity index 100% rename from public/app/features/alerting/unified/components/contact-points/__mocks__/mimirFlavoredServer.ts rename to public/app/features/alerting/unified/components/contact-points/mocks/mimirFlavoredServer.ts diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/receivers.mock.json b/public/app/features/alerting/unified/components/contact-points/mocks/receivers.mock.json similarity index 100% rename from public/app/features/alerting/unified/components/contact-points/__mocks__/receivers.mock.json rename to public/app/features/alerting/unified/components/contact-points/mocks/receivers.mock.json diff --git a/public/app/features/alerting/unified/components/contact-points/__mocks__/vanillaAlertmanagerServer.ts b/public/app/features/alerting/unified/components/contact-points/mocks/vanillaAlertmanagerServer.ts similarity index 100% rename from public/app/features/alerting/unified/components/contact-points/__mocks__/vanillaAlertmanagerServer.ts rename to public/app/features/alerting/unified/components/contact-points/mocks/vanillaAlertmanagerServer.ts diff --git a/public/app/features/alerting/unified/components/settings/AlertmanagerConfig.test.tsx b/public/app/features/alerting/unified/components/settings/AlertmanagerConfig.test.tsx index 5c1592ca098..9a97530ac9a 100644 --- a/public/app/features/alerting/unified/components/settings/AlertmanagerConfig.test.tsx +++ b/public/app/features/alerting/unified/components/settings/AlertmanagerConfig.test.tsx @@ -16,7 +16,7 @@ import { PROVISIONED_MIMIR_ALERTMANAGER_UID, mockDataSources, setupVanillaAlertmanagerServer, -} from './__mocks__/server'; +} from './mocks/server'; const renderConfiguration = ( alertManagerSourceName: string, diff --git a/public/app/features/alerting/unified/components/settings/__mocks__/api/alertmanager/grafana/config/api/v1/alerts.json b/public/app/features/alerting/unified/components/settings/mocks/api/alertmanager/grafana/config/api/v1/alerts.json similarity index 100% rename from public/app/features/alerting/unified/components/settings/__mocks__/api/alertmanager/grafana/config/api/v1/alerts.json rename to public/app/features/alerting/unified/components/settings/mocks/api/alertmanager/grafana/config/api/v1/alerts.json diff --git a/public/app/features/alerting/unified/components/settings/__mocks__/api/alertmanager/grafana/config/history.json b/public/app/features/alerting/unified/components/settings/mocks/api/alertmanager/grafana/config/history.json similarity index 100% rename from public/app/features/alerting/unified/components/settings/__mocks__/api/alertmanager/grafana/config/history.json rename to public/app/features/alerting/unified/components/settings/mocks/api/alertmanager/grafana/config/history.json diff --git a/public/app/features/alerting/unified/components/settings/__mocks__/api/alertmanager/provisioned/config/api/v1/alerts.json b/public/app/features/alerting/unified/components/settings/mocks/api/alertmanager/provisioned/config/api/v1/alerts.json similarity index 100% rename from public/app/features/alerting/unified/components/settings/__mocks__/api/alertmanager/provisioned/config/api/v1/alerts.json rename to public/app/features/alerting/unified/components/settings/mocks/api/alertmanager/provisioned/config/api/v1/alerts.json diff --git a/public/app/features/alerting/unified/components/settings/__mocks__/api/alertmanager/vanilla prometheus/api/v2/status.json b/public/app/features/alerting/unified/components/settings/mocks/api/alertmanager/vanilla prometheus/api/v2/status.json similarity index 100% rename from public/app/features/alerting/unified/components/settings/__mocks__/api/alertmanager/vanilla prometheus/api/v2/status.json rename to public/app/features/alerting/unified/components/settings/mocks/api/alertmanager/vanilla prometheus/api/v2/status.json diff --git a/public/app/features/alerting/unified/components/settings/__mocks__/api/datasources.json b/public/app/features/alerting/unified/components/settings/mocks/api/datasources.json similarity index 100% rename from public/app/features/alerting/unified/components/settings/__mocks__/api/datasources.json rename to public/app/features/alerting/unified/components/settings/mocks/api/datasources.json diff --git a/public/app/features/alerting/unified/components/settings/__mocks__/api/v1/ngalert/admin_config.json b/public/app/features/alerting/unified/components/settings/mocks/api/v1/ngalert/admin_config.json similarity index 100% rename from public/app/features/alerting/unified/components/settings/__mocks__/api/v1/ngalert/admin_config.json rename to public/app/features/alerting/unified/components/settings/mocks/api/v1/ngalert/admin_config.json diff --git a/public/app/features/alerting/unified/components/settings/__mocks__/api/v1/ngalert/alertmanagers.json b/public/app/features/alerting/unified/components/settings/mocks/api/v1/ngalert/alertmanagers.json similarity index 100% rename from public/app/features/alerting/unified/components/settings/__mocks__/api/v1/ngalert/alertmanagers.json rename to public/app/features/alerting/unified/components/settings/mocks/api/v1/ngalert/alertmanagers.json diff --git a/public/app/features/alerting/unified/components/settings/__mocks__/server.ts b/public/app/features/alerting/unified/components/settings/mocks/server.ts similarity index 100% rename from public/app/features/alerting/unified/components/settings/__mocks__/server.ts rename to public/app/features/alerting/unified/components/settings/mocks/server.ts diff --git a/public/app/features/alerting/unified/mocks/server/handlers/alertmanagers.ts b/public/app/features/alerting/unified/mocks/server/handlers/alertmanagers.ts index c02659dcab5..f8259260a01 100644 --- a/public/app/features/alerting/unified/mocks/server/handlers/alertmanagers.ts +++ b/public/app/features/alerting/unified/mocks/server/handlers/alertmanagers.ts @@ -1,7 +1,7 @@ import { HttpResponse, JsonBodyType, StrictResponse, http } from 'msw'; import { TemplatesTestPayload } from 'app/features/alerting/unified/api/templateApi'; -import receiversMock from 'app/features/alerting/unified/components/contact-points/__mocks__/receivers.mock.json'; +import receiversMock from 'app/features/alerting/unified/components/contact-points/mocks/receivers.mock.json'; import { MOCK_SILENCE_ID_EXISTING, mockAlertmanagerAlert } from 'app/features/alerting/unified/mocks'; import { defaultGrafanaAlertingConfigurationStatusResponse } from 'app/features/alerting/unified/mocks/alertmanagerApi'; import { diff --git a/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts b/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts index 30fb633dbc4..35f46b98984 100644 --- a/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts +++ b/public/app/features/alerting/unified/state/AlertingQueryRunner.test.ts @@ -20,7 +20,7 @@ import { BackendSrv } from 'app/core/services/backend_srv'; import { EXTERNAL_VANILLA_ALERTMANAGER_UID, mockDataSources, -} from 'app/features/alerting/unified/components/settings/__mocks__/server'; +} from 'app/features/alerting/unified/components/settings/mocks/server'; import { setupMswServer } from 'app/features/alerting/unified/mockApi'; import { setupDataSources } from 'app/features/alerting/unified/testSetup/datasources'; import { ExpressionQuery, ExpressionQueryType } from 'app/features/expressions/types'; diff --git a/public/app/features/annotations/executeAnnotationQuery.test.ts b/public/app/features/annotations/executeAnnotationQuery.test.ts index 65526e1d549..f91185c44d2 100644 --- a/public/app/features/annotations/executeAnnotationQuery.test.ts +++ b/public/app/features/annotations/executeAnnotationQuery.test.ts @@ -2,7 +2,7 @@ import { DataSourceApi, dateTime, DataQuery } from '@grafana/data'; import { PanelModel } from '../dashboard/state/PanelModel'; import { createDashboardModelFixture } from '../dashboard/state/__fixtures__/dashboardFixtures'; -import { TestQuery, getMockDataSource } from '../query/state/__mocks__/mockDataSource'; +import { TestQuery, getMockDataSource } from '../query/state/mocks/mockDataSource'; import { executeAnnotationQuery } from './executeAnnotationQuery'; import { AnnotationQueryOptions } from './types'; diff --git a/public/app/features/connections/Connections.test.tsx b/public/app/features/connections/Connections.test.tsx index 42995857cde..16f611e585d 100644 --- a/public/app/features/connections/Connections.test.tsx +++ b/public/app/features/connections/Connections.test.tsx @@ -3,15 +3,15 @@ import { Route, Routes } from 'react-router-dom-v5-compat'; import { render } from 'test/test-utils'; import { contextSrv } from 'app/core/services/context_srv'; -import { getMockDataSources } from 'app/features/datasources/__mocks__'; import * as api from 'app/features/datasources/api'; +import { getMockDataSources } from 'app/features/datasources/mocks/dataSourcesMocks'; import { configureStore } from 'app/store/configureStore'; -import { getPluginsStateMock } from '../plugins/admin/__mocks__'; +import { getPluginsStateMock } from '../plugins/admin/mocks/mockHelpers'; import Connections from './Connections'; -import { navIndex } from './__mocks__/store.navIndex.mock'; import { ROUTES } from './constants'; +import { navIndex } from './mocks/store.navIndex.mock'; jest.mock('app/core/services/context_srv'); jest.mock('app/features/datasources/api'); diff --git a/public/app/features/connections/__mocks__/store.navIndex.mock.ts b/public/app/features/connections/mocks/store.navIndex.mock.ts similarity index 100% rename from public/app/features/connections/__mocks__/store.navIndex.mock.ts rename to public/app/features/connections/mocks/store.navIndex.mock.ts diff --git a/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx b/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx index 4267b7631d9..0215b463ca9 100644 --- a/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx +++ b/public/app/features/connections/tabs/ConnectData/ConnectData.test.tsx @@ -5,7 +5,7 @@ import { TestProvider } from 'test/helpers/TestProvider'; import { PluginType } from '@grafana/data'; import { locationService } from '@grafana/runtime'; import { contextSrv } from 'app/core/core'; -import { getCatalogPluginMock, getPluginsStateMock } from 'app/features/plugins/admin/__mocks__'; +import { getCatalogPluginMock, getPluginsStateMock } from 'app/features/plugins/admin/mocks/mockHelpers'; import { CatalogPlugin } from 'app/features/plugins/admin/types'; import { AccessControlAction } from 'app/types'; diff --git a/public/app/features/correlations/CorrelationsPage.test.tsx b/public/app/features/correlations/CorrelationsPage.test.tsx index 3e88718ecbf..a57b901a2e4 100644 --- a/public/app/features/correlations/CorrelationsPage.test.tsx +++ b/public/app/features/correlations/CorrelationsPage.test.tsx @@ -31,7 +31,7 @@ import { createRemoveCorrelationResponse, createUpdateCorrelationResponse, MockDataSourceSrv, -} from './__mocks__/useCorrelations.mocks'; +} from './mocks/useCorrelations.mocks'; import { Correlation, CreateCorrelationParams, OmitUnion } from './types'; // Set app events up, otherwise plugin modules will fail to load diff --git a/public/app/features/correlations/__mocks__/useCorrelations.mocks.ts b/public/app/features/correlations/mocks/useCorrelations.mocks.ts similarity index 100% rename from public/app/features/correlations/__mocks__/useCorrelations.mocks.ts rename to public/app/features/correlations/mocks/useCorrelations.mocks.ts diff --git a/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx b/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx index 97c3b1926d9..b2776dc9414 100644 --- a/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx +++ b/public/app/features/dashboard-scene/pages/DashboardScenePage.test.tsx @@ -11,7 +11,7 @@ import { selectors } from '@grafana/e2e-selectors'; import { LocationServiceProvider, config, locationService, setPluginImportUtils } from '@grafana/runtime'; import { VizPanel } from '@grafana/scenes'; import { Dashboard } from '@grafana/schema'; -import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps'; +import { getRouteComponentProps } from 'app/core/navigation/mocks/routeProps'; import { GrafanaRouteComponentProps } from 'app/core/navigation/types'; import store from 'app/core/store'; import { DashboardLoaderSrv, setDashboardLoaderSrv } from 'app/features/dashboard/services/DashboardLoaderSrv'; diff --git a/public/app/features/dashboard-scene/pages/PublicDashboardScenePage.test.tsx b/public/app/features/dashboard-scene/pages/PublicDashboardScenePage.test.tsx index 7d1371e2cdd..24ce8398e14 100644 --- a/public/app/features/dashboard-scene/pages/PublicDashboardScenePage.test.tsx +++ b/public/app/features/dashboard-scene/pages/PublicDashboardScenePage.test.tsx @@ -8,7 +8,7 @@ import { getPanelPlugin } from '@grafana/data/test'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors'; import { config, setPluginImportUtils, setRunRequest } from '@grafana/runtime'; import { Dashboard } from '@grafana/schema'; -import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps'; +import { getRouteComponentProps } from 'app/core/navigation/mocks/routeProps'; import { DashboardRoutes } from 'app/types/dashboard'; import { setupLoadDashboardMock, setupLoadDashboardMockReject } from '../utils/test-utils'; diff --git a/public/app/features/dashboard-scene/settings/version-history/HistorySrv.test.ts b/public/app/features/dashboard-scene/settings/version-history/HistorySrv.test.ts index 84a737d5a1d..4e4afe5d428 100644 --- a/public/app/features/dashboard-scene/settings/version-history/HistorySrv.test.ts +++ b/public/app/features/dashboard-scene/settings/version-history/HistorySrv.test.ts @@ -1,7 +1,7 @@ import { createDashboardModelFixture } from 'app/features/dashboard/state/__fixtures__/dashboardFixtures'; import { HistorySrv } from './HistorySrv'; -import { restore, versions } from './__mocks__/dashboardHistoryMocks'; +import { restore, versions } from './mocks/dashboardHistoryMocks'; const getMock = jest.fn().mockResolvedValue({}); const postMock = jest.fn().mockResolvedValue({}); diff --git a/public/app/features/dashboard-scene/settings/version-history/__mocks__/dashboardHistoryMocks.ts b/public/app/features/dashboard-scene/settings/version-history/mocks/dashboardHistoryMocks.ts similarity index 100% rename from public/app/features/dashboard-scene/settings/version-history/__mocks__/dashboardHistoryMocks.ts rename to public/app/features/dashboard-scene/settings/version-history/mocks/dashboardHistoryMocks.ts diff --git a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx index f311d32d3f1..6fc2e3c5334 100644 --- a/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx +++ b/public/app/features/dashboard/components/DashboardSettings/VersionsSettings.test.tsx @@ -8,7 +8,7 @@ import { historySrv } from 'app/features/dashboard-scene/settings/version-histor import { createDashboardModelFixture } from '../../state/__fixtures__/dashboardFixtures'; import { VersionsSettings, VERSIONS_FETCH_LIMIT } from './VersionsSettings'; -import { versions, diffs } from './__mocks__/versions'; +import { versions, diffs } from './mocks/versions'; jest.mock('app/features/dashboard-scene/settings/version-history/HistorySrv'); diff --git a/public/app/features/dashboard/components/DashboardSettings/__mocks__/versions.ts b/public/app/features/dashboard/components/DashboardSettings/mocks/versions.ts similarity index 100% rename from public/app/features/dashboard/components/DashboardSettings/__mocks__/versions.ts rename to public/app/features/dashboard/components/DashboardSettings/mocks/versions.ts diff --git a/public/app/features/dashboard/containers/DashboardPage.test.tsx b/public/app/features/dashboard/containers/DashboardPage.test.tsx index 7eec5ebcb04..19e245cf03b 100644 --- a/public/app/features/dashboard/containers/DashboardPage.test.tsx +++ b/public/app/features/dashboard/containers/DashboardPage.test.tsx @@ -11,7 +11,7 @@ import { config, setDataSourceSrv } from '@grafana/runtime'; import { Dashboard } from '@grafana/schema'; import { notifyApp } from 'app/core/actions'; import { AppChrome } from 'app/core/components/AppChrome/AppChrome'; -import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps'; +import { getRouteComponentProps } from 'app/core/navigation/mocks/routeProps'; import { RouteDescriptor } from 'app/core/navigation/types'; import { HOME_NAV_ID } from 'app/core/reducers/navModel'; import { DashboardInitPhase, DashboardMeta, DashboardRoutes } from 'app/types'; diff --git a/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx b/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx index b7e9e3ecf2e..6b3ebdcbee8 100644 --- a/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx +++ b/public/app/features/dashboard/containers/PublicDashboardPage.test.tsx @@ -7,7 +7,7 @@ import { render } from 'test/test-utils'; import { selectors as e2eSelectors } from '@grafana/e2e-selectors/src'; import { Dashboard, DashboardCursorSync, FieldConfigSource, Panel, ThresholdsMode } from '@grafana/schema/src'; -import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps'; +import { getRouteComponentProps } from 'app/core/navigation/mocks/routeProps'; import * as appTypes from 'app/types'; import { DashboardInitPhase, DashboardMeta, DashboardRoutes } from 'app/types'; diff --git a/public/app/features/dashboard/containers/SoloPanelPage.test.tsx b/public/app/features/dashboard/containers/SoloPanelPage.test.tsx index a1dfe58b99d..2a159054622 100644 --- a/public/app/features/dashboard/containers/SoloPanelPage.test.tsx +++ b/public/app/features/dashboard/containers/SoloPanelPage.test.tsx @@ -7,7 +7,7 @@ import { GrafanaContext } from 'app/core/context/GrafanaContext'; import { RouteDescriptor } from 'app/core/navigation/types'; import { DashboardMeta, DashboardRoutes } from 'app/types'; -import { getRouteComponentProps } from '../../../core/navigation/__mocks__/routeProps'; +import { getRouteComponentProps } from '../../../core/navigation/mocks/routeProps'; import { Props as DashboardPanelProps } from '../dashgrid/DashboardPanel'; import { DashboardModel } from '../state/DashboardModel'; import { createDashboardModelFixture } from '../state/__fixtures__/dashboardFixtures'; diff --git a/public/app/features/datasources/__mocks__/index.ts b/public/app/features/datasources/__mocks__/index.ts deleted file mode 100644 index 0485099d6c4..00000000000 --- a/public/app/features/datasources/__mocks__/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './dataSourcesMocks'; -export * from './store.navIndex.mock'; diff --git a/public/app/features/datasources/components/DataSourceDashboards.test.tsx b/public/app/features/datasources/components/DataSourceDashboards.test.tsx index 38e9a751267..8c5df1a680a 100644 --- a/public/app/features/datasources/components/DataSourceDashboards.test.tsx +++ b/public/app/features/datasources/components/DataSourceDashboards.test.tsx @@ -3,7 +3,7 @@ import { Provider } from 'react-redux'; import { configureStore } from 'app/store/configureStore'; -import { getMockDashboard } from '../__mocks__'; +import { getMockDashboard } from '../mocks/dataSourcesMocks'; import { DataSourceDashboardsView, ViewProps } from './DataSourceDashboards'; diff --git a/public/app/features/datasources/components/DataSourceTestingStatus.test.tsx b/public/app/features/datasources/components/DataSourceTestingStatus.test.tsx index 809e480b927..1c42b13b080 100644 --- a/public/app/features/datasources/components/DataSourceTestingStatus.test.tsx +++ b/public/app/features/datasources/components/DataSourceTestingStatus.test.tsx @@ -1,6 +1,6 @@ import { render, screen } from '@testing-library/react'; -import { getMockDataSource } from '../__mocks__'; +import { getMockDataSource } from '../mocks/dataSourcesMocks'; import { DataSourceTestingStatus, Props } from './DataSourceTestingStatus'; diff --git a/public/app/features/datasources/components/DataSourcesList.test.tsx b/public/app/features/datasources/components/DataSourcesList.test.tsx index aff0285ecbe..d495695d0a7 100644 --- a/public/app/features/datasources/components/DataSourcesList.test.tsx +++ b/public/app/features/datasources/components/DataSourcesList.test.tsx @@ -1,7 +1,7 @@ import { screen } from '@testing-library/react'; import { render } from 'test/test-utils'; -import { getMockDataSources } from '../__mocks__'; +import { getMockDataSources } from '../mocks/dataSourcesMocks'; import { DataSourcesListView } from './DataSourcesList'; diff --git a/public/app/features/datasources/components/EditDataSource.test.tsx b/public/app/features/datasources/components/EditDataSource.test.tsx index 6a90180c43b..3631edc2e0a 100644 --- a/public/app/features/datasources/components/EditDataSource.test.tsx +++ b/public/app/features/datasources/components/EditDataSource.test.tsx @@ -7,7 +7,7 @@ import { setPluginComponentsHook } from '@grafana/runtime'; import { createComponentWithMeta } from 'app/features/plugins/extensions/usePluginComponents'; import { configureStore } from 'app/store/configureStore'; -import { getMockDataSource, getMockDataSourceMeta, getMockDataSourceSettingsState } from '../__mocks__'; +import { getMockDataSource, getMockDataSourceMeta, getMockDataSourceSettingsState } from '../mocks/dataSourcesMocks'; import { missingRightsMessage } from './DataSourceMissingRightsMessage'; import { readOnlyMessage } from './DataSourceReadOnlyMessage'; diff --git a/public/app/features/datasources/__mocks__/dataSourcesMocks.ts b/public/app/features/datasources/mocks/dataSourcesMocks.ts similarity index 100% rename from public/app/features/datasources/__mocks__/dataSourcesMocks.ts rename to public/app/features/datasources/mocks/dataSourcesMocks.ts diff --git a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts b/public/app/features/datasources/mocks/store.navIndex.mock.ts similarity index 100% rename from public/app/features/datasources/__mocks__/store.navIndex.mock.ts rename to public/app/features/datasources/mocks/store.navIndex.mock.ts diff --git a/public/app/features/datasources/state/actions.test.ts b/public/app/features/datasources/state/actions.test.ts index 29be5fa5dba..f3b99a49bbc 100644 --- a/public/app/features/datasources/state/actions.test.ts +++ b/public/app/features/datasources/state/actions.test.ts @@ -6,9 +6,9 @@ import { appEvents } from 'app/core/core'; import { getBackendSrv } from 'app/core/services/backend_srv'; import { ThunkResult, ThunkDispatch } from 'app/types'; -import { getMockDataSource } from '../__mocks__'; import * as api from '../api'; import { DATASOURCES_ROUTES } from '../constants'; +import { getMockDataSource } from '../mocks/dataSourcesMocks'; import { trackDataSourceCreated, trackDataSourceTested } from '../tracking'; import { GenericDataSourcePlugin } from '../types'; diff --git a/public/app/features/datasources/state/reducers.test.ts b/public/app/features/datasources/state/reducers.test.ts index ff8c49a4bbe..85f6455e837 100644 --- a/public/app/features/datasources/state/reducers.test.ts +++ b/public/app/features/datasources/state/reducers.test.ts @@ -3,7 +3,7 @@ import { reducerTester } from 'test/core/redux/reducerTester'; import { PluginMeta, PluginMetaInfo, PluginType, LayoutModes } from '@grafana/data'; import { DataSourceSettingsState, DataSourcesState } from 'app/types'; -import { getMockDataSource, getMockDataSources } from '../__mocks__'; +import { getMockDataSource, getMockDataSources } from '../mocks/dataSourcesMocks'; import { GenericDataSourcePlugin } from '../types'; import { diff --git a/public/app/features/explore/Logs/LiveLogs.test.tsx b/public/app/features/explore/Logs/LiveLogs.test.tsx index 83fb5e13fb8..471c8ba1c65 100644 --- a/public/app/features/explore/Logs/LiveLogs.test.tsx +++ b/public/app/features/explore/Logs/LiveLogs.test.tsx @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import { LogRowModel } from '@grafana/data'; -import { makeLogs } from '../__mocks__/makeLogs'; +import { makeLogs } from '../mocks/makeLogs'; import { LiveLogsWithTheme } from './LiveLogs'; diff --git a/public/app/features/explore/Logs/PopoverMenu.test.tsx b/public/app/features/explore/Logs/PopoverMenu.test.tsx index 8ffa99a375c..4d94dca72a6 100644 --- a/public/app/features/explore/Logs/PopoverMenu.test.tsx +++ b/public/app/features/explore/Logs/PopoverMenu.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { createLogRow } from '../../logs/components/__mocks__/logRow'; +import { createLogRow } from '../../logs/components/mocks/logRow'; import { PopoverMenu } from './PopoverMenu'; diff --git a/public/app/features/explore/__mocks__/data.ts b/public/app/features/explore/mocks/data.ts similarity index 100% rename from public/app/features/explore/__mocks__/data.ts rename to public/app/features/explore/mocks/data.ts diff --git a/public/app/features/explore/__mocks__/makeLogs.ts b/public/app/features/explore/mocks/makeLogs.ts similarity index 100% rename from public/app/features/explore/__mocks__/makeLogs.ts rename to public/app/features/explore/mocks/makeLogs.ts diff --git a/public/app/features/explore/__mocks__/mockData.ts b/public/app/features/explore/mocks/mockData.ts similarity index 100% rename from public/app/features/explore/__mocks__/mockData.ts rename to public/app/features/explore/mocks/mockData.ts diff --git a/public/app/features/explore/state/query.test.ts b/public/app/features/explore/state/query.test.ts index 2d4b4e7375e..8a4f3b96be0 100644 --- a/public/app/features/explore/state/query.test.ts +++ b/public/app/features/explore/state/query.test.ts @@ -24,7 +24,7 @@ import { reducerTester } from '../../../../test/core/redux/reducerTester'; import * as richHistory from '../../../core/utils/richHistory'; import { configureStore } from '../../../store/configureStore'; import { setTimeSrv, TimeSrv } from '../../dashboard/services/TimeSrv'; -import { makeLogs } from '../__mocks__/makeLogs'; +import { makeLogs } from '../mocks/makeLogs'; import { supplementaryQueryTypes } from '../utils/supplementaryQueries'; import { saveCorrelationsAction } from './explorePane'; diff --git a/public/app/features/explore/utils/supplementaryQueries.test.ts b/public/app/features/explore/utils/supplementaryQueries.test.ts index 6c231f4d206..8d274f162b1 100644 --- a/public/app/features/explore/utils/supplementaryQueries.test.ts +++ b/public/app/features/explore/utils/supplementaryQueries.test.ts @@ -21,7 +21,7 @@ import { DataQuery } from '@grafana/schema'; import { MockDataSourceApi } from '../../../../test/mocks/datasource_srv'; import { MockDataQueryRequest, MockQuery } from '../../../../test/mocks/query'; import { ExplorePanelData } from '../../../types'; -import { mockExplorePanelData } from '../__mocks__/data'; +import { mockExplorePanelData } from '../mocks/data'; import { getSupplementaryQueryProvider } from './supplementaryQueries'; diff --git a/public/app/features/explore/utils/supplementaryQueries_legacy.test.ts b/public/app/features/explore/utils/supplementaryQueries_legacy.test.ts index fbb79119bf8..6d6735a12c5 100644 --- a/public/app/features/explore/utils/supplementaryQueries_legacy.test.ts +++ b/public/app/features/explore/utils/supplementaryQueries_legacy.test.ts @@ -26,7 +26,7 @@ import { DataQuery } from '@grafana/schema'; import { MockDataSourceApi } from '../../../../test/mocks/datasource_srv'; import { MockDataQueryRequest, MockQuery } from '../../../../test/mocks/query'; import { ExplorePanelData } from '../../../types'; -import { mockExplorePanelData } from '../__mocks__/data'; +import { mockExplorePanelData } from '../mocks/data'; import { getSupplementaryQueryProvider } from './supplementaryQueries'; diff --git a/public/app/features/invites/InviteesTable.test.tsx b/public/app/features/invites/InviteesTable.test.tsx index 527c6f662be..262d2f1061c 100644 --- a/public/app/features/invites/InviteesTable.test.tsx +++ b/public/app/features/invites/InviteesTable.test.tsx @@ -3,7 +3,7 @@ import { Provider } from 'react-redux'; import { configureStore } from 'app/store/configureStore'; -import { getMockInvitees } from '../users/__mocks__/userMocks'; +import { getMockInvitees } from '../users/mocks/userMocks'; import InviteesTable from './InviteesTable'; diff --git a/public/app/features/invites/state/reducers.test.ts b/public/app/features/invites/state/reducers.test.ts index 9ac92e88f68..ace0ce019e9 100644 --- a/public/app/features/invites/state/reducers.test.ts +++ b/public/app/features/invites/state/reducers.test.ts @@ -1,6 +1,6 @@ import { keyBy } from 'lodash'; -import { getMockInvitees } from 'app/features/users/__mocks__/userMocks'; +import { getMockInvitees } from 'app/features/users/mocks/userMocks'; import { reducerTester } from '../../../../test/core/redux/reducerTester'; diff --git a/public/app/features/logs/components/InfiniteScroll.test.tsx b/public/app/features/logs/components/InfiniteScroll.test.tsx index 90b10988e73..62cdecb329c 100644 --- a/public/app/features/logs/components/InfiniteScroll.test.tsx +++ b/public/app/features/logs/components/InfiniteScroll.test.tsx @@ -7,7 +7,7 @@ import { config } from '@grafana/runtime'; import { LogsSortOrder } from '@grafana/schema'; import { InfiniteScroll, Props, SCROLLING_THRESHOLD } from './InfiniteScroll'; -import { createLogRow } from './__mocks__/logRow'; +import { createLogRow } from './mocks/logRow'; const defaultTz = 'browser'; diff --git a/public/app/features/logs/components/LogDetails.test.tsx b/public/app/features/logs/components/LogDetails.test.tsx index 1ee66deb632..f8e7b6ff3bb 100644 --- a/public/app/features/logs/components/LogDetails.test.tsx +++ b/public/app/features/logs/components/LogDetails.test.tsx @@ -17,8 +17,8 @@ import { setPluginLinksHook } from '@grafana/runtime'; import { LogDetails, Props } from './LogDetails'; import { LOG_LINE_BODY_FIELD_NAME } from './LogDetailsBody'; -import { createLogRow } from './__mocks__/logRow'; import { getLogRowStyles } from './getLogRowStyles'; +import { createLogRow } from './mocks/logRow'; jest.mock('@grafana/runtime', () => { return { diff --git a/public/app/features/logs/components/LogDetailsRow.test.tsx b/public/app/features/logs/components/LogDetailsRow.test.tsx index 4463adde1f7..fe0b64bd749 100644 --- a/public/app/features/logs/components/LogDetailsRow.test.tsx +++ b/public/app/features/logs/components/LogDetailsRow.test.tsx @@ -4,7 +4,7 @@ import { ComponentProps } from 'react'; import { Field, CoreApp, FieldType, LinkModel } from '@grafana/data'; import { LogDetailsRow } from './LogDetailsRow'; -import { createLogRow } from './__mocks__/logRow'; +import { createLogRow } from './mocks/logRow'; type Props = ComponentProps; diff --git a/public/app/features/logs/components/LogRow.test.tsx b/public/app/features/logs/components/LogRow.test.tsx index dc28d2ee311..3760ebf4b1f 100644 --- a/public/app/features/logs/components/LogRow.test.tsx +++ b/public/app/features/logs/components/LogRow.test.tsx @@ -6,8 +6,8 @@ import tinycolor from 'tinycolor2'; import { CoreApp, createTheme, LogLevel, LogRowModel } from '@grafana/data'; import { LogRow } from './LogRow'; -import { createLogRow } from './__mocks__/logRow'; import { getLogRowStyles } from './getLogRowStyles'; +import { createLogRow } from './mocks/logRow'; const reportInteraction = jest.fn(); jest.mock('@grafana/runtime', () => ({ diff --git a/public/app/features/logs/components/LogRowMessage.test.tsx b/public/app/features/logs/components/LogRowMessage.test.tsx index 80ad6abf91d..8d684bfaf90 100644 --- a/public/app/features/logs/components/LogRowMessage.test.tsx +++ b/public/app/features/logs/components/LogRowMessage.test.tsx @@ -6,8 +6,8 @@ import { CoreApp, createTheme, LogLevel, LogRowModel } from '@grafana/data'; import { IconButton } from '@grafana/ui'; import { LogRowMessage, MAX_CHARACTERS } from './LogRowMessage'; -import { createLogRow } from './__mocks__/logRow'; import { getLogRowStyles } from './getLogRowStyles'; +import { createLogRow } from './mocks/logRow'; const setup = (propOverrides?: Partial>, rowOverrides?: Partial) => { const theme = createTheme(); diff --git a/public/app/features/logs/components/LogRowMessageDisplayedFields.test.tsx b/public/app/features/logs/components/LogRowMessageDisplayedFields.test.tsx index 4e0bdfccf4a..1c9248a6650 100644 --- a/public/app/features/logs/components/LogRowMessageDisplayedFields.test.tsx +++ b/public/app/features/logs/components/LogRowMessageDisplayedFields.test.tsx @@ -6,8 +6,8 @@ import { IconButton } from '@grafana/ui'; import { LOG_LINE_BODY_FIELD_NAME } from './LogDetailsBody'; import { LogRowMessageDisplayedFields, Props } from './LogRowMessageDisplayedFields'; -import { createLogRow } from './__mocks__/logRow'; import { getLogRowStyles } from './getLogRowStyles'; +import { createLogRow } from './mocks/logRow'; const setup = (propOverrides: Partial = {}, detectedFields = ['place', 'planet']) => { const theme = createTheme(); diff --git a/public/app/features/logs/components/LogRows.test.tsx b/public/app/features/logs/components/LogRows.test.tsx index 35d5cc4d9ea..a79ac2787c0 100644 --- a/public/app/features/logs/components/LogRows.test.tsx +++ b/public/app/features/logs/components/LogRows.test.tsx @@ -6,7 +6,7 @@ import { LogRowModel, LogsDedupStrategy, LogsSortOrder } from '@grafana/data'; import { disablePopoverMenu, enablePopoverMenu, isPopoverMenuDisabled } from '../utils'; import { LogRows, Props } from './LogRows'; -import { createLogRow } from './__mocks__/logRow'; +import { createLogRow } from './mocks/logRow'; jest.mock('../utils', () => ({ ...jest.requireActual('../utils'), diff --git a/public/app/features/logs/components/logParser.test.ts b/public/app/features/logs/components/logParser.test.ts index 3ab9194d383..a132f75b642 100644 --- a/public/app/features/logs/components/logParser.test.ts +++ b/public/app/features/logs/components/logParser.test.ts @@ -3,8 +3,8 @@ import { mockTimeRange } from '@grafana/plugin-ui'; import { ExploreFieldLinkModel, getFieldLinksForExplore } from 'app/features/explore/utils/links'; import { GetFieldLinksFn } from 'app/plugins/panel/logs/types'; -import { createLogRow } from './__mocks__/logRow'; import { getAllFields, createLogLineLinks, FieldDef, getDataframeFields } from './logParser'; +import { createLogRow } from './mocks/logRow'; describe('logParser', () => { describe('getAllFields', () => { diff --git a/public/app/features/logs/components/__mocks__/logRow.ts b/public/app/features/logs/components/mocks/logRow.ts similarity index 100% rename from public/app/features/logs/components/__mocks__/logRow.ts rename to public/app/features/logs/components/mocks/logRow.ts diff --git a/public/app/features/logs/components/panel/LogLine.test.tsx b/public/app/features/logs/components/panel/LogLine.test.tsx index bdbbf74b2f2..1a099f950e9 100644 --- a/public/app/features/logs/components/panel/LogLine.test.tsx +++ b/public/app/features/logs/components/panel/LogLine.test.tsx @@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'; import { CoreApp, createTheme, LogsDedupStrategy, LogsSortOrder } from '@grafana/data'; import { LOG_LINE_BODY_FIELD_NAME } from '../LogDetailsBody'; -import { createLogLine } from '../__mocks__/logRow'; +import { createLogLine } from '../mocks/logRow'; import { getGridTemplateColumns, getStyles, LogLine, Props } from './LogLine'; import { LogListFontSize } from './LogList'; diff --git a/public/app/features/logs/components/panel/LogLineMenu.test.tsx b/public/app/features/logs/components/panel/LogLineMenu.test.tsx index 0f8286f93ed..a447d81c62f 100644 --- a/public/app/features/logs/components/panel/LogLineMenu.test.tsx +++ b/public/app/features/logs/components/panel/LogLineMenu.test.tsx @@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event'; import { CoreApp, createTheme, LogsDedupStrategy, LogsSortOrder } from '@grafana/data'; -import { createLogLine } from '../__mocks__/logRow'; +import { createLogLine } from '../mocks/logRow'; import { getStyles } from './LogLine'; import { LogLineMenu, LogLineMenuCustomItem } from './LogLineMenu'; diff --git a/public/app/features/logs/components/panel/LogList.test.tsx b/public/app/features/logs/components/panel/LogList.test.tsx index e0cf493bd67..17eda97f4f6 100644 --- a/public/app/features/logs/components/panel/LogList.test.tsx +++ b/public/app/features/logs/components/panel/LogList.test.tsx @@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'; import { CoreApp, getDefaultTimeRange, LogRowModel, LogsDedupStrategy, LogsSortOrder } from '@grafana/data'; import { disablePopoverMenu, enablePopoverMenu, isPopoverMenuDisabled } from '../../utils'; -import { createLogRow } from '../__mocks__/logRow'; +import { createLogRow } from '../mocks/logRow'; import { LogList, Props } from './LogList'; diff --git a/public/app/features/logs/components/panel/LogListContext.test.tsx b/public/app/features/logs/components/panel/LogListContext.test.tsx index efe2281d8b9..7469e157452 100644 --- a/public/app/features/logs/components/panel/LogListContext.test.tsx +++ b/public/app/features/logs/components/panel/LogListContext.test.tsx @@ -1,7 +1,7 @@ import { renderHook } from '@testing-library/react'; import { ReactNode } from 'react'; -import { createLogLine } from '../__mocks__/logRow'; +import { createLogLine } from '../mocks/logRow'; import { useLogListContextData, diff --git a/public/app/features/logs/components/panel/LogListControls.test.tsx b/public/app/features/logs/components/panel/LogListControls.test.tsx index d33754400ff..f185bd51d7c 100644 --- a/public/app/features/logs/components/panel/LogListControls.test.tsx +++ b/public/app/features/logs/components/panel/LogListControls.test.tsx @@ -5,7 +5,7 @@ import { CoreApp, EventBusSrv, LogLevel, LogsDedupStrategy, LogsSortOrder } from import { config } from '@grafana/runtime'; import { downloadLogs } from '../../utils'; -import { createLogRow } from '../__mocks__/logRow'; +import { createLogRow } from '../mocks/logRow'; import { LogListFontSize } from './LogList'; import { LogListContextProvider } from './LogListContext'; diff --git a/public/app/features/logs/components/panel/grammar.test.ts b/public/app/features/logs/components/panel/grammar.test.ts index c50cafbbd4a..db218d73b5f 100644 --- a/public/app/features/logs/components/panel/grammar.test.ts +++ b/public/app/features/logs/components/panel/grammar.test.ts @@ -1,6 +1,6 @@ import Prism, { Token } from 'prismjs'; -import { createLogLine } from '../__mocks__/logRow'; +import { createLogLine } from '../mocks/logRow'; import { generateLogGrammar } from './grammar'; diff --git a/public/app/features/logs/components/panel/processing.test.ts b/public/app/features/logs/components/panel/processing.test.ts index 129d97451da..906d2f4a7c5 100644 --- a/public/app/features/logs/components/panel/processing.test.ts +++ b/public/app/features/logs/components/panel/processing.test.ts @@ -1,7 +1,7 @@ import { createTheme, Field, FieldType, LogLevel, LogRowModel, LogsSortOrder, toDataFrame } from '@grafana/data'; import { LOG_LINE_BODY_FIELD_NAME } from '../LogDetailsBody'; -import { createLogLine, createLogRow } from '../__mocks__/logRow'; +import { createLogLine, createLogRow } from '../mocks/logRow'; import { LogListFontSize } from './LogList'; import { LogListModel, preProcessLogs } from './processing'; diff --git a/public/app/features/logs/components/panel/virtualization.test.ts b/public/app/features/logs/components/panel/virtualization.test.ts index ff1789ad50e..75534d4e170 100644 --- a/public/app/features/logs/components/panel/virtualization.test.ts +++ b/public/app/features/logs/components/panel/virtualization.test.ts @@ -1,7 +1,7 @@ import { createTheme, LogsSortOrder } from '@grafana/data'; import { LOG_LINE_BODY_FIELD_NAME } from '../LogDetailsBody'; -import { createLogLine } from '../__mocks__/logRow'; +import { createLogLine } from '../mocks/logRow'; import { LogListModel, PreProcessOptions } from './processing'; import { LogLineVirtualization, getLogLineSize, DisplayOptions } from './virtualization'; diff --git a/public/app/features/logs/logsModel.test.ts b/public/app/features/logs/logsModel.test.ts index 5c62e8a07b4..f6221b6c6af 100644 --- a/public/app/features/logs/logsModel.test.ts +++ b/public/app/features/logs/logsModel.test.ts @@ -22,8 +22,8 @@ import { toDataFrame, } from '@grafana/data'; import { config } from '@grafana/runtime'; -import { getMockFrames } from 'app/plugins/datasource/loki/__mocks__/frames'; import { LokiQueryDirection } from 'app/plugins/datasource/loki/dataquery.gen'; +import { getMockFrames } from 'app/plugins/datasource/loki/mocks/frames'; import { MockObservableDataSourceApi } from '../../../test/mocks/datasource_srv'; diff --git a/public/app/features/logs/utils.test.ts b/public/app/features/logs/utils.test.ts index 37597bb7d12..f23a8ae9069 100644 --- a/public/app/features/logs/utils.test.ts +++ b/public/app/features/logs/utils.test.ts @@ -9,7 +9,7 @@ import { MutableDataFrame, DataFrame, } from '@grafana/data'; -import { getMockFrames } from 'app/plugins/datasource/loki/__mocks__/frames'; +import { getMockFrames } from 'app/plugins/datasource/loki/mocks/frames'; import { logSeriesToLogsModel } from './logsModel'; import { diff --git a/public/app/features/plugins/admin/__mocks__/index.ts b/public/app/features/plugins/admin/__mocks__/index.ts deleted file mode 100644 index 3568b5d2a70..00000000000 --- a/public/app/features/plugins/admin/__mocks__/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export { default as remotePluginMock } from './remotePlugin.mock'; -export { default as localPluginMock } from './localPlugin.mock'; -export * from './mockHelpers'; diff --git a/public/app/features/plugins/admin/components/ConnectionsTab.test.tsx b/public/app/features/plugins/admin/components/ConnectionsTab.test.tsx index 2aa6f6510db..710f90dc13b 100644 --- a/public/app/features/plugins/admin/components/ConnectionsTab.test.tsx +++ b/public/app/features/plugins/admin/components/ConnectionsTab.test.tsx @@ -4,10 +4,10 @@ import { render } from 'test/test-utils'; import { DataSourceSettings } from '@grafana/data'; import { config } from '@grafana/runtime'; import { ContextSrv, setContextSrv } from 'app/core/services/context_srv'; -import { getMockDataSources } from 'app/features/datasources/__mocks__'; +import { getMockDataSources } from 'app/features/datasources/mocks/dataSourcesMocks'; import { AccessControlAction } from 'app/types'; -import { datasourcePlugin } from '../__mocks__/catalogPlugin.mock'; +import { datasourcePlugin } from '../mocks/catalogPlugin.mock'; import ConnectionsTab, { ConnectionsList } from './ConnectionsTab'; diff --git a/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.test.tsx b/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.test.tsx index 44227cf3a24..dddca9112a3 100644 --- a/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.test.tsx +++ b/public/app/features/plugins/admin/components/InstallControls/InstallControlsButton.test.tsx @@ -5,7 +5,7 @@ import { PluginSignatureStatus } from '@grafana/data'; import { config } from '@grafana/runtime'; import { configureStore } from 'app/store/configureStore'; -import { getPluginsStateMock } from '../../__mocks__'; +import { getPluginsStateMock } from '../../mocks/mockHelpers'; import { CatalogPlugin, PluginStatus } from '../../types'; import { InstallControlsButton } from './InstallControlsButton'; diff --git a/public/app/features/plugins/admin/components/PluginDetailsBody.test.tsx b/public/app/features/plugins/admin/components/PluginDetailsBody.test.tsx index a24592c7d19..eb5e51d07b4 100644 --- a/public/app/features/plugins/admin/components/PluginDetailsBody.test.tsx +++ b/public/app/features/plugins/admin/components/PluginDetailsBody.test.tsx @@ -5,7 +5,7 @@ import { PluginType } from '@grafana/data'; import { config } from '@grafana/runtime'; import { configureStore } from 'app/store/configureStore'; -import { getCatalogPluginMock } from '../__mocks__'; +import { getCatalogPluginMock } from '../mocks/mockHelpers'; import { PluginTabIds } from '../types'; import { PluginDetailsBody } from './PluginDetailsBody'; diff --git a/public/app/features/plugins/admin/helpers.test.ts b/public/app/features/plugins/admin/helpers.test.ts index d59a1b80835..63dfb58a7a8 100644 --- a/public/app/features/plugins/admin/helpers.test.ts +++ b/public/app/features/plugins/admin/helpers.test.ts @@ -1,7 +1,6 @@ import { PluginErrorCode, PluginSignatureStatus, PluginSignatureType, PluginType } from '@grafana/data'; import { config } from '@grafana/runtime'; -import { getLocalPluginMock, getRemotePluginMock, getCatalogPluginMock } from './__mocks__'; import { mapToCatalogPlugin, mapRemoteToCatalog, @@ -15,6 +14,7 @@ import { isNonAngularVersion, isDisabledAngularPlugin, } from './helpers'; +import { getLocalPluginMock, getRemotePluginMock, getCatalogPluginMock } from './mocks/mockHelpers'; import { RemotePlugin, LocalPlugin, RemotePluginStatus, Version, CatalogPlugin } from './types'; describe('Plugins/Helpers', () => { diff --git a/public/app/features/plugins/admin/__mocks__/catalogPlugin.mock.ts b/public/app/features/plugins/admin/mocks/catalogPlugin.mock.ts similarity index 100% rename from public/app/features/plugins/admin/__mocks__/catalogPlugin.mock.ts rename to public/app/features/plugins/admin/mocks/catalogPlugin.mock.ts diff --git a/public/app/features/plugins/admin/__mocks__/localPlugin.mock.ts b/public/app/features/plugins/admin/mocks/localPlugin.mock.ts similarity index 100% rename from public/app/features/plugins/admin/__mocks__/localPlugin.mock.ts rename to public/app/features/plugins/admin/mocks/localPlugin.mock.ts diff --git a/public/app/features/plugins/admin/__mocks__/mockHelpers.ts b/public/app/features/plugins/admin/mocks/mockHelpers.ts similarity index 100% rename from public/app/features/plugins/admin/__mocks__/mockHelpers.ts rename to public/app/features/plugins/admin/mocks/mockHelpers.ts diff --git a/public/app/features/plugins/admin/__mocks__/remotePlugin.mock.ts b/public/app/features/plugins/admin/mocks/remotePlugin.mock.ts similarity index 100% rename from public/app/features/plugins/admin/__mocks__/remotePlugin.mock.ts rename to public/app/features/plugins/admin/mocks/remotePlugin.mock.ts diff --git a/public/app/features/plugins/admin/pages/Browse.test.tsx b/public/app/features/plugins/admin/pages/Browse.test.tsx index f270e4d0352..6b6d51a2bb1 100644 --- a/public/app/features/plugins/admin/pages/Browse.test.tsx +++ b/public/app/features/plugins/admin/pages/Browse.test.tsx @@ -5,7 +5,7 @@ import { PluginType, escapeStringForRegex } from '@grafana/data'; import { locationService } from '@grafana/runtime'; import { configureStore } from 'app/store/configureStore'; -import { getCatalogPluginMock, getPluginsStateMock } from '../__mocks__'; +import { getCatalogPluginMock, getPluginsStateMock } from '../mocks/mockHelpers'; import { fetchRemotePlugins } from '../state/actions'; import { CatalogPlugin, ReducerState, RequestStatus } from '../types'; diff --git a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx index fa787881864..42b83c85835 100644 --- a/public/app/features/plugins/admin/pages/PluginDetails.test.tsx +++ b/public/app/features/plugins/admin/pages/PluginDetails.test.tsx @@ -14,9 +14,9 @@ import { selectors } from '@grafana/e2e-selectors'; import { config } from '@grafana/runtime'; import { configureStore } from 'app/store/configureStore'; -import { mockPluginApis, getCatalogPluginMock, getPluginsStateMock, mockUserPermissions } from '../__mocks__'; import * as api from '../api'; import { usePluginConfig } from '../hooks/usePluginConfig'; +import { mockPluginApis, getCatalogPluginMock, getPluginsStateMock, mockUserPermissions } from '../mocks/mockHelpers'; import { fetchRemotePlugins } from '../state/actions'; import { CatalogPlugin, diff --git a/public/app/features/plugins/admin/state/selectors.test.ts b/public/app/features/plugins/admin/state/selectors.test.ts index 68d8ed23153..8749384e7a4 100644 --- a/public/app/features/plugins/admin/state/selectors.test.ts +++ b/public/app/features/plugins/admin/state/selectors.test.ts @@ -1,7 +1,7 @@ import { PluginType } from '@grafana/data'; import { configureStore } from 'app/store/configureStore'; -import { getCatalogPluginMock, getPluginsStateMock } from '../__mocks__'; +import { getCatalogPluginMock, getPluginsStateMock } from '../mocks/mockHelpers'; import { selectPlugins } from './selectors'; diff --git a/public/app/features/profile/UserProfileEditPage.test.tsx b/public/app/features/profile/UserProfileEditPage.test.tsx index 83152dee2e1..cc779f0e0a9 100644 --- a/public/app/features/profile/UserProfileEditPage.test.tsx +++ b/public/app/features/profile/UserProfileEditPage.test.tsx @@ -8,7 +8,7 @@ import { setPluginComponentsHook, usePluginComponents } from '@grafana/runtime'; import { backendSrv } from '../../core/services/backend_srv'; import { createComponentWithMeta } from '../plugins/extensions/usePluginComponents'; -import { getMockTeam } from '../teams/__mocks__/teamMocks'; +import { getMockTeam } from '../teams/mocks/teamMocks'; import { Props, UserProfileEditPage } from './UserProfileEditPage'; import { initialUserState } from './state/reducers'; diff --git a/public/app/features/profile/state/reducers.test.ts b/public/app/features/profile/state/reducers.test.ts index 352f824cc55..67ff64f9e56 100644 --- a/public/app/features/profile/state/reducers.test.ts +++ b/public/app/features/profile/state/reducers.test.ts @@ -1,6 +1,6 @@ import { reducerTester } from '../../../../test/core/redux/reducerTester'; import { OrgRole } from '../../../types'; -import { getMockTeam } from '../../teams/__mocks__/teamMocks'; +import { getMockTeam } from '../../teams/mocks/teamMocks'; import { initialUserState, diff --git a/public/app/features/query/components/QueryEditorRows.test.tsx b/public/app/features/query/components/QueryEditorRows.test.tsx index 8a05014c633..c165c783e2a 100644 --- a/public/app/features/query/components/QueryEditorRows.test.tsx +++ b/public/app/features/query/components/QueryEditorRows.test.tsx @@ -3,7 +3,7 @@ import { fireEvent, queryByLabelText, render, screen } from '@testing-library/re import { DataSourceRef, type DataQuery } from '@grafana/schema'; import { mockDataSource } from 'app/features/alerting/unified/mocks'; import { DataSourceType } from 'app/features/alerting/unified/utils/datasource'; -import createMockPanelData from 'app/plugins/datasource/azuremonitor/__mocks__/panelData'; +import createMockPanelData from 'app/plugins/datasource/azuremonitor/mocks/panelData'; import { QueryEditorRows, Props } from './QueryEditorRows'; diff --git a/public/app/features/query/state/__mocks__/mockDataSource.ts b/public/app/features/query/state/mocks/mockDataSource.ts similarity index 100% rename from public/app/features/query/state/__mocks__/mockDataSource.ts rename to public/app/features/query/state/mocks/mockDataSource.ts diff --git a/public/app/features/query/state/runRequest.test.ts b/public/app/features/query/state/runRequest.test.ts index f7620c9b965..57f49f152b5 100644 --- a/public/app/features/query/state/runRequest.test.ts +++ b/public/app/features/query/state/runRequest.test.ts @@ -19,7 +19,7 @@ import { deepFreeze } from '../../../../test/core/redux/reducerTester'; import { Echo } from '../../../core/services/echo/Echo'; import { createDashboardModelFixture } from '../../dashboard/state/__fixtures__/dashboardFixtures'; -import { getMockDataSource, TestQuery } from './__mocks__/mockDataSource'; +import { getMockDataSource, TestQuery } from './mocks/mockDataSource'; import { callQueryMethodWithMigration, runRequest } from './runRequest'; jest.mock('app/core/services/backend_srv'); diff --git a/public/app/features/teams/TeamGroupSync.test.tsx b/public/app/features/teams/TeamGroupSync.test.tsx index aee6a5a735d..841a85b5d4b 100644 --- a/public/app/features/teams/TeamGroupSync.test.tsx +++ b/public/app/features/teams/TeamGroupSync.test.tsx @@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'; import { TeamGroup } from '../../types'; import { Props, TeamGroupSync } from './TeamGroupSync'; -import { getMockTeamGroups } from './__mocks__/teamMocks'; +import { getMockTeamGroups } from './mocks/teamMocks'; const setup = (propOverrides?: object) => { const props: Props = { diff --git a/public/app/features/teams/TeamList.test.tsx b/public/app/features/teams/TeamList.test.tsx index 7629076e3c2..4826c2bc24f 100644 --- a/public/app/features/teams/TeamList.test.tsx +++ b/public/app/features/teams/TeamList.test.tsx @@ -7,7 +7,7 @@ import { contextSrv } from 'app/core/services/context_srv'; import { Team } from '../../types'; import { Props, TeamList } from './TeamList'; -import { getMockTeam, getMultipleMockTeams } from './__mocks__/teamMocks'; +import { getMockTeam, getMultipleMockTeams } from './mocks/teamMocks'; jest.mock('app/core/core', () => ({ contextSrv: { diff --git a/public/app/features/teams/TeamPages.test.tsx b/public/app/features/teams/TeamPages.test.tsx index f2d5c4674a9..ae180bd5e63 100644 --- a/public/app/features/teams/TeamPages.test.tsx +++ b/public/app/features/teams/TeamPages.test.tsx @@ -3,7 +3,7 @@ import { useParams } from 'react-router-dom-v5-compat'; import { render } from 'test/test-utils'; import TeamPages from './TeamPages'; -import { getMockTeam } from './__mocks__/teamMocks'; +import { getMockTeam } from './mocks/teamMocks'; jest.mock('app/core/components/Select/UserPicker', () => { return { UserPicker: () => null }; diff --git a/public/app/features/teams/TeamSettings.test.tsx b/public/app/features/teams/TeamSettings.test.tsx index 5b65cbfa800..a203c66eed9 100644 --- a/public/app/features/teams/TeamSettings.test.tsx +++ b/public/app/features/teams/TeamSettings.test.tsx @@ -2,7 +2,7 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { Props, TeamSettings } from './TeamSettings'; -import { getMockTeam } from './__mocks__/teamMocks'; +import { getMockTeam } from './mocks/teamMocks'; jest.mock('app/core/services/context_srv', () => ({ contextSrv: { diff --git a/public/app/features/teams/__mocks__/navModelMock.ts b/public/app/features/teams/mocks/navModelMock.ts similarity index 100% rename from public/app/features/teams/__mocks__/navModelMock.ts rename to public/app/features/teams/mocks/navModelMock.ts diff --git a/public/app/features/teams/__mocks__/teamMocks.ts b/public/app/features/teams/mocks/teamMocks.ts similarity index 100% rename from public/app/features/teams/__mocks__/teamMocks.ts rename to public/app/features/teams/mocks/teamMocks.ts diff --git a/public/app/features/teams/state/reducers.test.ts b/public/app/features/teams/state/reducers.test.ts index ba4984bd7be..483b22700f0 100644 --- a/public/app/features/teams/state/reducers.test.ts +++ b/public/app/features/teams/state/reducers.test.ts @@ -1,6 +1,6 @@ import { reducerTester } from '../../../../test/core/redux/reducerTester'; import { TeamsState, TeamState } from '../../../types'; -import { getMockTeam, getMockTeamGroups, getMockTeamMember } from '../__mocks__/teamMocks'; +import { getMockTeam, getMockTeamGroups, getMockTeamMember } from '../mocks/teamMocks'; import { initialTeamsState, diff --git a/public/app/features/teams/state/selectors.test.ts b/public/app/features/teams/state/selectors.test.ts index 644dad1c867..58f4dbbeeef 100644 --- a/public/app/features/teams/state/selectors.test.ts +++ b/public/app/features/teams/state/selectors.test.ts @@ -1,5 +1,5 @@ import { TeamState } from '../../../types'; -import { getMockTeam } from '../__mocks__/teamMocks'; +import { getMockTeam } from '../mocks/teamMocks'; import { getTeam } from './selectors'; diff --git a/public/app/features/users/__mocks__/userMocks.ts b/public/app/features/users/mocks/userMocks.ts similarity index 100% rename from public/app/features/users/__mocks__/userMocks.ts rename to public/app/features/users/mocks/userMocks.ts diff --git a/public/app/features/users/state/reducers.test.ts b/public/app/features/users/state/reducers.test.ts index e1759deb9b8..5c76c88ba5e 100644 --- a/public/app/features/users/state/reducers.test.ts +++ b/public/app/features/users/state/reducers.test.ts @@ -1,6 +1,6 @@ import { reducerTester } from '../../../../test/core/redux/reducerTester'; import { UsersState } from '../../../types'; -import { getMockUsers, getFetchUsersMock } from '../__mocks__/userMocks'; +import { getMockUsers, getFetchUsersMock } from '../mocks/userMocks'; import { initialState, searchQueryChanged, usersLoaded, usersReducer } from './reducers'; diff --git a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.test.ts b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.test.ts index e7fbc8c9115..2c59c4a38bb 100644 --- a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.test.ts +++ b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/azure_log_analytics_datasource.test.ts @@ -1,12 +1,12 @@ import { CustomVariableModel } from '@grafana/data'; -import { Context, createContext } from '../__mocks__/datasource'; -import createMockQuery from '../__mocks__/query'; -import { singleVariable } from '../__mocks__/variables'; +import { Context, createContext } from '../mocks/datasource'; +import createMockQuery from '../mocks/query'; +import { singleVariable } from '../mocks/variables'; import { AzureLogsQuery, AzureMonitorQuery, AzureQueryType, AzureTracesQuery } from '../types'; -import FakeSchemaData from './__mocks__/schema'; import AzureLogAnalyticsDatasource from './azure_log_analytics_datasource'; +import FakeSchemaData from './mocks/schema'; let getTempVars = () => [] as CustomVariableModel[]; let replace = () => ''; diff --git a/public/app/plugins/datasource/azuremonitor/azure_log_analytics/__mocks__/schema.ts b/public/app/plugins/datasource/azuremonitor/azure_log_analytics/mocks/schema.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/azure_log_analytics/__mocks__/schema.ts rename to public/app/plugins/datasource/azuremonitor/azure_log_analytics/mocks/schema.ts diff --git a/public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.test.ts b/public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.test.ts index d20428269dd..c5561e53be1 100644 --- a/public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.test.ts +++ b/public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.test.ts @@ -3,10 +3,10 @@ import { get, set } from 'lodash'; import { ScopedVars } from '@grafana/data'; import { VariableInterpolation } from '@grafana/runtime'; -import createMockQuery from '../__mocks__/query'; -import { createTemplateVariables } from '../__mocks__/utils'; -import { multiVariable } from '../__mocks__/variables'; import AzureMonitorDatasource from '../datasource'; +import createMockQuery from '../mocks/query'; +import { createTemplateVariables } from '../mocks/utils'; +import { multiVariable } from '../mocks/variables'; import { AzureAPIResponse, AzureMonitorDataSourceInstanceSettings, diff --git a/public/app/plugins/datasource/azuremonitor/azure_resource_graph/azure_resource_graph_datasource.test.ts b/public/app/plugins/datasource/azuremonitor/azure_resource_graph/azure_resource_graph_datasource.test.ts index d5e1818f193..fc58c626fbf 100644 --- a/public/app/plugins/datasource/azuremonitor/azure_resource_graph/azure_resource_graph_datasource.test.ts +++ b/public/app/plugins/datasource/azuremonitor/azure_resource_graph/azure_resource_graph_datasource.test.ts @@ -2,11 +2,11 @@ import { set, get } from 'lodash'; import { CustomVariableModel } from '@grafana/data'; -import { Context, createContext } from '../__mocks__/datasource'; -import { createMockInstanceSetttings } from '../__mocks__/instanceSettings'; -import createMockQuery from '../__mocks__/query'; -import { createTemplateVariables } from '../__mocks__/utils'; -import { multiVariable, singleVariable, subscriptionsVariable } from '../__mocks__/variables'; +import { Context, createContext } from '../mocks/datasource'; +import { createMockInstanceSetttings } from '../mocks/instanceSettings'; +import createMockQuery from '../mocks/query'; +import { createTemplateVariables } from '../mocks/utils'; +import { multiVariable, singleVariable, subscriptionsVariable } from '../mocks/variables'; import { AzureQueryType } from '../types'; import AzureResourceGraphDatasource from './azure_resource_graph_datasource'; diff --git a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx index f01de772f6a..8da64b6024d 100644 --- a/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/ArgQueryEditor/ArgQueryEditor.test.tsx @@ -1,10 +1,10 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; import { ARGScope } from '../../dataquery.gen'; import { selectors } from '../../e2e/selectors'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import ArgQueryEditor from './ArgQueryEditor'; diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/BasicLogsToggle.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/BasicLogsToggle.test.tsx index 69d28318934..2b4925435de 100644 --- a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/BasicLogsToggle.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/BasicLogsToggle.test.tsx @@ -1,6 +1,6 @@ import { render, screen } from '@testing-library/react'; -import { createMockInstanceSetttings } from '../../__mocks__/instanceSettings'; +import { createMockInstanceSetttings } from '../../mocks/instanceSettings'; import { BasicLogsToggle, Props } from './BasicLogsToggle'; diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/DefaultSubscription.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/DefaultSubscription.test.tsx index b10c96daa47..34f7a6345a1 100644 --- a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/DefaultSubscription.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/DefaultSubscription.test.tsx @@ -1,8 +1,8 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { createMockInstanceSetttings } from '../../__mocks__/instanceSettings'; import { selectors } from '../../e2e/selectors'; +import { createMockInstanceSetttings } from '../../mocks/instanceSettings'; import { DefaultSubscription, Props } from './DefaultSubscription'; diff --git a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/MonitorConfig.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/MonitorConfig.test.tsx index e7d2331d954..a098af09773 100644 --- a/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/MonitorConfig.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/ConfigEditor/MonitorConfig.test.tsx @@ -2,7 +2,7 @@ import { render, screen, waitFor, fireEvent, cleanup } from '@testing-library/re import { config } from '@grafana/runtime'; -import { createMockDatasourceSettings } from '../../__mocks__/datasourceSettings'; +import { createMockDatasourceSettings } from '../../mocks/datasourceSettings'; import { MonitorConfig, Props } from './MonitorConfig'; diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsManagement.test.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsManagement.test.tsx index 0f81976cb63..7343aea55ee 100644 --- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsManagement.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsManagement.test.tsx @@ -1,8 +1,8 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import { LogsManagement } from './LogsManagement'; diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx index 106a7e4e66a..50b019d8aa0 100644 --- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/LogsQueryEditor.test.tsx @@ -3,9 +3,9 @@ import userEvent from '@testing-library/user-event'; import { dateTime, LoadingState } from '@grafana/data'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; import { ResultFormat } from '../../dataquery.gen'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import LogsQueryEditor from './LogsQueryEditor'; import { createMockResourcePickerData } from './mocks'; diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.test.tsx b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.test.tsx index 5ba125daa21..9d9f2359dea 100644 --- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/TimeManagement.test.tsx @@ -1,9 +1,9 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; -import FakeSchemaData from '../../azure_log_analytics/__mocks__/schema'; +import FakeSchemaData from '../../azure_log_analytics/mocks/schema'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import { TimeManagement } from './TimeManagement'; diff --git a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/mocks.ts b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/mocks.ts index ecd27888afa..1690b7866eb 100644 --- a/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/mocks.ts +++ b/public/app/plugins/datasource/azuremonitor/components/LogsQueryEditor/mocks.ts @@ -1,10 +1,10 @@ -import createMockDatasource from '../../__mocks__/datasource'; -import { createMockInstanceSetttings } from '../../__mocks__/instanceSettings'; +import createMockDatasource from '../../mocks/datasource'; +import { createMockInstanceSetttings } from '../../mocks/instanceSettings'; import { createMockSubscriptions, createMockResourceGroupsBySubscription, mockResourcesByResourceGroup, -} from '../../__mocks__/resourcePickerRows'; +} from '../../mocks/resourcePickerRows'; import ResourcePickerData from '../../resourcePicker/resourcePickerData'; export function createMockResourcePickerData() { diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AggregationField.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AggregationField.test.tsx index 13a003a20a0..35063802773 100644 --- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AggregationField.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/AggregationField.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import { AzureMonitorOption } from '../../types'; import AggregationField from './AggregationField'; diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx index 26f7ccd755c..de60ae890b0 100644 --- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/DimensionFields.test.tsx @@ -4,9 +4,9 @@ import { openMenu } from 'react-select-event'; import { selectors } from '@grafana/e2e-selectors'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockPanelData from '../../__mocks__/panelData'; -import createMockQuery from '../../__mocks__/query'; +import createMockDatasource from '../../mocks/datasource'; +import createMockPanelData from '../../mocks/panelData'; +import createMockQuery from '../../mocks/query'; import { selectOptionInTest } from '../../utils/testUtils'; import DimensionFields from './DimensionFields'; diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNameField.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNameField.test.tsx index 72813a642b9..06a08b1cdeb 100644 --- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNameField.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNameField.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import { AzureMonitorOption } from '../../types'; import MetricNameField from './MetricNameField'; diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNamespaceField.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNamespaceField.test.tsx index 6fd05b9979c..dc1aab8b0bf 100644 --- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNamespaceField.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricNamespaceField.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import { AzureMonitorOption } from '../../types'; import MetricNamespaceField from './MetricNamespaceField'; diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx index cf92f83b896..c8a4ed81048 100644 --- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/MetricsQueryEditor.test.tsx @@ -1,10 +1,10 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockPanelData from '../../__mocks__/panelData'; -import createMockQuery from '../../__mocks__/query'; import { selectors } from '../../e2e/selectors'; +import createMockDatasource from '../../mocks/datasource'; +import createMockPanelData from '../../mocks/panelData'; +import createMockQuery from '../../mocks/query'; import { selectOptionInTest } from '../../utils/testUtils'; import { createMockResourcePickerData } from '../LogsQueryEditor/mocks'; diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TimeGrainField.test.tsx b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TimeGrainField.test.tsx index a619620d06d..8722f5eee2c 100644 --- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TimeGrainField.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/TimeGrainField.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import { AzureMonitorOption } from '../../types'; import TimeGrainField from './TimeGrainField'; diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.test.ts b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.test.ts index 27e011f4311..acf197d2e2c 100644 --- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.test.ts +++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.test.ts @@ -1,7 +1,7 @@ import { renderHook, waitFor } from '@testing-library/react'; -import createMockDatasource from '../../__mocks__/datasource'; import Datasource from '../../datasource'; +import createMockDatasource from '../../mocks/datasource'; import { AzureMetricQuery, AzureMonitorOption, AzureMonitorQuery, AzureQueryType } from '../../types'; import { diff --git a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx index 202e27e604b..5a944e472c3 100644 --- a/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/QueryEditor/QueryEditor.test.tsx @@ -4,10 +4,10 @@ import { CoreApp } from '@grafana/data'; import { config } from '@grafana/runtime'; import * as ui from '@grafana/ui'; -import createMockDatasource from '../../__mocks__/datasource'; -import { invalidNamespaceError } from '../../__mocks__/errors'; -import createMockQuery from '../../__mocks__/query'; import { selectors } from '../../e2e/selectors'; +import createMockDatasource from '../../mocks/datasource'; +import { invalidNamespaceError } from '../../mocks/errors'; +import createMockQuery from '../../mocks/query'; import { AzureQueryType, ResultFormat } from '../../types'; import { selectOptionInTest } from '../../utils/testUtils'; import { createMockResourcePickerData } from '../LogsQueryEditor/mocks'; diff --git a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.test.tsx b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.test.tsx index 69ada6687fa..4ef6385cbcf 100644 --- a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/ResourcePicker.test.tsx @@ -2,16 +2,16 @@ import { act, render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { omit } from 'lodash'; -import createMockDatasource from '../../__mocks__/datasource'; -import { createMockInstanceSetttings } from '../../__mocks__/instanceSettings'; +import Datasource from '../../datasource'; +import createMockDatasource from '../../mocks/datasource'; +import { createMockInstanceSetttings } from '../../mocks/instanceSettings'; import { createMockResourceGroupsBySubscription, createMockSubscriptions, mockResourcesByResourceGroup, mockSearchResults, -} from '../../__mocks__/resourcePickerRows'; -import { DeepPartial } from '../../__mocks__/utils'; -import Datasource from '../../datasource'; +} from '../../mocks/resourcePickerRows'; +import { DeepPartial } from '../../mocks/utils'; import ResourcePickerData, { ResourcePickerQueryType } from '../../resourcePicker/resourcePickerData'; import { ResourceRowType } from './types'; diff --git a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.test.ts b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.test.ts index 119e9625bba..b876eff4b5d 100644 --- a/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.test.ts +++ b/public/app/plugins/datasource/azuremonitor/components/ResourcePicker/utils.test.ts @@ -1,4 +1,4 @@ -import createMockQuery from '../../__mocks__/query'; +import createMockQuery from '../../mocks/query'; import { ResourceRowGroup, ResourceRowType } from './types'; import { diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx index 9ae9327dae4..9eef48a3a4d 100644 --- a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/Filters.test.tsx @@ -5,10 +5,10 @@ import { of } from 'rxjs'; import { CoreApp } from '@grafana/data'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; import { AzureQueryType } from '../../dataquery.gen'; import Datasource from '../../datasource'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import { AzureMonitorQuery } from '../../types'; import { selectOptionInTest } from '../../utils/testUtils'; diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx index 07f7d50f343..deef4b00bab 100644 --- a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TraceTypeField.test.tsx @@ -1,9 +1,9 @@ import { render, screen, act } from '@testing-library/react'; import { openMenu } from 'react-select-event'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; import { selectors } from '../../e2e/selectors'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import TraceTypeField from './TraceTypeField'; import { Tables } from './consts'; diff --git a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.test.tsx index 09f390aaa37..c0e4610c88b 100644 --- a/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/TracesQueryEditor/TracesQueryEditor.test.tsx @@ -1,8 +1,8 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import { createMockResourcePickerData } from '../LogsQueryEditor/mocks'; import TracesQueryEditor from './TracesQueryEditor'; diff --git a/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.test.tsx b/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.test.tsx index 22efae1e624..9f6c8ac8e75 100644 --- a/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/VariableEditor/VariableEditor.test.tsx @@ -5,7 +5,7 @@ import { select, openMenu } from 'react-select-event'; import * as ui from '@grafana/ui'; -import createMockDatasource from '../../__mocks__/datasource'; +import createMockDatasource from '../../mocks/datasource'; import { AzureMonitorQuery, AzureQueryType } from '../../types'; import VariableEditor from './VariableEditor'; diff --git a/public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.test.tsx b/public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.test.tsx index 4a31f801fee..fe06dc7cee1 100644 --- a/public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.test.tsx +++ b/public/app/plugins/datasource/azuremonitor/components/shared/FormatAsField.test.tsx @@ -2,8 +2,8 @@ import { render, screen } from '@testing-library/react'; import { SelectableValue } from '@grafana/data'; -import createMockDatasource from '../../__mocks__/datasource'; -import createMockQuery from '../../__mocks__/query'; +import createMockDatasource from '../../mocks/datasource'; +import createMockQuery from '../../mocks/query'; import { AzureMonitorQuery, ResultFormat } from '../../types'; import FormatAsField from './FormatAsField'; diff --git a/public/app/plugins/datasource/azuremonitor/datasource.test.ts b/public/app/plugins/datasource/azuremonitor/datasource.test.ts index 7f41cc4b745..709e7c836d8 100644 --- a/public/app/plugins/datasource/azuremonitor/datasource.test.ts +++ b/public/app/plugins/datasource/azuremonitor/datasource.test.ts @@ -1,7 +1,7 @@ -import { createMockInstanceSetttings } from './__mocks__/instanceSettings'; -import createMockQuery from './__mocks__/query'; -import { singleVariable } from './__mocks__/variables'; import Datasource from './datasource'; +import { createMockInstanceSetttings } from './mocks/instanceSettings'; +import createMockQuery from './mocks/query'; +import { singleVariable } from './mocks/variables'; import { AzureQueryType } from './types'; jest.mock('@grafana/runtime', () => { diff --git a/public/app/plugins/datasource/azuremonitor/grafanaTemplateVariables.test.ts b/public/app/plugins/datasource/azuremonitor/grafanaTemplateVariables.test.ts index 88b6dbd5fa3..68743a6942e 100644 --- a/public/app/plugins/datasource/azuremonitor/grafanaTemplateVariables.test.ts +++ b/public/app/plugins/datasource/azuremonitor/grafanaTemplateVariables.test.ts @@ -1,5 +1,5 @@ -import createMockDatasource from './__mocks__/datasource'; import { migrateQuery, migrateStringQueriesToObjectQueries } from './grafanaTemplateVariableFns'; +import createMockDatasource from './mocks/datasource'; import { AzureMonitorQuery, AzureQueryType } from './types'; describe('migrateStringQueriesToObjectQueries', () => { diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/argResourcePickerResponse.ts b/public/app/plugins/datasource/azuremonitor/mocks/argResourcePickerResponse.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/__mocks__/argResourcePickerResponse.ts rename to public/app/plugins/datasource/azuremonitor/mocks/argResourcePickerResponse.ts diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/datasource.ts b/public/app/plugins/datasource/azuremonitor/mocks/datasource.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/__mocks__/datasource.ts rename to public/app/plugins/datasource/azuremonitor/mocks/datasource.ts diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/datasourceSettings.ts b/public/app/plugins/datasource/azuremonitor/mocks/datasourceSettings.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/__mocks__/datasourceSettings.ts rename to public/app/plugins/datasource/azuremonitor/mocks/datasourceSettings.ts diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/errors.ts b/public/app/plugins/datasource/azuremonitor/mocks/errors.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/__mocks__/errors.ts rename to public/app/plugins/datasource/azuremonitor/mocks/errors.ts diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/instanceSettings.ts b/public/app/plugins/datasource/azuremonitor/mocks/instanceSettings.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/__mocks__/instanceSettings.ts rename to public/app/plugins/datasource/azuremonitor/mocks/instanceSettings.ts diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/panelData.ts b/public/app/plugins/datasource/azuremonitor/mocks/panelData.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/__mocks__/panelData.ts rename to public/app/plugins/datasource/azuremonitor/mocks/panelData.ts diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/query.ts b/public/app/plugins/datasource/azuremonitor/mocks/query.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/__mocks__/query.ts rename to public/app/plugins/datasource/azuremonitor/mocks/query.ts diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts b/public/app/plugins/datasource/azuremonitor/mocks/resourcePickerRows.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/__mocks__/resourcePickerRows.ts rename to public/app/plugins/datasource/azuremonitor/mocks/resourcePickerRows.ts diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/utils.ts b/public/app/plugins/datasource/azuremonitor/mocks/utils.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/__mocks__/utils.ts rename to public/app/plugins/datasource/azuremonitor/mocks/utils.ts diff --git a/public/app/plugins/datasource/azuremonitor/__mocks__/variables.ts b/public/app/plugins/datasource/azuremonitor/mocks/variables.ts similarity index 100% rename from public/app/plugins/datasource/azuremonitor/__mocks__/variables.ts rename to public/app/plugins/datasource/azuremonitor/mocks/variables.ts diff --git a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts index 13988a15b4d..0243f717d52 100644 --- a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts +++ b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.test.ts @@ -1,13 +1,13 @@ +import { resourceTypes } from '../azureMetadata'; +import AzureResourceGraphDatasource from '../azure_resource_graph/azure_resource_graph_datasource'; +import { ResourceRowType } from '../components/ResourcePicker/types'; import { createARGResourcesResponse, createMockARGResourceGroupsResponse, createMockARGSubscriptionResponse, -} from '../__mocks__/argResourcePickerResponse'; -import createMockDatasource from '../__mocks__/datasource'; -import { createMockInstanceSetttings } from '../__mocks__/instanceSettings'; -import { resourceTypes } from '../azureMetadata'; -import AzureResourceGraphDatasource from '../azure_resource_graph/azure_resource_graph_datasource'; -import { ResourceRowType } from '../components/ResourcePicker/types'; +} from '../mocks/argResourcePickerResponse'; +import createMockDatasource from '../mocks/datasource'; +import { createMockInstanceSetttings } from '../mocks/instanceSettings'; import { AzureGraphResponse } from '../types'; import ResourcePickerData from './resourcePickerData'; diff --git a/public/app/plugins/datasource/azuremonitor/utils/common.test.ts b/public/app/plugins/datasource/azuremonitor/utils/common.test.ts index 0c55057fbfb..99b3cdba33f 100644 --- a/public/app/plugins/datasource/azuremonitor/utils/common.test.ts +++ b/public/app/plugins/datasource/azuremonitor/utils/common.test.ts @@ -1,4 +1,4 @@ -import { initialCustomVariableModelState } from '../__mocks__/variables'; +import { initialCustomVariableModelState } from '../mocks/variables'; import { hasOption, interpolateVariable } from './common'; diff --git a/public/app/plugins/datasource/azuremonitor/utils/messageFromError.test.ts b/public/app/plugins/datasource/azuremonitor/utils/messageFromError.test.ts index 8af0b8c8e45..6df351a9677 100644 --- a/public/app/plugins/datasource/azuremonitor/utils/messageFromError.test.ts +++ b/public/app/plugins/datasource/azuremonitor/utils/messageFromError.test.ts @@ -1,4 +1,4 @@ -import { invalidNamespaceError } from '../__mocks__/errors'; +import { invalidNamespaceError } from '../mocks/errors'; import messageFromError from './messageFromError'; diff --git a/public/app/plugins/datasource/azuremonitor/variables.test.ts b/public/app/plugins/datasource/azuremonitor/variables.test.ts index 84d4babcaf0..dcec7ff8005 100644 --- a/public/app/plugins/datasource/azuremonitor/variables.test.ts +++ b/public/app/plugins/datasource/azuremonitor/variables.test.ts @@ -2,8 +2,8 @@ import { from, lastValueFrom } from 'rxjs'; import { DataQueryRequest, toDataFrame } from '@grafana/data'; -import createMockDatasource from './__mocks__/datasource'; -import { invalidSubscriptionError } from './__mocks__/errors'; +import createMockDatasource from './mocks/datasource'; +import { invalidSubscriptionError } from './mocks/errors'; import { AzureMonitorQuery, AzureQueryType } from './types'; import { VariableSupport } from './variables'; diff --git a/public/app/plugins/datasource/cloud-monitoring/annotationSupport.test.ts b/public/app/plugins/datasource/cloud-monitoring/annotationSupport.test.ts index 291e0ddff19..c187351f957 100644 --- a/public/app/plugins/datasource/cloud-monitoring/annotationSupport.test.ts +++ b/public/app/plugins/datasource/cloud-monitoring/annotationSupport.test.ts @@ -1,7 +1,7 @@ import { AnnotationQuery } from '@grafana/data'; -import { createMockDatasource } from './__mocks__/cloudMonitoringDatasource'; import { CloudMonitoringAnnotationSupport } from './annotationSupport'; +import { createMockDatasource } from './mocks/cloudMonitoringDatasource'; import { AlignmentTypes, CloudMonitoringQuery, diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Alignment.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Alignment.test.tsx index da990da45e9..96bd3f8d71f 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Alignment.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Alignment.test.tsx @@ -4,9 +4,9 @@ import { openMenu } from 'react-select-event'; import { CustomVariableModel } from '@grafana/data'; -import { createMockDatasource } from '../__mocks__/cloudMonitoringDatasource'; -import { createMockMetricDescriptor } from '../__mocks__/cloudMonitoringMetricDescriptor'; -import { createMockTimeSeriesList } from '../__mocks__/cloudMonitoringQuery'; +import { createMockDatasource } from '../mocks/cloudMonitoringDatasource'; +import { createMockMetricDescriptor } from '../mocks/cloudMonitoringMetricDescriptor'; +import { createMockTimeSeriesList } from '../mocks/cloudMonitoringQuery'; import { MetricKind, ValueTypes } from '../types/query'; import { Alignment } from './Alignment'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.test.tsx index 349f07d3dfd..da1505cbb0f 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.test.tsx @@ -1,8 +1,8 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { createMockDatasource } from '../__mocks__/cloudMonitoringDatasource'; -import { createMockQuery } from '../__mocks__/cloudMonitoringQuery'; +import { createMockDatasource } from '../mocks/cloudMonitoringDatasource'; +import { createMockQuery } from '../mocks/cloudMonitoringQuery'; import { AnnotationQueryEditor } from './AnnotationQueryEditor'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/GroupBy.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/GroupBy.test.tsx index 7342a9b0388..83dbe35d124 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/GroupBy.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/GroupBy.test.tsx @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { openMenu, select } from 'react-select-event'; -import { createMockTimeSeriesList } from '../__mocks__/cloudMonitoringQuery'; +import { createMockTimeSeriesList } from '../mocks/cloudMonitoringQuery'; import { MetricDescriptor } from '../types/types'; import { GroupBy, Props } from './GroupBy'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx index 187481ca913..12ed2dfd0aa 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/MetricQueryEditor.test.tsx @@ -4,8 +4,8 @@ import { openMenu } from 'react-select-event'; import { getDefaultTimeRange } from '@grafana/data'; -import { createMockDatasource } from '../__mocks__/cloudMonitoringDatasource'; -import { createMockQuery } from '../__mocks__/cloudMonitoringQuery'; +import { createMockDatasource } from '../mocks/cloudMonitoringDatasource'; +import { createMockQuery } from '../mocks/cloudMonitoringQuery'; import { QueryType } from '../types/query'; import { MetricQueryEditor } from './MetricQueryEditor'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Preprocessor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Preprocessor.test.tsx index aa6b89d4228..cb3003e9117 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/Preprocessor.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/Preprocessor.test.tsx @@ -3,8 +3,8 @@ import userEvent from '@testing-library/user-event'; import { CustomVariableModel } from '@grafana/data'; -import { createMockMetricDescriptor } from '../__mocks__/cloudMonitoringMetricDescriptor'; -import { createMockTimeSeriesList } from '../__mocks__/cloudMonitoringQuery'; +import { createMockMetricDescriptor } from '../mocks/cloudMonitoringMetricDescriptor'; +import { createMockTimeSeriesList } from '../mocks/cloudMonitoringQuery'; import { MetricKind, ValueTypes } from '../types/query'; import { Preprocessor } from './Preprocessor'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.test.tsx index cd3bb5d9668..7f410a17e8c 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.test.tsx @@ -1,9 +1,9 @@ import { render, waitFor, screen } from '@testing-library/react'; import { select } from 'react-select-event'; -import { createMockDatasource } from '../__mocks__/cloudMonitoringDatasource'; -import { createMockQuery } from '../__mocks__/cloudMonitoringQuery'; import { selectors } from '../e2e/selectors'; +import { createMockDatasource } from '../mocks/cloudMonitoringDatasource'; +import { createMockQuery } from '../mocks/cloudMonitoringQuery'; import { QueryType } from '../types/query'; import { QueryEditor } from './QueryEditor'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/QueryHeader.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/QueryHeader.test.tsx index 3dfbe2c2bab..331ad7c4d4b 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/QueryHeader.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/QueryHeader.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import { openMenu, select } from 'react-select-event'; -import { createMockQuery } from '../__mocks__/cloudMonitoringQuery'; +import { createMockQuery } from '../mocks/cloudMonitoringQuery'; import { QueryType } from '../types/query'; import { QueryHeader } from './QueryHeader'; diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx index cfe82378a18..05e2f9c3721 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.test.tsx @@ -6,9 +6,9 @@ import { CustomVariableModel, getDefaultTimeRange } from '@grafana/data'; import { selectors } from '@grafana/e2e-selectors'; import { getTemplateSrv } from '@grafana/runtime'; -import { createMockDatasource } from '../__mocks__/cloudMonitoringDatasource'; -import { createMockMetricDescriptor } from '../__mocks__/cloudMonitoringMetricDescriptor'; -import { createMockTimeSeriesList } from '../__mocks__/cloudMonitoringQuery'; +import { createMockDatasource } from '../mocks/cloudMonitoringDatasource'; +import { createMockMetricDescriptor } from '../mocks/cloudMonitoringMetricDescriptor'; +import { createMockTimeSeriesList } from '../mocks/cloudMonitoringQuery'; import { PreprocessorType, MetricKind, ValueTypes } from '../types/query'; import { defaultTimeSeriesList } from './MetricQueryEditor'; diff --git a/public/app/plugins/datasource/cloud-monitoring/datasource.test.ts b/public/app/plugins/datasource/cloud-monitoring/datasource.test.ts index 59cd8cbdd0b..a87d4e266d0 100644 --- a/public/app/plugins/datasource/cloud-monitoring/datasource.test.ts +++ b/public/app/plugins/datasource/cloud-monitoring/datasource.test.ts @@ -4,9 +4,9 @@ import { lastValueFrom, of } from 'rxjs'; import { CustomVariableModel, ScopedVars } from '@grafana/data'; import { getTemplateSrv } from '@grafana/runtime'; -import { createMockInstanceSetttings } from './__mocks__/cloudMonitoringInstanceSettings'; -import { createMockQuery } from './__mocks__/cloudMonitoringQuery'; import Datasource from './datasource'; +import { createMockInstanceSetttings } from './mocks/cloudMonitoringInstanceSettings'; +import { createMockQuery } from './mocks/cloudMonitoringQuery'; import { CloudMonitoringQuery, PreprocessorType, QueryType, MetricKind } from './types/query'; let getTempVars = () => [] as CustomVariableModel[]; diff --git a/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts b/public/app/plugins/datasource/cloud-monitoring/mocks/cloudMonitoringDatasource.ts similarity index 100% rename from public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringDatasource.ts rename to public/app/plugins/datasource/cloud-monitoring/mocks/cloudMonitoringDatasource.ts diff --git a/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringInstanceSettings.ts b/public/app/plugins/datasource/cloud-monitoring/mocks/cloudMonitoringInstanceSettings.ts similarity index 100% rename from public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringInstanceSettings.ts rename to public/app/plugins/datasource/cloud-monitoring/mocks/cloudMonitoringInstanceSettings.ts diff --git a/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringMetricDescriptor.ts b/public/app/plugins/datasource/cloud-monitoring/mocks/cloudMonitoringMetricDescriptor.ts similarity index 100% rename from public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringMetricDescriptor.ts rename to public/app/plugins/datasource/cloud-monitoring/mocks/cloudMonitoringMetricDescriptor.ts diff --git a/public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringQuery.ts b/public/app/plugins/datasource/cloud-monitoring/mocks/cloudMonitoringQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloud-monitoring/__mocks__/cloudMonitoringQuery.ts rename to public/app/plugins/datasource/cloud-monitoring/mocks/cloudMonitoringQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.test.tsx index e9bd97a82f9..9178eb849c4 100644 --- a/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/AnnotationQueryEditor/AnnotationQueryEditor.test.tsx @@ -3,8 +3,8 @@ import '@testing-library/jest-dom'; import { QueryEditorProps } from '@grafana/data'; -import { setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource'; import { CloudWatchDatasource } from '../../datasource'; +import { setupMockedDataSource } from '../../mocks/CloudWatchDataSource'; import { CloudWatchAnnotationQuery, CloudWatchJsonData, CloudWatchMetricsQuery, CloudWatchQuery } from '../../types'; import { AnnotationQueryEditor } from './AnnotationQueryEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx index b7ac8deadb9..b397f39f983 100644 --- a/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/ConfigEditor/ConfigEditor.test.tsx @@ -4,12 +4,12 @@ import userEvent from '@testing-library/user-event'; import { AwsAuthType } from '@grafana/aws-sdk'; import { PluginContextProvider, PluginMeta, PluginMetaInfo, PluginType } from '@grafana/data'; +import { CloudWatchDatasource } from '../../datasource'; import { CloudWatchSettings, setupMockedDataSource, setupMockedTemplateService, -} from '../../__mocks__/CloudWatchDataSource'; -import { CloudWatchDatasource } from '../../datasource'; +} from '../../mocks/CloudWatchDataSource'; import { ConfigEditor, diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.test.tsx index b070fb69a0e..8c2ed9adb1f 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/CloudWatchLink.test.tsx @@ -2,9 +2,9 @@ import { act, render, screen, waitFor } from '@testing-library/react'; import { LoadingState } from '@grafana/data'; -import { setupMockedDataSource } from '../../../__mocks__/CloudWatchDataSource'; -import { RequestMock } from '../../../__mocks__/Request'; -import { validLogsQuery } from '../../../__mocks__/queries'; +import { setupMockedDataSource } from '../../../mocks/CloudWatchDataSource'; +import { RequestMock } from '../../../mocks/Request'; +import { validLogsQuery } from '../../../mocks/queries'; import { CloudWatchLogsQuery } from '../../../types'; import { CloudWatchLink } from './CloudWatchLink'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx index 4b9d5cc4cd1..bb87c2c6d19 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/MetricsQueryEditor.test.tsx @@ -4,9 +4,9 @@ import selectEvent from 'react-select-event'; import { CustomVariableModel, DataSourceInstanceSettings } from '@grafana/data'; import * as ui from '@grafana/ui'; -import { setupMockedTemplateService } from '../../../__mocks__/CloudWatchDataSource'; -import { initialVariableModelState } from '../../../__mocks__/CloudWatchVariables'; import { CloudWatchDatasource } from '../../../datasource'; +import { setupMockedTemplateService } from '../../../mocks/CloudWatchDataSource'; +import { initialVariableModelState } from '../../../mocks/CloudWatchVariables'; import { CloudWatchJsonData, MetricEditorMode, MetricQueryType } from '../../../types'; import { MetricsQueryEditor, Props } from './MetricsQueryEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx index 5060f6ff1a3..2e3c8e16403 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderEditor.test.tsx @@ -1,7 +1,7 @@ import { render, screen, waitFor } from '@testing-library/react'; -import { setupMockedDataSource } from '../../../../__mocks__/CloudWatchDataSource'; import { QueryEditorExpressionType, QueryEditorPropertyType } from '../../../../expressions'; +import { setupMockedDataSource } from '../../../../mocks/CloudWatchDataSource'; import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType, SQLExpression } from '../../../../types'; import { SQLBuilderEditor } from './SQLBuilderEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.test.tsx index 65b709bf72c..fca1c946f06 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLBuilderSelectRow.test.tsx @@ -1,8 +1,8 @@ import { act, render, screen } from '@testing-library/react'; import { selectOptionInTest } from 'test/helpers/selectOptionInTest'; -import { setupMockedDataSource } from '../../../../__mocks__/CloudWatchDataSource'; import { QueryEditorExpressionType, QueryEditorPropertyType } from '../../../../expressions'; +import { setupMockedDataSource } from '../../../../mocks/CloudWatchDataSource'; import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType, SQLExpression } from '../../../../types'; import SQLBuilderSelectRow from './SQLBuilderSelectRow'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.test.tsx index 6b670310a01..315eafb511a 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/SQLBuilderEditor/SQLGroupBy.test.tsx @@ -4,8 +4,8 @@ import selectEvent from 'react-select-event'; import { config } from '@grafana/runtime'; -import { setupMockedDataSource } from '../../../../__mocks__/CloudWatchDataSource'; -import { createArray, createGroupBy } from '../../../../__mocks__/sqlUtils'; +import { setupMockedDataSource } from '../../../../mocks/CloudWatchDataSource'; +import { createArray, createGroupBy } from '../../../../mocks/sqlUtils'; import { CloudWatchMetricsQuery, MetricEditorMode, MetricQueryType, SQLExpression } from '../../../../types'; import SQLGroupBy from './SQLGroupBy'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryEditor.test.tsx index 8a78f9a6f0a..1d87bd29596 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryEditor.test.tsx @@ -5,16 +5,16 @@ import { selectOptionInTest } from 'test/helpers/selectOptionInTest'; import { QueryEditorProps } from '@grafana/data'; import { config } from '@grafana/runtime'; -import { setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource'; +import { CloudWatchDatasource } from '../../datasource'; +import { DEFAULT_CWLI_QUERY_STRING, DEFAULT_SQL_QUERY_STRING } from '../../defaultQueries'; +import { setupMockedDataSource } from '../../mocks/CloudWatchDataSource'; import { validLogsQuery, validMetricQueryBuilderQuery, validMetricQueryCodeQuery, validMetricSearchBuilderQuery, validMetricSearchCodeQuery, -} from '../../__mocks__/queries'; -import { CloudWatchDatasource } from '../../datasource'; -import { DEFAULT_CWLI_QUERY_STRING, DEFAULT_SQL_QUERY_STRING } from '../../defaultQueries'; +} from '../../mocks/queries'; import { CloudWatchQuery, CloudWatchJsonData, MetricEditorMode, MetricQueryType, LogsQueryLanguage } from '../../types'; import { QueryEditor } from './QueryEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryHeader.test.tsx b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryHeader.test.tsx index ddf208ebb95..01af5b18121 100644 --- a/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryHeader.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/QueryEditor/QueryHeader.test.tsx @@ -3,10 +3,10 @@ import selectEvent from 'react-select-event'; import { config } from '@grafana/runtime'; -import { setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource'; -import { validLogsQuery, validMetricSearchBuilderQuery } from '../../__mocks__/queries'; import { LogsQueryLanguage } from '../../dataquery.gen'; import { DEFAULT_CWLI_QUERY_STRING } from '../../defaultQueries'; +import { setupMockedDataSource } from '../../mocks/CloudWatchDataSource'; +import { validLogsQuery, validMetricSearchBuilderQuery } from '../../mocks/queries'; import QueryHeader from './QueryHeader'; diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.test.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.test.tsx index b14051880fc..5cc5b0aafcb 100644 --- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/MultiFilter.test.tsx @@ -1,7 +1,7 @@ import { fireEvent, render, screen, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource'; +import { setupMockedDataSource } from '../../mocks/CloudWatchDataSource'; import { MultiFilter } from './MultiFilter'; diff --git a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx index be8cb585d4c..23bb9488d29 100644 --- a/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.test.tsx @@ -2,7 +2,7 @@ import { act, fireEvent, render, screen, waitFor, within } from '@testing-librar import userEvent from '@testing-library/user-event'; import { select } from 'react-select-event'; -import { setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource'; +import { setupMockedDataSource } from '../../mocks/CloudWatchDataSource'; import { GetDimensionKeysRequest } from '../../resources/types'; import { VariableQueryType } from '../../types'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx index ee39afba589..6374c95b8a6 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/Dimensions.test.tsx @@ -1,7 +1,7 @@ import { fireEvent, render, screen, within } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { setupMockedDataSource } from '../../../__mocks__/CloudWatchDataSource'; +import { setupMockedDataSource } from '../../../mocks/CloudWatchDataSource'; import { CloudWatchMetricsQuery } from '../../../types'; import { Dimensions } from './Dimensions'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx index 9ea8123bd2b..2afbd64e195 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/Dimensions/FilterItem.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { setupMockedDataSource } from '../../../__mocks__/CloudWatchDataSource'; +import { setupMockedDataSource } from '../../../mocks/CloudWatchDataSource'; import { CloudWatchMetricsQuery } from '../../../types'; import { FilterItem } from './FilterItem'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.test.tsx index 6bf4154d9ac..4822dbc8cc7 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LogGroupsField.test.tsx @@ -8,7 +8,7 @@ import { logGroupNamesVariable, setupMockedDataSource, setupMockedTemplateService, -} from '../../../__mocks__/CloudWatchDataSource'; +} from '../../../mocks/CloudWatchDataSource'; import { LogGroupsField } from './LogGroupsField'; diff --git a/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.test.tsx b/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.test.tsx index a88b4f4fd61..5eec534a5ca 100644 --- a/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.test.tsx +++ b/public/app/plugins/datasource/cloudwatch/components/shared/MetricStatEditor/MetricStatEditor.test.tsx @@ -4,8 +4,8 @@ import selectEvent from 'react-select-event'; import { config } from '@grafana/runtime'; -import { setupMockedDataSource, statisticVariable } from '../../../__mocks__/CloudWatchDataSource'; -import { validMetricSearchBuilderQuery } from '../../../__mocks__/queries'; +import { setupMockedDataSource, statisticVariable } from '../../../mocks/CloudWatchDataSource'; +import { validMetricSearchBuilderQuery } from '../../../mocks/queries'; import { MetricStat } from '../../../types'; import { MetricStatEditor } from './MetricStatEditor'; diff --git a/public/app/plugins/datasource/cloudwatch/datasource.test.ts b/public/app/plugins/datasource/cloudwatch/datasource.test.ts index 4d17c9b8eca..f70b15f9caa 100644 --- a/public/app/plugins/datasource/cloudwatch/datasource.test.ts +++ b/public/app/plugins/datasource/cloudwatch/datasource.test.ts @@ -9,10 +9,10 @@ import { logGroupNamesVariable, regionVariable, setupMockedDataSource, -} from './__mocks__/CloudWatchDataSource'; -import { setupForLogs } from './__mocks__/logsTestContext'; -import { validLogsQuery, validMetricSearchBuilderQuery } from './__mocks__/queries'; -import { TimeRangeMock } from './__mocks__/timeRange'; +} from './mocks/CloudWatchDataSource'; +import { setupForLogs } from './mocks/logsTestContext'; +import { validLogsQuery, validMetricSearchBuilderQuery } from './mocks/queries'; +import { TimeRangeMock } from './mocks/timeRange'; import { CloudWatchDefaultQuery, CloudWatchLogsQuery, diff --git a/public/app/plugins/datasource/cloudwatch/hooks.test.ts b/public/app/plugins/datasource/cloudwatch/hooks.test.ts index 326a56b4b6d..ebf88ecbf49 100644 --- a/public/app/plugins/datasource/cloudwatch/hooks.test.ts +++ b/public/app/plugins/datasource/cloudwatch/hooks.test.ts @@ -2,15 +2,6 @@ import { renderHook, waitFor } from '@testing-library/react'; import { config } from '@grafana/runtime'; -import { - accountIdVariable, - dimensionVariable, - metricVariable, - namespaceVariable, - regionVariable, - setupMockedDataSource, -} from './__mocks__/CloudWatchDataSource'; -import { setupMockedResourcesAPI } from './__mocks__/ResourcesAPI'; import { useAccountOptions, useDimensionKeys, @@ -18,6 +9,15 @@ import { useMetrics, useEnsureVariableHasSingleSelection, } from './hooks'; +import { + accountIdVariable, + dimensionVariable, + metricVariable, + namespaceVariable, + regionVariable, + setupMockedDataSource, +} from './mocks/CloudWatchDataSource'; +import { setupMockedResourcesAPI } from './mocks/ResourcesAPI'; const originalFeatureToggleValue = config.featureToggles.cloudWatchCrossAccountQuerying; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.test.ts index 6886d29d0cd..04b71f35a6d 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/CompletionItemProvider.test.ts @@ -1,14 +1,14 @@ import { CustomVariableModel } from '@grafana/data'; import { Monaco, monacoTypes } from '@grafana/ui'; -import { setupMockedTemplateService, logGroupNamesVariable } from '../../../__mocks__/CloudWatchDataSource'; -import { multiLineFullQuery } from '../../../__mocks__/cloudwatch-logs-sql-test-data/multiLineFullQuery'; -import { multiLineFullQueryWithCaseClause } from '../../../__mocks__/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause'; -import { partialQueryWithSubquery } from '../../../__mocks__/cloudwatch-logs-sql-test-data/partialQueryWithSubquery'; -import { singleLineFullQuery } from '../../../__mocks__/cloudwatch-logs-sql-test-data/singleLineFullQuery'; -import { whitespaceQuery } from '../../../__mocks__/cloudwatch-logs-sql-test-data/whitespaceQuery'; -import MonacoMock from '../../../__mocks__/monarch/Monaco'; -import TextModel from '../../../__mocks__/monarch/TextModel'; +import { setupMockedTemplateService, logGroupNamesVariable } from '../../../mocks/CloudWatchDataSource'; +import { multiLineFullQuery } from '../../../mocks/cloudwatch-logs-sql-test-data/multiLineFullQuery'; +import { multiLineFullQueryWithCaseClause } from '../../../mocks/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause'; +import { partialQueryWithSubquery } from '../../../mocks/cloudwatch-logs-sql-test-data/partialQueryWithSubquery'; +import { singleLineFullQuery } from '../../../mocks/cloudwatch-logs-sql-test-data/singleLineFullQuery'; +import { whitespaceQuery } from '../../../mocks/cloudwatch-logs-sql-test-data/whitespaceQuery'; +import MonacoMock from '../../../mocks/monarch/Monaco'; +import TextModel from '../../../mocks/monarch/TextModel'; import { ResourcesAPI } from '../../../resources/ResourcesAPI'; import { ResourceResponse } from '../../../resources/types'; import { LogGroup, LogGroupField } from '../../../types'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/statementPosition.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/statementPosition.test.ts index 2b4deed6d77..ef5d2273a95 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/statementPosition.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs-sql/completion/statementPosition.test.ts @@ -1,14 +1,14 @@ import { monacoTypes } from '@grafana/ui'; -import { commentOnlyQuery } from '../../../__mocks__/cloudwatch-logs-sql-test-data/commentOnlyQuery'; -import { multiLineFullQuery } from '../../../__mocks__/cloudwatch-logs-sql-test-data/multiLineFullQuery'; -import { multiLineFullQueryWithCaseClause } from '../../../__mocks__/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause'; -import { partialQueryWithFunction } from '../../../__mocks__/cloudwatch-logs-sql-test-data/partialQueryWithFunction'; -import { partialQueryWithSubquery } from '../../../__mocks__/cloudwatch-logs-sql-test-data/partialQueryWithSubquery'; -import { singleLineFullQuery } from '../../../__mocks__/cloudwatch-logs-sql-test-data/singleLineFullQuery'; -import { whitespaceQuery } from '../../../__mocks__/cloudwatch-logs-sql-test-data/whitespaceQuery'; -import MonacoMock from '../../../__mocks__/monarch/Monaco'; -import TextModel from '../../../__mocks__/monarch/TextModel'; +import { commentOnlyQuery } from '../../../mocks/cloudwatch-logs-sql-test-data/commentOnlyQuery'; +import { multiLineFullQuery } from '../../../mocks/cloudwatch-logs-sql-test-data/multiLineFullQuery'; +import { multiLineFullQueryWithCaseClause } from '../../../mocks/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause'; +import { partialQueryWithFunction } from '../../../mocks/cloudwatch-logs-sql-test-data/partialQueryWithFunction'; +import { partialQueryWithSubquery } from '../../../mocks/cloudwatch-logs-sql-test-data/partialQueryWithSubquery'; +import { singleLineFullQuery } from '../../../mocks/cloudwatch-logs-sql-test-data/singleLineFullQuery'; +import { whitespaceQuery } from '../../../mocks/cloudwatch-logs-sql-test-data/whitespaceQuery'; +import MonacoMock from '../../../mocks/monarch/Monaco'; +import TextModel from '../../../mocks/monarch/TextModel'; import { linkedTokenBuilder } from '../../monarch/linkedTokenBuilder'; import { StatementPosition } from '../../monarch/types'; import cloudWatchLogsSqlLanguageDefinition from '../definition'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.test.ts index 77a59d1fa21..1f475ec5fb8 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-logs/CloudWatchLogsLanguageProvider.test.ts @@ -3,8 +3,8 @@ import { Value } from 'slate'; import { TypeaheadOutput } from '@grafana/ui'; -import { setupMockedTemplateService } from '../../__mocks__/CloudWatchDataSource'; import { CloudWatchDatasource } from '../../datasource'; +import { setupMockedTemplateService } from '../../mocks/CloudWatchDataSource'; import { ResourceResponse } from '../../resources/types'; import { LogGroupField } from '../../types'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.test.ts index f1403d3682b..7809ac001b5 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/PPLCompletionItemProvider.test.ts @@ -1,8 +1,8 @@ import { CustomVariableModel } from '@grafana/data'; import { Monaco, monacoTypes } from '@grafana/ui'; -import { logGroupNamesVariable, setupMockedTemplateService } from '../../../__mocks__/CloudWatchDataSource'; -import { newCommandQuery } from '../../../__mocks__/cloudwatch-ppl-test-data/newCommandQuery'; +import { logGroupNamesVariable, setupMockedTemplateService } from '../../../mocks/CloudWatchDataSource'; +import { newCommandQuery } from '../../../mocks/cloudwatch-ppl-test-data/newCommandQuery'; import { dedupQueryWithOptionalArgs, emptyQuery, @@ -17,9 +17,9 @@ import { statsQuery, topQuery, whereQuery, -} from '../../../__mocks__/cloudwatch-ppl-test-data/singleLineQueries'; -import MonacoMock from '../../../__mocks__/monarch/Monaco'; -import TextModel from '../../../__mocks__/monarch/TextModel'; +} from '../../../mocks/cloudwatch-ppl-test-data/singleLineQueries'; +import MonacoMock from '../../../mocks/monarch/Monaco'; +import TextModel from '../../../mocks/monarch/TextModel'; import { ResourcesAPI } from '../../../resources/ResourcesAPI'; import { ResourceResponse } from '../../../resources/types'; import { LogGroup, LogGroupField } from '../../../types'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/statementPosition.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/statementPosition.test.ts index d127553c9f3..1e3bf9f0def 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/statementPosition.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-ppl/completion/statementPosition.test.ts @@ -1,6 +1,6 @@ import { monacoTypes } from '@grafana/ui'; -import { multiLineFullQuery } from '../../../__mocks__/cloudwatch-ppl-test-data/multilineQueries'; +import { multiLineFullQuery } from '../../../mocks/cloudwatch-ppl-test-data/multilineQueries'; import { dedupQueryWithOptionalArgs, dedupQueryWithoutOptionalArgs, @@ -19,9 +19,9 @@ import { statsQuery, topQuery, whereQuery, -} from '../../../__mocks__/cloudwatch-ppl-test-data/singleLineQueries'; -import MonacoMock from '../../../__mocks__/monarch/Monaco'; -import TextModel from '../../../__mocks__/monarch/TextModel'; +} from '../../../mocks/cloudwatch-ppl-test-data/singleLineQueries'; +import MonacoMock from '../../../mocks/monarch/Monaco'; +import TextModel from '../../../mocks/monarch/TextModel'; import { linkedTokenBuilder } from '../../monarch/linkedTokenBuilder'; import { StatementPosition } from '../../monarch/types'; import cloudWatchLogsPPLLanguageDefinition from '../definition'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts index 3d44b277df2..83f943a4f95 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/SQLGenerator.test.ts @@ -1,10 +1,11 @@ +import { QueryEditorExpressionType } from '../../expressions'; import { aggregationvariable, labelsVariable, metricVariable, namespaceVariable, setupMockedTemplateService, -} from '../../__mocks__/CloudWatchDataSource'; +} from '../../mocks/CloudWatchDataSource'; import { createFunctionWithParameter, createArray, @@ -12,8 +13,7 @@ import { createGroupBy, createFunction, createProperty, -} from '../../__mocks__/sqlUtils'; -import { QueryEditorExpressionType } from '../../expressions'; +} from '../../mocks/sqlUtils'; import { SQLExpression } from '../../types'; import SQLGenerator from './SQLGenerator'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/statementPosition.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/statementPosition.test.ts index 5e271e2f445..8cfcb4c7960 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/statementPosition.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/statementPosition.test.ts @@ -5,9 +5,9 @@ import { singleLineFullQuery, singleLineEmptyQuery, singleLineTwoQueries, -} from '../../../__mocks__/cloudwatch-sql-test-data'; -import MonacoMock from '../../../__mocks__/monarch/Monaco'; -import TextModel from '../../../__mocks__/monarch/TextModel'; +} from '../../../mocks/cloudwatch-sql-test-data'; +import MonacoMock from '../../../mocks/monarch/Monaco'; +import TextModel from '../../../mocks/monarch/TextModel'; import { linkedTokenBuilder } from '../../monarch/linkedTokenBuilder'; import { StatementPosition } from '../../monarch/types'; import cloudWatchSqlLanguageDefinition from '../definition'; diff --git a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/tokenUtils.test.ts b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/tokenUtils.test.ts index b64b2b98440..54e44f44866 100644 --- a/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/tokenUtils.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/cloudwatch-sql/completion/tokenUtils.test.ts @@ -5,9 +5,9 @@ import { singleLineFullQuery, singleLineTwoQueries, multiLineIncompleteQueryWithoutNamespace, -} from '../../../__mocks__/cloudwatch-sql-test-data'; -import MonacoMock from '../../../__mocks__/monarch/Monaco'; -import TextModel from '../../../__mocks__/monarch/TextModel'; +} from '../../../mocks/cloudwatch-sql-test-data'; +import MonacoMock from '../../../mocks/monarch/Monaco'; +import TextModel from '../../../mocks/monarch/TextModel'; import { LinkedToken } from '../../monarch/LinkedToken'; import { linkedTokenBuilder } from '../../monarch/linkedTokenBuilder'; import cloudWatchSqlLanguageDefinition from '../definition'; diff --git a/public/app/plugins/datasource/cloudwatch/language/dynamic-labels/CompletionItemProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/dynamic-labels/CompletionItemProvider.test.ts index ae14f6c74bd..c91dad19e38 100644 --- a/public/app/plugins/datasource/cloudwatch/language/dynamic-labels/CompletionItemProvider.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/dynamic-labels/CompletionItemProvider.test.ts @@ -1,9 +1,9 @@ import { CompletionItemPriority } from '@grafana/plugin-ui'; import { Monaco, monacoTypes } from '@grafana/ui'; -import { afterLabelValue, insideLabelValue } from '../../__mocks__/dynamic-label-test-data'; -import MonacoMock from '../../__mocks__/monarch/Monaco'; -import TextModel from '../../__mocks__/monarch/TextModel'; +import { afterLabelValue, insideLabelValue } from '../../mocks/dynamic-label-test-data'; +import MonacoMock from '../../mocks/monarch/Monaco'; +import TextModel from '../../mocks/monarch/TextModel'; import { DynamicLabelsCompletionItemProvider } from './CompletionItemProvider'; import cloudWatchDynamicLabelsLanguageDefinition from './definition'; diff --git a/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts index 63ddcc5e1cb..3a70d392749 100644 --- a/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/logs/completion/CompletionItemProvider.test.ts @@ -1,10 +1,10 @@ import { CustomVariableModel } from '@grafana/data'; import { Monaco, monacoTypes } from '@grafana/ui'; -import { setupMockedTemplateService, logGroupNamesVariable } from '../../../__mocks__/CloudWatchDataSource'; -import { emptyQuery, filterQuery, newCommandQuery, sortQuery } from '../../../__mocks__/cloudwatch-logs-test-data'; -import MonacoMock from '../../../__mocks__/monarch/Monaco'; -import TextModel from '../../../__mocks__/monarch/TextModel'; +import { setupMockedTemplateService, logGroupNamesVariable } from '../../../mocks/CloudWatchDataSource'; +import { emptyQuery, filterQuery, newCommandQuery, sortQuery } from '../../../mocks/cloudwatch-logs-test-data'; +import MonacoMock from '../../../mocks/monarch/Monaco'; +import TextModel from '../../../mocks/monarch/TextModel'; import { ResourcesAPI } from '../../../resources/ResourcesAPI'; import { ResourceResponse } from '../../../resources/types'; import { LogGroup, LogGroupField } from '../../../types'; diff --git a/public/app/plugins/datasource/cloudwatch/language/logs/completion/statementPosition.test.ts b/public/app/plugins/datasource/cloudwatch/language/logs/completion/statementPosition.test.ts index c2ef700318f..0eac4cecc43 100644 --- a/public/app/plugins/datasource/cloudwatch/language/logs/completion/statementPosition.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/logs/completion/statementPosition.test.ts @@ -6,9 +6,9 @@ import { commentOnlyQuery, singleLineFullQuery, multiLineFullQuery, -} from '../../../__mocks__/cloudwatch-logs-test-data'; -import MonacoMock from '../../../__mocks__/monarch/Monaco'; -import TextModel from '../../../__mocks__/monarch/TextModel'; +} from '../../../mocks/cloudwatch-logs-test-data'; +import MonacoMock from '../../../mocks/monarch/Monaco'; +import TextModel from '../../../mocks/monarch/TextModel'; import { linkedTokenBuilder } from '../../monarch/linkedTokenBuilder'; import { StatementPosition } from '../../monarch/types'; import cloudWatchLogsLanguageDefinition from '../definition'; diff --git a/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/CompletionItemProvider.test.ts b/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/CompletionItemProvider.test.ts index 887d3dd940d..2b5cf635293 100644 --- a/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/CompletionItemProvider.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/CompletionItemProvider.test.ts @@ -1,9 +1,9 @@ import { Monaco, monacoTypes } from '@grafana/ui'; -import { setupMockedTemplateService } from '../../../__mocks__/CloudWatchDataSource'; -import * as MetricMathTestData from '../../../__mocks__/metric-math-test-data'; -import MonacoMock from '../../../__mocks__/monarch/Monaco'; -import TextModel from '../../../__mocks__/monarch/TextModel'; +import { setupMockedTemplateService } from '../../../mocks/CloudWatchDataSource'; +import * as MetricMathTestData from '../../../mocks/metric-math-test-data'; +import MonacoMock from '../../../mocks/monarch/Monaco'; +import TextModel from '../../../mocks/monarch/TextModel'; import { ResourcesAPI } from '../../../resources/ResourcesAPI'; import cloudWatchMetricMathLanguageDefinition from '../definition'; import { diff --git a/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/statementPosition.test.ts b/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/statementPosition.test.ts index c786dfb5281..7b8c5e41752 100644 --- a/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/statementPosition.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/metric-math/completion/statementPosition.test.ts @@ -1,8 +1,8 @@ import { monacoTypes } from '@grafana/ui'; -import * as MetricMathTestQueries from '../../../__mocks__/metric-math-test-data'; -import MonacoMock from '../../../__mocks__/monarch/Monaco'; -import TextModel from '../../../__mocks__/monarch/TextModel'; +import * as MetricMathTestQueries from '../../../mocks/metric-math-test-data'; +import MonacoMock from '../../../mocks/monarch/Monaco'; +import TextModel from '../../../mocks/monarch/TextModel'; import { linkedTokenBuilder } from '../../monarch/linkedTokenBuilder'; import { StatementPosition } from '../../monarch/types'; import cloudWatchSqlLanguageDefinition from '../definition'; diff --git a/public/app/plugins/datasource/cloudwatch/language/monarch/linkedTokenBuilder.test.ts b/public/app/plugins/datasource/cloudwatch/language/monarch/linkedTokenBuilder.test.ts index 575e94fa615..391b286c522 100644 --- a/public/app/plugins/datasource/cloudwatch/language/monarch/linkedTokenBuilder.test.ts +++ b/public/app/plugins/datasource/cloudwatch/language/monarch/linkedTokenBuilder.test.ts @@ -1,8 +1,8 @@ import { monacoTypes } from '@grafana/ui'; -import { multiLineFullQuery, singleLineFullQuery } from '../../__mocks__/cloudwatch-sql-test-data'; -import MonacoMock from '../../__mocks__/monarch/Monaco'; -import TextModel from '../../__mocks__/monarch/TextModel'; +import { multiLineFullQuery, singleLineFullQuery } from '../../mocks/cloudwatch-sql-test-data'; +import MonacoMock from '../../mocks/monarch/Monaco'; +import TextModel from '../../mocks/monarch/TextModel'; import { SQLTokenTypes } from '../cloudwatch-sql/completion/types'; import cloudWatchSqlLanguageDefinition from '../cloudwatch-sql/definition'; import { DESC, SELECT } from '../cloudwatch-sql/language'; diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/AnnotationQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/mocks/AnnotationQueryRunner.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/AnnotationQueryRunner.ts rename to public/app/plugins/datasource/cloudwatch/mocks/AnnotationQueryRunner.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts b/public/app/plugins/datasource/cloudwatch/mocks/CloudWatchDataSource.ts similarity index 99% rename from public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts rename to public/app/plugins/datasource/cloudwatch/mocks/CloudWatchDataSource.ts index 2e3d5a4401e..ddd4b19e15a 100644 --- a/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchDataSource.ts +++ b/public/app/plugins/datasource/cloudwatch/mocks/CloudWatchDataSource.ts @@ -11,11 +11,12 @@ import { } from '@grafana/data'; import { getBackendSrv, setBackendSrv, DataSourceWithBackend, TemplateSrv } from '@grafana/runtime'; -import { initialCustomVariableModelState } from '../__mocks__/CloudWatchVariables'; import { CloudWatchDatasource } from '../datasource'; import { CloudWatchJsonData } from '../types'; import { getVariableName } from '../utils/templateVariableUtils'; +import { initialCustomVariableModelState } from './CloudWatchVariables'; + const queryMock = jest.fn().mockReturnValue(of({ data: [] })); jest.spyOn(DataSourceWithBackend.prototype, 'query').mockImplementation((args) => queryMock(args)); const separatorMap = new Map([ diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchVariables.ts b/public/app/plugins/datasource/cloudwatch/mocks/CloudWatchVariables.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/CloudWatchVariables.ts rename to public/app/plugins/datasource/cloudwatch/mocks/CloudWatchVariables.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/LogsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/mocks/LogsQueryRunner.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/LogsQueryRunner.ts rename to public/app/plugins/datasource/cloudwatch/mocks/LogsQueryRunner.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/MetricsQueryRunner.ts b/public/app/plugins/datasource/cloudwatch/mocks/MetricsQueryRunner.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/MetricsQueryRunner.ts rename to public/app/plugins/datasource/cloudwatch/mocks/MetricsQueryRunner.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/Request.ts b/public/app/plugins/datasource/cloudwatch/mocks/Request.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/Request.ts rename to public/app/plugins/datasource/cloudwatch/mocks/Request.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/ResourcesAPI.ts b/public/app/plugins/datasource/cloudwatch/mocks/ResourcesAPI.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/ResourcesAPI.ts rename to public/app/plugins/datasource/cloudwatch/mocks/ResourcesAPI.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/commentOnlyQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/commentOnlyQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/commentOnlyQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/commentOnlyQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/multiLineFullQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/multiLineFullQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/multiLineFullQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/multiLineFullQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/multiLineFullQueryWithCaseClause.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/partialQueryWithFunction.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/partialQueryWithFunction.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/partialQueryWithFunction.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/partialQueryWithFunction.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/partialQueryWithSubquery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/partialQueryWithSubquery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/partialQueryWithSubquery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/partialQueryWithSubquery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/singleLineFullQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/singleLineFullQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/singleLineFullQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/singleLineFullQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/whitespaceQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/whitespaceQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-sql-test-data/whitespaceQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-sql-test-data/whitespaceQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/commentOnlyQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/commentOnlyQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/commentOnlyQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/commentOnlyQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/empty.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/empty.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/empty.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/empty.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/filterQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/filterQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/filterQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/filterQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/index.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/index.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/index.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/index.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/multiLineFullQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/multiLineFullQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/multiLineFullQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/multiLineFullQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/newCommandQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/newCommandQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/newCommandQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/newCommandQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/singleLineFullQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/singleLineFullQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/singleLineFullQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/singleLineFullQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/sortQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/sortQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/sortQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/sortQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/whitespaceQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/whitespaceQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-logs-test-data/whitespaceQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-logs-test-data/whitespaceQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-ppl-test-data/multilineQueries.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-ppl-test-data/multilineQueries.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-ppl-test-data/multilineQueries.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-ppl-test-data/multilineQueries.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-ppl-test-data/newCommandQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-ppl-test-data/newCommandQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-ppl-test-data/newCommandQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-ppl-test-data/newCommandQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-ppl-test-data/singleLineQueries.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-ppl-test-data/singleLineQueries.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-ppl-test-data/singleLineQueries.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-ppl-test-data/singleLineQueries.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/index.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/index.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/index.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/index.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/multiLineFullQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/multiLineFullQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/multiLineFullQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/multiLineFullQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/multiLineIncompleteQueryWithoutNamespace.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/multiLineIncompleteQueryWithoutNamespace.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/multiLineIncompleteQueryWithoutNamespace.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/multiLineIncompleteQueryWithoutNamespace.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/singleLineEmptyQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/singleLineEmptyQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/singleLineEmptyQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/singleLineEmptyQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/singleLineFullQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/singleLineFullQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/singleLineFullQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/singleLineFullQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/singleLineTwoQueries.ts b/public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/singleLineTwoQueries.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/cloudwatch-sql-test-data/singleLineTwoQueries.ts rename to public/app/plugins/datasource/cloudwatch/mocks/cloudwatch-sql-test-data/singleLineTwoQueries.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/dashboardOnLoadedEvent.ts b/public/app/plugins/datasource/cloudwatch/mocks/dashboardOnLoadedEvent.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/dashboardOnLoadedEvent.ts rename to public/app/plugins/datasource/cloudwatch/mocks/dashboardOnLoadedEvent.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/dynamic-label-test-data/afterLabelValue.ts b/public/app/plugins/datasource/cloudwatch/mocks/dynamic-label-test-data/afterLabelValue.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/dynamic-label-test-data/afterLabelValue.ts rename to public/app/plugins/datasource/cloudwatch/mocks/dynamic-label-test-data/afterLabelValue.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/dynamic-label-test-data/index.ts b/public/app/plugins/datasource/cloudwatch/mocks/dynamic-label-test-data/index.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/dynamic-label-test-data/index.ts rename to public/app/plugins/datasource/cloudwatch/mocks/dynamic-label-test-data/index.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/dynamic-label-test-data/insideLabelValue.ts b/public/app/plugins/datasource/cloudwatch/mocks/dynamic-label-test-data/insideLabelValue.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/dynamic-label-test-data/insideLabelValue.ts rename to public/app/plugins/datasource/cloudwatch/mocks/dynamic-label-test-data/insideLabelValue.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts b/public/app/plugins/datasource/cloudwatch/mocks/logsTestContext.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/logsTestContext.ts rename to public/app/plugins/datasource/cloudwatch/mocks/logsTestContext.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/afterFunctionQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/afterFunctionQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/afterFunctionQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/afterFunctionQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/index.ts b/public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/index.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/index.ts rename to public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/index.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/secondArgAfterSearchQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/secondArgAfterSearchQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/secondArgAfterSearchQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/secondArgAfterSearchQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/secondArgQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/secondArgQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/secondArgQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/secondArgQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/singleLineEmptyQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/singleLineEmptyQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/singleLineEmptyQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/singleLineEmptyQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/thirdArgAfterSearchQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/thirdArgAfterSearchQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/thirdArgAfterSearchQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/thirdArgAfterSearchQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/withinStringQuery.ts b/public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/withinStringQuery.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/metric-math-test-data/withinStringQuery.ts rename to public/app/plugins/datasource/cloudwatch/mocks/metric-math-test-data/withinStringQuery.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/monarch/Monaco.ts b/public/app/plugins/datasource/cloudwatch/mocks/monarch/Monaco.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/monarch/Monaco.ts rename to public/app/plugins/datasource/cloudwatch/mocks/monarch/Monaco.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/monarch/TextModel.ts b/public/app/plugins/datasource/cloudwatch/mocks/monarch/TextModel.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/monarch/TextModel.ts rename to public/app/plugins/datasource/cloudwatch/mocks/monarch/TextModel.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/queries.ts b/public/app/plugins/datasource/cloudwatch/mocks/queries.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/queries.ts rename to public/app/plugins/datasource/cloudwatch/mocks/queries.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts b/public/app/plugins/datasource/cloudwatch/mocks/sqlUtils.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/sqlUtils.ts rename to public/app/plugins/datasource/cloudwatch/mocks/sqlUtils.ts diff --git a/public/app/plugins/datasource/cloudwatch/__mocks__/timeRange.ts b/public/app/plugins/datasource/cloudwatch/mocks/timeRange.ts similarity index 100% rename from public/app/plugins/datasource/cloudwatch/__mocks__/timeRange.ts rename to public/app/plugins/datasource/cloudwatch/mocks/timeRange.ts diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts index 75df7ff069e..cac628cea6e 100644 --- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts +++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchAnnotationQueryRunner.test.ts @@ -1,5 +1,5 @@ -import { setupMockedAnnotationQueryRunner } from '../__mocks__/AnnotationQueryRunner'; -import { namespaceVariable, regionVariable } from '../__mocks__/CloudWatchDataSource'; +import { setupMockedAnnotationQueryRunner } from '../mocks/AnnotationQueryRunner'; +import { namespaceVariable, regionVariable } from '../mocks/CloudWatchDataSource'; import { CloudWatchAnnotationQuery } from '../types'; describe('CloudWatchAnnotationQueryRunner', () => { diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts index 011bd29a718..f51b642942e 100644 --- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts +++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchLogsQueryRunner.test.ts @@ -9,10 +9,10 @@ import { MutableDataFrame, } from '@grafana/data'; -import { regionVariable } from '../__mocks__/CloudWatchDataSource'; -import { setupMockedLogsQueryRunner } from '../__mocks__/LogsQueryRunner'; -import { LogsRequestMock } from '../__mocks__/Request'; -import { validLogsQuery } from '../__mocks__/queries'; +import { regionVariable } from '../mocks/CloudWatchDataSource'; +import { setupMockedLogsQueryRunner } from '../mocks/LogsQueryRunner'; +import { LogsRequestMock } from '../mocks/Request'; +import { validLogsQuery } from '../mocks/queries'; import { CloudWatchLogsQuery } from '../types'; // Add this import statement import { LOGSTREAM_IDENTIFIER_INTERNAL, LOG_IDENTIFIER_INTERNAL } from './CloudWatchLogsQueryRunner'; diff --git a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts index 7654c6228cd..35978d1382b 100644 --- a/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts +++ b/public/app/plugins/datasource/cloudwatch/query-runner/CloudWatchMetricsQueryRunner.test.ts @@ -11,10 +11,10 @@ import { dimensionVariable, periodIntervalVariable, accountIdVariable, -} from '../__mocks__/CloudWatchDataSource'; -import { initialVariableModelState } from '../__mocks__/CloudWatchVariables'; -import { setupMockedMetricsQueryRunner } from '../__mocks__/MetricsQueryRunner'; -import { validMetricSearchBuilderQuery, validMetricSearchCodeQuery } from '../__mocks__/queries'; +} from '../mocks/CloudWatchDataSource'; +import { initialVariableModelState } from '../mocks/CloudWatchVariables'; +import { setupMockedMetricsQueryRunner } from '../mocks/MetricsQueryRunner'; +import { validMetricSearchBuilderQuery, validMetricSearchCodeQuery } from '../mocks/queries'; import { MetricQueryType, MetricEditorMode, CloudWatchMetricsQuery } from '../types'; jest.mock('@grafana/runtime', () => ({ diff --git a/public/app/plugins/datasource/cloudwatch/resources/ResourceAPI.test.ts b/public/app/plugins/datasource/cloudwatch/resources/ResourceAPI.test.ts index eeefcf20745..7406d48b330 100644 --- a/public/app/plugins/datasource/cloudwatch/resources/ResourceAPI.test.ts +++ b/public/app/plugins/datasource/cloudwatch/resources/ResourceAPI.test.ts @@ -1,4 +1,4 @@ -import { setupMockedResourcesAPI } from '../__mocks__/ResourcesAPI'; +import { setupMockedResourcesAPI } from '../mocks/ResourcesAPI'; describe('ResourcesAPI', () => { describe('describeLogGroup', () => { diff --git a/public/app/plugins/datasource/cloudwatch/tracking.test.ts b/public/app/plugins/datasource/cloudwatch/tracking.test.ts index ea54f98558b..822cf07a5d1 100644 --- a/public/app/plugins/datasource/cloudwatch/tracking.test.ts +++ b/public/app/plugins/datasource/cloudwatch/tracking.test.ts @@ -3,7 +3,7 @@ let handler: (e: DashboardLoadedEvent) => {}; import { config, reportInteraction } from '@grafana/runtime'; import './module'; -import { CloudWatchDashboardLoadedEvent } from './__mocks__/dashboardOnLoadedEvent'; +import { CloudWatchDashboardLoadedEvent } from './mocks/dashboardOnLoadedEvent'; import { CloudWatchQuery } from './types'; jest.mock('@grafana/runtime', () => { diff --git a/public/app/plugins/datasource/cloudwatch/utils/templateVariableUtils.test.ts b/public/app/plugins/datasource/cloudwatch/utils/templateVariableUtils.test.ts index 986cff080e3..676b3b7ea5d 100644 --- a/public/app/plugins/datasource/cloudwatch/utils/templateVariableUtils.test.ts +++ b/public/app/plugins/datasource/cloudwatch/utils/templateVariableUtils.test.ts @@ -1,6 +1,6 @@ import { CustomVariableModel } from '@grafana/data'; -import { logGroupNamesVariable, setupMockedTemplateService, regionVariable } from '../__mocks__/CloudWatchDataSource'; +import { logGroupNamesVariable, setupMockedTemplateService, regionVariable } from '../mocks/CloudWatchDataSource'; import { interpolateStringArrayUsingSingleOrMultiValuedVariable } from './templateVariableUtils'; diff --git a/public/app/plugins/datasource/cloudwatch/variables.test.ts b/public/app/plugins/datasource/cloudwatch/variables.test.ts index 74ec57a3f6b..6ea9116005c 100644 --- a/public/app/plugins/datasource/cloudwatch/variables.test.ts +++ b/public/app/plugins/datasource/cloudwatch/variables.test.ts @@ -1,10 +1,5 @@ -import { - dimensionVariable, - fieldsVariable, - labelsVariable, - setupMockedDataSource, -} from './__mocks__/CloudWatchDataSource'; -import { setupMockedResourcesAPI } from './__mocks__/ResourcesAPI'; +import { dimensionVariable, fieldsVariable, labelsVariable, setupMockedDataSource } from './mocks/CloudWatchDataSource'; +import { setupMockedResourcesAPI } from './mocks/ResourcesAPI'; import { VariableQuery, VariableQueryType } from './types'; import { CloudWatchVariableSupport } from './variables'; diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx index b6183ea3a16..e8f4695f2ba 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import { ConfigEditor } from './ConfigEditor'; -import { createDefaultConfigOptions } from './__mocks__/configOptions'; +import { createDefaultConfigOptions } from './mocks/configOptions'; describe('ConfigEditor', () => { it('should render without error', () => { diff --git a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx index 23d2d8def31..a0df1278d9f 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/ElasticDetails.test.tsx @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import selectEvent from 'react-select-event'; import { ElasticDetails } from './ElasticDetails'; -import { createDefaultConfigOptions } from './__mocks__/configOptions'; +import { createDefaultConfigOptions } from './mocks/configOptions'; describe('ElasticDetails', () => { describe('Max concurrent Shard Requests', () => { diff --git a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx index 40e707b7ad4..3f232df0215 100644 --- a/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx +++ b/public/app/plugins/datasource/elasticsearch/configuration/LogsConfig.test.tsx @@ -1,7 +1,7 @@ import { render, screen, fireEvent } from '@testing-library/react'; import { LogsConfig } from './LogsConfig'; -import { createDefaultConfigOptions } from './__mocks__/configOptions'; +import { createDefaultConfigOptions } from './mocks/configOptions'; describe('ElasticDetails', () => { it('should pass correct data to onChange', () => { diff --git a/public/app/plugins/datasource/elasticsearch/configuration/__mocks__/configOptions.ts b/public/app/plugins/datasource/elasticsearch/configuration/mocks/configOptions.ts similarity index 100% rename from public/app/plugins/datasource/elasticsearch/configuration/__mocks__/configOptions.ts rename to public/app/plugins/datasource/elasticsearch/configuration/mocks/configOptions.ts diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx b/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx index 6c78486696b..ebaf5af0e68 100644 --- a/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx +++ b/public/app/plugins/datasource/grafana-testdata-datasource/QueryEditor.test.tsx @@ -4,10 +4,10 @@ import userEvent from '@testing-library/user-event'; import { selectors } from '@grafana/e2e-selectors'; import { QueryEditor, Props } from './QueryEditor'; -import { scenarios } from './__mocks__/scenarios'; import { defaultQuery } from './constants'; import { TestDataQueryType } from './dataquery'; import { TestDataDataSource } from './datasource'; +import { scenarios } from './mocks/scenarios'; import { defaultStreamQuery } from './runStreams'; beforeEach(() => { diff --git a/public/app/plugins/datasource/grafana-testdata-datasource/__mocks__/scenarios.ts b/public/app/plugins/datasource/grafana-testdata-datasource/mocks/scenarios.ts similarity index 100% rename from public/app/plugins/datasource/grafana-testdata-datasource/__mocks__/scenarios.ts rename to public/app/plugins/datasource/grafana-testdata-datasource/mocks/scenarios.ts diff --git a/public/app/plugins/datasource/influxdb/__mocks__/query.ts b/public/app/plugins/datasource/influxdb/__mocks__/query.ts deleted file mode 100644 index 0d74ecf113e..00000000000 --- a/public/app/plugins/datasource/influxdb/__mocks__/query.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { DataQueryRequest, dateTime } from '@grafana/data'; - -import { InfluxQuery } from '../types'; - -const now = dateTime('2023-09-16T21:26:00Z'); - -export const queryOptions: DataQueryRequest = { - app: 'dashboard', - interval: '10', - intervalMs: 10, - requestId: 'A-testing', - startTime: 0, - range: { - from: dateTime(now).subtract(15, 'minutes'), - to: now, - raw: { - from: 'now-15m', - to: 'now', - }, - }, - rangeRaw: { - from: 'now-15m', - to: 'now', - }, - targets: [], - timezone: 'UTC', - scopedVars: { - interval: { text: '1m', value: '1m' }, - __interval: { text: '1m', value: '1m' }, - __interval_ms: { text: 60000, value: 60000 }, - }, -}; diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.test.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.test.tsx index 7f6f4c13306..837a56b85e4 100644 --- a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.test.tsx +++ b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.test.tsx @@ -1,7 +1,7 @@ import { render, waitFor } from '@testing-library/react'; -import { getMockInfluxDS, getMockDSInstanceSettings } from '../../../../../__mocks__/datasource'; import InfluxDatasource from '../../../../../datasource'; +import { getMockInfluxDS, getMockDSInstanceSettings } from '../../../../../mocks/datasource'; import { DEFAULT_POLICY, InfluxQuery } from '../../../../../types'; import { VisualInfluxQLEditor } from './VisualInfluxQLEditor'; diff --git a/public/app/plugins/datasource/influxdb/datasource.test.ts b/public/app/plugins/datasource/influxdb/datasource.test.ts index cc393af0760..4633f20744a 100644 --- a/public/app/plugins/datasource/influxdb/datasource.test.ts +++ b/public/app/plugins/datasource/influxdb/datasource.test.ts @@ -6,11 +6,11 @@ import config from 'app/core/config'; import { queryBuilder } from '../../../features/variables/shared/testing/builders'; -import { getMockDSInstanceSettings, getMockInfluxDS, mockBackendService, replaceMock } from './__mocks__/datasource'; -import { mockInfluxQueryRequest } from './__mocks__/request'; -import { mockInfluxFetchResponse, mockMetricFindQueryResponse } from './__mocks__/response'; import { BROWSER_MODE_DISABLED_MESSAGE } from './constants'; import InfluxDatasource from './datasource'; +import { getMockDSInstanceSettings, getMockInfluxDS, mockBackendService, replaceMock } from './mocks/datasource'; +import { mockInfluxQueryRequest } from './mocks/request'; +import { mockInfluxFetchResponse, mockMetricFindQueryResponse } from './mocks/response'; import { InfluxQuery, InfluxVersion } from './types'; const fetchMock = mockBackendService(mockInfluxFetchResponse()); diff --git a/public/app/plugins/datasource/influxdb/datasource_sql.test.ts b/public/app/plugins/datasource/influxdb/datasource_sql.test.ts index 72d940d5ad0..21aa827537d 100644 --- a/public/app/plugins/datasource/influxdb/datasource_sql.test.ts +++ b/public/app/plugins/datasource/influxdb/datasource_sql.test.ts @@ -3,10 +3,10 @@ import { lastValueFrom } from 'rxjs'; import { SQLQuery } from '@grafana/sql'; import config from 'app/core/config'; -import { getMockDSInstanceSettings, mockBackendService, mockTemplateSrv } from './__mocks__/datasource'; -import { mockInfluxQueryRequest } from './__mocks__/request'; -import { mockInfluxSQLFetchResponse } from './__mocks__/response'; import InfluxDatasource from './datasource'; +import { getMockDSInstanceSettings, mockBackendService, mockTemplateSrv } from './mocks/datasource'; +import { mockInfluxQueryRequest } from './mocks/request'; +import { mockInfluxSQLFetchResponse } from './mocks/response'; import { InfluxVersion } from './types'; config.featureToggles.influxdbBackendMigration = true; diff --git a/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.test.ts b/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.test.ts index bea4f7bfc98..45a0d3df96e 100644 --- a/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.test.ts +++ b/public/app/plugins/datasource/influxdb/fsql/datasource.flightsql.test.ts @@ -1,7 +1,7 @@ import { TemplateSrv } from '@grafana/runtime'; -import { getMockDSInstanceSettings, mockBackendService } from '../__mocks__/datasource'; -import { mockInfluxSQLVariableFetchResponse } from '../__mocks__/response'; +import { getMockDSInstanceSettings, mockBackendService } from '../mocks/datasource'; +import { mockInfluxSQLVariableFetchResponse } from '../mocks/response'; import { FlightSQLDatasource } from './datasource.flightsql'; diff --git a/public/app/plugins/datasource/influxdb/influxql_metadata_query.test.ts b/public/app/plugins/datasource/influxdb/influxql_metadata_query.test.ts index e39d42fd83e..c657abed2fd 100644 --- a/public/app/plugins/datasource/influxdb/influxql_metadata_query.test.ts +++ b/public/app/plugins/datasource/influxdb/influxql_metadata_query.test.ts @@ -1,7 +1,7 @@ import config from 'app/core/config'; -import { getMockInfluxDS } from './__mocks__/datasource'; import { getAllMeasurements, getAllPolicies, getFieldKeys, getTagKeys, getTagValues } from './influxql_metadata_query'; +import { getMockInfluxDS } from './mocks/datasource'; import { InfluxQuery, InfluxVariableQuery } from './types'; describe('influx_metadata_query', () => { diff --git a/public/app/plugins/datasource/influxdb/influxql_query_builder.test.ts b/public/app/plugins/datasource/influxdb/influxql_query_builder.test.ts index 30b9c86b984..bf83c0683b3 100644 --- a/public/app/plugins/datasource/influxdb/influxql_query_builder.test.ts +++ b/public/app/plugins/datasource/influxdb/influxql_query_builder.test.ts @@ -1,5 +1,5 @@ -import { templateSrvStub as templateService } from './__mocks__/datasource'; import { buildMetadataQuery } from './influxql_query_builder'; +import { templateSrvStub as templateService } from './mocks/datasource'; import { DEFAULT_POLICY } from './types'; describe('influxql-query-builder', () => { diff --git a/public/app/plugins/datasource/influxdb/__mocks__/datasource.ts b/public/app/plugins/datasource/influxdb/mocks/datasource.ts similarity index 100% rename from public/app/plugins/datasource/influxdb/__mocks__/datasource.ts rename to public/app/plugins/datasource/influxdb/mocks/datasource.ts diff --git a/public/app/plugins/datasource/influxdb/__mocks__/request.ts b/public/app/plugins/datasource/influxdb/mocks/request.ts similarity index 100% rename from public/app/plugins/datasource/influxdb/__mocks__/request.ts rename to public/app/plugins/datasource/influxdb/mocks/request.ts diff --git a/public/app/plugins/datasource/influxdb/__mocks__/response.ts b/public/app/plugins/datasource/influxdb/mocks/response.ts similarity index 100% rename from public/app/plugins/datasource/influxdb/__mocks__/response.ts rename to public/app/plugins/datasource/influxdb/mocks/response.ts diff --git a/public/app/plugins/datasource/influxdb/response_parser.test.ts b/public/app/plugins/datasource/influxdb/response_parser.test.ts index e206dca77a8..247e1b74491 100644 --- a/public/app/plugins/datasource/influxdb/response_parser.test.ts +++ b/public/app/plugins/datasource/influxdb/response_parser.test.ts @@ -6,8 +6,8 @@ import { FetchResponse } from '@grafana/runtime'; import config from 'app/core/config'; import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__ -import { getMockDSInstanceSettings, getMockInfluxDS } from './__mocks__/datasource'; import InfluxQueryModel from './influx_query_model'; +import { getMockDSInstanceSettings, getMockInfluxDS } from './mocks/datasource'; import ResponseParser, { getSelectedParams } from './response_parser'; import { InfluxQuery } from './types'; diff --git a/public/app/plugins/datasource/loki/LanguageProvider.test.ts b/public/app/plugins/datasource/loki/LanguageProvider.test.ts index 6a888eedec2..dec28df9f0a 100644 --- a/public/app/plugins/datasource/loki/LanguageProvider.test.ts +++ b/public/app/plugins/datasource/loki/LanguageProvider.test.ts @@ -2,11 +2,11 @@ import { AbstractLabelOperator, DataFrame, TimeRange, dateTime, getDefaultTimeRa import { config } from '@grafana/runtime'; import LanguageProvider from './LanguageProvider'; -import { createDetectedFieldValuesMetadataRequest } from './__mocks__/createDetectedFieldValuesMetadataRequest'; -import { createDetectedFieldsMetadataRequest } from './__mocks__/createDetectedFieldsMetadataRequest'; -import { createLokiDatasource } from './__mocks__/datasource'; -import { createMetadataRequest } from './__mocks__/metadataRequest'; import { DEFAULT_MAX_LINES_SAMPLE, LokiDatasource } from './datasource'; +import { createDetectedFieldValuesMetadataRequest } from './mocks/createDetectedFieldValuesMetadataRequest'; +import { createDetectedFieldsMetadataRequest } from './mocks/createDetectedFieldsMetadataRequest'; +import { createLokiDatasource } from './mocks/datasource'; +import { createMetadataRequest } from './mocks/metadataRequest'; import { extractLogParserFromDataFrame, extractLabelKeysFromDataFrame, diff --git a/public/app/plugins/datasource/loki/LogContextProvider.test.ts b/public/app/plugins/datasource/loki/LogContextProvider.test.ts index dcd86744b47..109003ff15a 100644 --- a/public/app/plugins/datasource/loki/LogContextProvider.test.ts +++ b/public/app/plugins/datasource/loki/LogContextProvider.test.ts @@ -17,7 +17,7 @@ import { LOKI_LOG_CONTEXT_PRESERVED_LABELS, SHOULD_INCLUDE_PIPELINE_OPERATIONS, } from './LogContextProvider'; -import { createLokiDatasource } from './__mocks__/datasource'; +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 0e874d898f5..08697d0f008 100644 --- a/public/app/plugins/datasource/loki/LokiVariableSupport.test.ts +++ b/public/app/plugins/datasource/loki/LokiVariableSupport.test.ts @@ -3,9 +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 } from './mocks/datasource'; +import { createMetadataRequest } from './mocks/metadataRequest'; import { LokiVariableQueryType } from './types'; describe('LokiVariableSupport', () => { diff --git a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx index 9ab6f7cc667..5897d65018c 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx @@ -5,7 +5,7 @@ import { cloneDeep, defaultsDeep } from 'lodash'; import { CoreApp } from '@grafana/data'; import { QueryEditorMode } from '@grafana/plugin-ui'; -import { createLokiDatasource } from '../__mocks__/datasource'; +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 a7a55a5b709..ef3b3084c18 100644 --- a/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx +++ b/public/app/plugins/datasource/loki/components/LokiQueryEditorByApp.test.tsx @@ -3,7 +3,7 @@ import { noop } from 'lodash'; import { CoreApp } from '@grafana/data'; -import { createLokiDatasource } from '../__mocks__/datasource'; +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 c9412197892..a7d7e3e0e88 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 { ComponentProps } from 'react'; import { dateTime } from '@grafana/data'; -import { createLokiDatasource } from '../__mocks__/datasource'; +import { createLokiDatasource } from '../mocks/datasource'; import { LokiQueryField } from './LokiQueryField'; import { Props as MonacoProps } from './monaco-query-field/MonacoQueryFieldProps'; diff --git a/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/VariableQueryEditor.test.tsx index 7644c76bb79..5f251b63a21 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 { select } from 'react-select-event'; import { TimeRange, dateTime } from '@grafana/data'; import { TemplateSrv } from '@grafana/runtime'; -import { createLokiDatasource } from '../__mocks__/datasource'; +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 ce1aabe2391..0212afd7603 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 @@ -2,7 +2,7 @@ import { render, screen, waitFor } from '@testing-library/react'; import { selectors } from '@grafana/e2e-selectors'; -import { createLokiDatasource } from '../../__mocks__/datasource'; +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 71b59d08bb1..098232b4a9e 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 @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import { selectors } from '@grafana/e2e-selectors'; -import { createLokiDatasource } from '../../__mocks__/datasource'; +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 83e102ad442..d558d774dc1 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/datasource'; 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 de76f3fc915..230a117606a 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'; import LokiLanguageProvider from '../../../LanguageProvider'; -import { createLokiDatasource } from '../../../__mocks__/datasource'; import { LokiDatasource } from '../../../datasource'; +import { createLokiDatasource } from '../../../mocks/datasource'; 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 5db292ff3ef..abca10f84dc 100644 --- a/public/app/plugins/datasource/loki/configuration/AlertingSettings.test.tsx +++ b/public/app/plugins/datasource/loki/configuration/AlertingSettings.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { createDefaultConfigOptions } from '../__mocks__/datasource'; +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 214c68854c0..6524eb4aada 100644 --- a/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx +++ b/public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { createDefaultConfigOptions } from '../__mocks__/datasource'; +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 7c98dbf6dd8..c63332522cd 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -33,9 +33,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 } from './mocks/datasource'; +import { createMetadataRequest } from './mocks/metadataRequest'; import { runSplitQuery } from './querySplitting'; import { LokiOptions, LokiQuery, LokiQueryType, LokiVariableQueryType, SupportingQueryType } from './types'; diff --git a/public/app/plugins/datasource/loki/mergeResponses.test.ts b/public/app/plugins/datasource/loki/mergeResponses.test.ts index 38f3833d6b0..6191a50b731 100644 --- a/public/app/plugins/datasource/loki/mergeResponses.test.ts +++ b/public/app/plugins/datasource/loki/mergeResponses.test.ts @@ -2,8 +2,8 @@ import { cloneDeep } from 'lodash'; import { DataQueryResponse, Field, FieldType, QueryResultMetaStat } from '@grafana/data'; -import { getMockFrames } from './__mocks__/frames'; import { cloneQueryResponse, combineResponses } from './mergeResponses'; +import { getMockFrames } from './mocks/frames'; describe('cloneQueryResponse', () => { const { logFrameA } = getMockFrames(); diff --git a/public/app/plugins/datasource/loki/__mocks__/createDetectedFieldValuesMetadataRequest.ts b/public/app/plugins/datasource/loki/mocks/createDetectedFieldValuesMetadataRequest.ts similarity index 100% rename from public/app/plugins/datasource/loki/__mocks__/createDetectedFieldValuesMetadataRequest.ts rename to public/app/plugins/datasource/loki/mocks/createDetectedFieldValuesMetadataRequest.ts diff --git a/public/app/plugins/datasource/loki/__mocks__/createDetectedFieldsMetadataRequest.ts b/public/app/plugins/datasource/loki/mocks/createDetectedFieldsMetadataRequest.ts similarity index 100% rename from public/app/plugins/datasource/loki/__mocks__/createDetectedFieldsMetadataRequest.ts rename to public/app/plugins/datasource/loki/mocks/createDetectedFieldsMetadataRequest.ts diff --git a/public/app/plugins/datasource/loki/__mocks__/datasource.ts b/public/app/plugins/datasource/loki/mocks/datasource.ts similarity index 100% rename from public/app/plugins/datasource/loki/__mocks__/datasource.ts rename to public/app/plugins/datasource/loki/mocks/datasource.ts diff --git a/public/app/plugins/datasource/loki/__mocks__/frames.ts b/public/app/plugins/datasource/loki/mocks/frames.ts similarity index 100% rename from public/app/plugins/datasource/loki/__mocks__/frames.ts rename to public/app/plugins/datasource/loki/mocks/frames.ts diff --git a/public/app/plugins/datasource/loki/__mocks__/metadataRequest.ts b/public/app/plugins/datasource/loki/mocks/metadataRequest.ts similarity index 100% rename from public/app/plugins/datasource/loki/__mocks__/metadataRequest.ts rename to public/app/plugins/datasource/loki/mocks/metadataRequest.ts diff --git a/public/app/plugins/datasource/loki/querySplitting.test.ts b/public/app/plugins/datasource/loki/querySplitting.test.ts index 9394adf938b..e57c3053c32 100644 --- a/public/app/plugins/datasource/loki/querySplitting.test.ts +++ b/public/app/plugins/datasource/loki/querySplitting.test.ts @@ -3,11 +3,11 @@ import { of } from 'rxjs'; import { DataQueryRequest, dateTime, LoadingState } from '@grafana/data'; import { config } from '@grafana/runtime'; -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 } from './mocks/datasource'; +import { getMockFrames } from './mocks/frames'; import { runSplitQuery } from './querySplitting'; import { trackGroupedQueries } from './tracking'; import { LokiQuery, LokiQueryDirection, LokiQueryType } from './types'; 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 6d298cc267e..ba32a7ddac6 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelBrowserModal.test.tsx @@ -1,7 +1,7 @@ import { render, screen, waitFor } from '@testing-library/react'; -import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiDatasource } from '../../datasource'; +import { createLokiDatasource } from '../../mocks/datasource'; import { LokiQuery } from '../../types'; import { LabelBrowserModal, Props } from './LabelBrowserModal'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.test.tsx index 7095c769d64..22dd10dda7a 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LabelParamEditor.test.tsx @@ -6,8 +6,8 @@ import { DataSourceApi } from '@grafana/data'; import { QueryBuilderOperation, QueryBuilderOperationParamDef } from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; -import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiDatasource } from '../../datasource'; +import { createLokiDatasource } from '../../mocks/datasource'; import { LokiQueryModeller } from '../LokiQueryModeller'; import { LokiOperationId } from '../types'; 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 137d733b7bf..2d3d1a73461 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.test.tsx @@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'; import { dateTime } from '@grafana/data'; import { config } from '@grafana/runtime'; -import { createLokiDatasource } from '../../__mocks__/datasource'; +import { createLokiDatasource } from '../../mocks/datasource'; import { LokiOperationId, LokiVisualQuery } from '../types'; import { LokiQueryBuilder, Props, TIME_SPAN_TO_TRIGGER_SAMPLES } 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 29425688459..3c8c5c94704 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderContainer.test.tsx @@ -1,7 +1,7 @@ import { render, screen, waitFor, findAllByRole } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { createLokiDatasource } from '../../__mocks__/datasource'; +import { createLokiDatasource } from '../../mocks/datasource'; import { LokiQueryBuilderContainer } from './LokiQueryBuilderContainer'; diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx index b852f1520cd..c03de3eb2e8 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx @@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'; import { CoreApp, LogSortOrderChangeEvent, LogsSortOrder, store } from '@grafana/data'; import { config, getAppEvents } from '@grafana/runtime'; -import { createLokiDatasource } from '../../__mocks__/datasource'; +import { createLokiDatasource } from '../../mocks/datasource'; import { LokiQuery, LokiQueryDirection, LokiQueryType } from '../../types'; import { LokiQueryBuilderOptions, Props } from './LokiQueryBuilderOptions'; 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 305e38c24d5..729846fdab8 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryCodeEditor.test.tsx @@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react'; import { selectors } from '@grafana/e2e-selectors'; -import { createLokiDatasource } from '../../__mocks__/datasource'; +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 768560002e3..95f5c5f1f39 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.test.tsx @@ -1,7 +1,7 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { createLokiDatasource } from '../../__mocks__/datasource'; +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 ce281f06b43..b0c2782e4cf 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/NestedQueryList.test.tsx @@ -1,8 +1,8 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiDatasource } from '../../datasource'; +import { createLokiDatasource } from '../../mocks/datasource'; 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 bf69d3587fb..beacb3736b4 100644 --- a/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx +++ b/public/app/plugins/datasource/loki/querybuilder/components/UnwrapParamEditor.test.tsx @@ -6,8 +6,8 @@ import { DataFrame, DataSourceApi, FieldType, toDataFrame } from '@grafana/data' import { QueryBuilderOperation, QueryBuilderOperationParamDef } from '@grafana/plugin-ui'; import { config } from '@grafana/runtime'; -import { createLokiDatasource } from '../../__mocks__/datasource'; import { LokiDatasource } from '../../datasource'; +import { createLokiDatasource } from '../../mocks/datasource'; import { LokiQueryModeller } from '../LokiQueryModeller'; import { LokiOperationId } from '../types'; diff --git a/public/app/plugins/datasource/loki/shardQuerySplitting.test.ts b/public/app/plugins/datasource/loki/shardQuerySplitting.test.ts index 51b8bb308ee..566eddeae81 100644 --- a/public/app/plugins/datasource/loki/shardQuerySplitting.test.ts +++ b/public/app/plugins/datasource/loki/shardQuerySplitting.test.ts @@ -2,9 +2,9 @@ import { of } from 'rxjs'; import { DataQueryRequest, DataQueryResponse, dateTime, LoadingState } from '@grafana/data'; -import { createLokiDatasource } from './__mocks__/datasource'; -import { getMockFrames } from './__mocks__/frames'; import { LokiDatasource } from './datasource'; +import { createLokiDatasource } from './mocks/datasource'; +import { getMockFrames } from './mocks/frames'; import { runShardSplitQuery } from './shardQuerySplitting'; import { LokiQuery, LokiQueryDirection } from './types';