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

Chore: Remove react-testing-lib from bundles (#50442)

Browse Source 
* refactor(selectoptiontest): move helper function out of grafana/ui so testing-lib isn't in bundle

* test(selectoptionintest): update import location of helper function

* test(amroutes): put back missing selectOptionInTest helper

* test(selectoptionintest): clean up remaining file imports / exports

* test(queryeditor): fix failing import

* refactor(grafana-ui): reuse selectOptionInTest in SelectBase test
This commit is contained in:
Jack Westbrook 2022-06-09 11:10:48 +02:00 committed by GitHub
parent ab4171770e
commit ccd75d72f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/grafana-ui/src/components/Select/SelectBase.test.tsx
View File

@ -4,8 +4,9 @@ import React, { useState } from 'react';
import { SelectableValue } from '@grafana/data'; import { SelectableValue } from '@grafana/data';
import { selectOptionInTest } from '../../../../../public/test/helpers/selectOptionInTest';
import { SelectBase } from './SelectBase'; import { SelectBase } from './SelectBase';
import { selectOptionInTest } from './test-utils';
describe('SelectBase', () => { describe('SelectBase', () => {
const onChangeHandler = () => jest.fn(); const onChangeHandler = () => jest.fn();

1
packages/grafana-ui/src/components/index.ts
View File

@ -205,7 +205,6 @@ export { FieldArray } from './Forms/FieldArray';
// Select // Select
export { default as resetSelectStyles } from './Select/resetSelectStyles'; export { default as resetSelectStyles } from './Select/resetSelectStyles';
export { selectOptionInTest } from './Select/test-utils';
export * from './Select/Select'; export * from './Select/Select';
export { DropdownIndicator } from './Select/DropdownIndicator'; export { DropdownIndicator } from './Select/DropdownIndicator';
export { getSelectStyles } from './Select/getSelectStyles'; export { getSelectStyles } from './Select/getSelectStyles';

2
public/app/features/alerting/unified/AmRoutes.test.tsx
View File

@ -3,10 +3,10 @@ import userEvent from '@testing-library/user-event';
import React from 'react'; import React from 'react';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { Router } from 'react-router-dom'; import { Router } from 'react-router-dom';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { byLabelText, byRole, byTestId, byText } from 'testing-library-selector'; import { byLabelText, byRole, byTestId, byText } from 'testing-library-selector';
import { locationService, setDataSourceSrv } from '@grafana/runtime'; import { locationService, setDataSourceSrv } from '@grafana/runtime';
import { selectOptionInTest } from '@grafana/ui';
import { contextSrv } from 'app/core/services/context_srv'; import { contextSrv } from 'app/core/services/context_srv';
import { import {
AlertManagerCortexConfig, AlertManagerCortexConfig,

2
public/app/features/alerting/unified/Receivers.test.tsx
View File

@ -3,10 +3,10 @@ import userEvent from '@testing-library/user-event';
import React from 'react'; import React from 'react';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { Router } from 'react-router-dom'; import { Router } from 'react-router-dom';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { byLabelText, byPlaceholderText, byRole, byTestId, byText } from 'testing-library-selector'; import { byLabelText, byPlaceholderText, byRole, byTestId, byText } from 'testing-library-selector';
import { locationService, setDataSourceSrv } from '@grafana/runtime'; import { locationService, setDataSourceSrv } from '@grafana/runtime';
import { selectOptionInTest } from '@grafana/ui';
import { interceptLinkClicks } from 'app/core/navigation/patch/interceptLinkClicks'; import { interceptLinkClicks } from 'app/core/navigation/patch/interceptLinkClicks';
import { contextSrv } from 'app/core/services/context_srv'; import { contextSrv } from 'app/core/services/context_srv';
import store from 'app/core/store'; import store from 'app/core/store';

2
public/app/features/alerting/unified/RuleEditor.test.tsx
View File

@ -3,11 +3,11 @@ import userEvent, { PointerEventsCheckLevel } from '@testing-library/user-event'
import React from 'react'; import React from 'react';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { Route, Router } from 'react-router-dom'; import { Route, Router } from 'react-router-dom';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { byLabelText, byRole, byTestId, byText } from 'testing-library-selector'; import { byLabelText, byRole, byTestId, byText } from 'testing-library-selector';
import { DataSourceInstanceSettings } from '@grafana/data'; import { DataSourceInstanceSettings } from '@grafana/data';
import { BackendSrv, locationService, setBackendSrv, setDataSourceSrv } from '@grafana/runtime'; import { BackendSrv, locationService, setBackendSrv, setDataSourceSrv } from '@grafana/runtime';
import { selectOptionInTest } from '@grafana/ui';
import { contextSrv } from 'app/core/services/context_srv'; import { contextSrv } from 'app/core/services/context_srv';
import { DashboardSearchHit } from 'app/features/search/types'; import { DashboardSearchHit } from 'app/features/search/types';
import { configureStore } from 'app/store/configureStore'; import { configureStore } from 'app/store/configureStore';

2
public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx
View File

@ -1,10 +1,10 @@
import { render, screen } from '@testing-library/react'; import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event'; import userEvent from '@testing-library/user-event';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { byRole } from 'testing-library-selector'; import { byRole } from 'testing-library-selector';
import { selectors } from '@grafana/e2e-selectors'; import { selectors } from '@grafana/e2e-selectors';
import { selectOptionInTest } from '@grafana/ui';
import { DashboardModel } from '../../state'; import { DashboardModel } from '../../state';

2
public/app/features/dimensions/editors/ValueMappingsEditor/ValueMappingsEditorModal.test.tsx
View File

@ -1,9 +1,9 @@
import { fireEvent, render, screen } from '@testing-library/react'; import { fireEvent, render, screen } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { MappingType } from '@grafana/data'; import { MappingType } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors'; import { selectors } from '@grafana/e2e-selectors';
import { selectOptionInTest } from '@grafana/ui';
import { ValueMappingsEditorModal, Props } from './ValueMappingsEditorModal'; import { ValueMappingsEditorModal, Props } from './ValueMappingsEditorModal';

2
public/app/features/search/components/DashboardSearch.test.tsx
View File

@ -1,9 +1,9 @@
import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'; import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { selectors } from '@grafana/e2e-selectors'; import { selectors } from '@grafana/e2e-selectors';
import { locationService, setEchoSrv } from '@grafana/runtime'; import { locationService, setEchoSrv } from '@grafana/runtime';
import { selectOptionInTest } from '@grafana/ui';
import * as MockSearchSrv from 'app/core/services/__mocks__/search_srv'; import * as MockSearchSrv from 'app/core/services/__mocks__/search_srv';
import { Echo } from 'app/core/services/echo/Echo'; import { Echo } from 'app/core/services/echo/Echo';
import * as SearchSrv from 'app/core/services/search_srv'; import * as SearchSrv from 'app/core/services/search_srv';

3
public/app/features/search/components/SearchResultsFilter.test.tsx
View File

@ -1,7 +1,6 @@
import { fireEvent, render, screen } from '@testing-library/react'; import { fireEvent, render, screen } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { selectOptionInTest } from '@grafana/ui';
import { SearchLayout } from '../types'; import { SearchLayout } from '../types';

2
public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx
View File

@ -1,8 +1,8 @@
import { fireEvent, render, screen } from '@testing-library/react'; import { fireEvent, render, screen } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { toDataFrame, FieldType } from '@grafana/data'; import { toDataFrame, FieldType } from '@grafana/data';
import { selectOptionInTest } from '@grafana/ui';
import { Props, ConfigFromQueryTransformerEditor } from './ConfigFromQueryTransformerEditor'; import { Props, ConfigFromQueryTransformerEditor } from './ConfigFromQueryTransformerEditor';

2
public/app/features/transformers/fieldToConfigMapping/FieldToConfigMappingEditor.test.tsx
View File

@ -1,9 +1,9 @@
import { fireEvent, render, screen, getByText, getByLabelText } from '@testing-library/react'; import { fireEvent, render, screen, getByText, getByLabelText } from '@testing-library/react';
import userEvent from '@testing-library/user-event'; import userEvent from '@testing-library/user-event';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { toDataFrame, FieldType } from '@grafana/data'; import { toDataFrame, FieldType } from '@grafana/data';
import { selectOptionInTest } from '@grafana/ui';
import { Props, FieldToConfigMappingEditor } from './FieldToConfigMappingEditor'; import { Props, FieldToConfigMappingEditor } from './FieldToConfigMappingEditor';

2
public/app/features/transformers/rowsToFields/RowsToFieldsTransformerEditor.test.tsx
View File

@ -1,8 +1,8 @@
import { fireEvent, render, screen } from '@testing-library/react'; import { fireEvent, render, screen } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { toDataFrame, FieldType } from '@grafana/data'; import { toDataFrame, FieldType } from '@grafana/data';
import { selectOptionInTest } from '@grafana/ui';
import { Props, RowsToFieldsTransformerEditor } from './RowsToFieldsTransformerEditor'; import { Props, RowsToFieldsTransformerEditor } from './RowsToFieldsTransformerEditor';

4
public/app/features/variables/adhoc/AdHocVariableEditor.test.tsx
View File

@ -1,8 +1,6 @@
import { render, screen } from '@testing-library/react'; import { render, screen } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest, getSelectParent } from 'test/helpers/selectOptionInTest';
import { selectOptionInTest } from '@grafana/ui';
import { getSelectParent } from '@grafana/ui/src/components/Select/test-utils';
import { adHocBuilder } from '../shared/testing/builders'; import { adHocBuilder } from '../shared/testing/builders';

4
public/app/features/variables/datasource/DataSourceVariableEditor.test.tsx
View File

@ -1,8 +1,6 @@
import { render, screen, fireEvent } from '@testing-library/react'; import { render, screen, fireEvent } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest, getSelectParent } from 'test/helpers/selectOptionInTest';
import { selectOptionInTest } from '@grafana/ui';
import { getSelectParent } from '@grafana/ui/src/components/Select/test-utils';
import { DataSourceVariableEditorUnConnected as DataSourceVariableEditor } from './DataSourceVariableEditor'; import { DataSourceVariableEditorUnConnected as DataSourceVariableEditor } from './DataSourceVariableEditor';
import { initialDataSourceVariableModelState } from './reducer'; import { initialDataSourceVariableModelState } from './reducer';

3
public/app/plugins/datasource/cloudwatch/components/SQLBuilderEditor/SQLBuilderSelectRow.test.tsx
View File

@ -1,7 +1,6 @@
import { act, render, screen } from '@testing-library/react'; import { act, render, screen } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { selectOptionInTest } from '@grafana/ui';
import { setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource'; import { setupMockedDataSource } from '../../__mocks__/CloudWatchDataSource';
import { QueryEditorExpressionType, QueryEditorPropertyType } from '../../expressions'; import { QueryEditorExpressionType, QueryEditorPropertyType } from '../../expressions';

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

@ -2,8 +2,7 @@ import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event'; import userEvent from '@testing-library/user-event';
import React from 'react'; import React from 'react';
import { openMenu } from 'react-select-event'; import { openMenu } from 'react-select-event';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { selectOptionInTest } from '@grafana/ui';
import createMockDatasource from '../../__mocks__/datasource'; import createMockDatasource from '../../__mocks__/datasource';
import createMockPanelData from '../../__mocks__/panelData'; import createMockPanelData from '../../__mocks__/panelData';

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

@ -1,7 +1,6 @@
import { render, screen, waitFor } from '@testing-library/react'; import { render, screen, waitFor } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { selectOptionInTest } from '@grafana/ui';
import createMockDatasource from '../../__mocks__/datasource'; import createMockDatasource from '../../__mocks__/datasource';
import createMockPanelData from '../../__mocks__/panelData'; import createMockPanelData from '../../__mocks__/panelData';

2
public/app/plugins/datasource/grafana-azure-monitor-datasource/components/NewMetricsQueryEditor/MetricsQueryEditor.test.tsx
View File

@ -1,9 +1,9 @@
import { render, screen } from '@testing-library/react'; import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event'; import userEvent from '@testing-library/user-event';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { config } from '@grafana/runtime'; import { config } from '@grafana/runtime';
import { selectOptionInTest } from '@grafana/ui';
import createMockDatasource from '../../__mocks__/datasource'; import createMockDatasource from '../../__mocks__/datasource';
import { createMockInstanceSetttings } from '../../__mocks__/instanceSettings'; import { createMockInstanceSetttings } from '../../__mocks__/instanceSettings';

3
public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/QueryEditor.test.tsx
View File

@ -1,5 +1,6 @@
import { render, screen, waitFor } from '@testing-library/react'; import { render, screen, waitFor } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { config } from '@grafana/runtime'; import { config } from '@grafana/runtime';
import * as ui from '@grafana/ui'; import * as ui from '@grafana/ui';
@ -52,7 +53,7 @@ describe('Azure Monitor QueryEditor', () => {
await waitFor(() => expect(screen.getByTestId('azure-monitor-query-editor')).toBeInTheDocument()); await waitFor(() => expect(screen.getByTestId('azure-monitor-query-editor')).toBeInTheDocument());
const metrics = await screen.findByLabelText('Service'); const metrics = await screen.findByLabelText('Service');
await ui.selectOptionInTest(metrics, 'Logs'); await selectOptionInTest(metrics, 'Logs');
expect(onChange).toHaveBeenCalledWith({ expect(onChange).toHaveBeenCalledWith({
...mockQuery, ...mockQuery,

3
public/app/plugins/datasource/influxdb/components/RawInfluxQLEditor.test.tsx
View File

@ -1,8 +1,7 @@
import { render, screen } from '@testing-library/react'; import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event'; import userEvent from '@testing-library/user-event';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { selectOptionInTest } from '@grafana/ui';
import { InfluxQuery } from '../types'; import { InfluxQuery } from '../types';

2
public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderOptions.test.tsx
View File

@ -1,8 +1,8 @@
import { render, screen } from '@testing-library/react'; import { render, screen } from '@testing-library/react';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { CoreApp } from '@grafana/data'; import { CoreApp } from '@grafana/data';
import { selectOptionInTest } from '@grafana/ui';
import { PromQuery } from '../../types'; import { PromQuery } from '../../types';
import { getQueryWithDefaults } from '../state'; import { getQueryWithDefaults } from '../state';

2
public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilters.test.tsx
View File

@ -1,8 +1,8 @@
import { render, screen } from '@testing-library/react'; import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event'; import userEvent from '@testing-library/user-event';
import React from 'react'; import React from 'react';
import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
import { selectOptionInTest } from '../../../../../../../packages/grafana-ui';
import { getLabelSelects } from '../testUtils'; import { getLabelSelects } from '../testUtils';
import { LabelFilters } from './LabelFilters'; import { LabelFilters } from './LabelFilters';

0
packages/grafana-ui/src/components/Select/test-utils.ts → public/test/helpers/selectOptionInTest.ts
View File