From 0c17237804761425f2cf4b6306b99b8e23c2b703 Mon Sep 17 00:00:00 2001 From: Linus Pahl <46300478+linuspahl@users.noreply.github.com> Date: Fri, 27 Feb 2026 16:58:38 +0100 Subject: [PATCH] Render `DefaultQueryParamProvider` by default in component unit tests. (#25145) * Render DefaultQueryParamProvider by default in wrappedTestingLibrary and remove redundant test wrappers. * Fix `WidgetFocusProvider.test`. * Fixing linter hints * Fixing test --- .../hooks/useUrlQueryFilters.test.tsx | 7 +---- .../slicing/Slicing.test.tsx | 21 ++++++-------- .../components/common/PaginatedList.test.tsx | 24 ++++++---------- .../ProfilesList.test.tsx | 10 ++----- .../IndexSetFieldTypesList.test.tsx | 10 ++----- .../SetProfileModal.test.tsx | 7 +---- .../lookup-tables/adapter-list/list.test.tsx | 9 ++---- .../lookup-tables/cache-list/list.test.tsx | 9 ++---- .../lookup-table-list/list.test.tsx | 9 ++---- .../RolesOverview/RolesOverview.test.tsx | 8 +----- .../SidecarFailureTrackingList.test.tsx | 28 ++++++++----------- .../StreamConnectedPipelines.test.tsx | 8 +----- .../StreamsOverview/StreamsOverview.test.tsx | 8 +----- .../UsersOverview/UsersOverview.test.tsx | 8 +----- .../src/pages/IndexSetFieldTypesPage.test.tsx | 10 ++----- .../src/pages/RulesPage.test.tsx | 9 ++---- .../contexts/WidgetFocusProvider.test.tsx | 10 +++---- .../DashboardActions.test.tsx | 7 +---- .../DashboardsOverview.test.tsx | 7 +---- .../src/views/pages/DashboardsPage.test.tsx | 7 +---- .../test/WrappingContainer.tsx | 6 +++- 21 files changed, 65 insertions(+), 157 deletions(-) diff --git a/graylog2-web-interface/src/components/common/EntityFilters/hooks/useUrlQueryFilters.test.tsx b/graylog2-web-interface/src/components/common/EntityFilters/hooks/useUrlQueryFilters.test.tsx index 9934d88da8..23faf3e6a1 100644 --- a/graylog2-web-interface/src/components/common/EntityFilters/hooks/useUrlQueryFilters.test.tsx +++ b/graylog2-web-interface/src/components/common/EntityFilters/hooks/useUrlQueryFilters.test.tsx @@ -20,7 +20,6 @@ import * as React from 'react'; import { MemoryRouter } from 'react-router-dom'; import { useQueryParam } from 'routing/QueryParams'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import { asMock } from 'helpers/mocking'; import useUrlQueryFilters from './useUrlQueryFilters'; @@ -31,11 +30,7 @@ jest.mock('routing/QueryParams', () => ({ })); describe('useUrlQueryFilters', () => { - const wrapper = ({ children }: { children: React.ReactNode }) => ( - - {children} - - ); + const wrapper = ({ children }: { children: React.ReactNode }) => {children}; beforeEach(() => { asMock(useQueryParam).mockReturnValue([['index_set_id=index_set_id_1', 'index_set_id=index_set_id_2'], () => {}]); diff --git a/graylog2-web-interface/src/components/common/PaginatedEntityTable/slicing/Slicing.test.tsx b/graylog2-web-interface/src/components/common/PaginatedEntityTable/slicing/Slicing.test.tsx index 9b3e266fd2..7947689f40 100644 --- a/graylog2-web-interface/src/components/common/PaginatedEntityTable/slicing/Slicing.test.tsx +++ b/graylog2-web-interface/src/components/common/PaginatedEntityTable/slicing/Slicing.test.tsx @@ -20,7 +20,6 @@ import userEvent from '@testing-library/user-event'; import type { SearchParams } from 'stores/PaginationTypes'; import TableFetchContext, { type ContextValue } from 'components/common/PaginatedEntityTable/TableFetchContext'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import Slicing from './index'; @@ -56,17 +55,15 @@ describe('Slicing', () => { }; return render( - - - {}} - fetchSlices={() => Promise.resolve({ slices: [] })} - {...props} - /> - - , + + {}} + fetchSlices={() => Promise.resolve({ slices: [] })} + {...props} + /> + , ); }; diff --git a/graylog2-web-interface/src/components/common/PaginatedList.test.tsx b/graylog2-web-interface/src/components/common/PaginatedList.test.tsx index 030249ce4f..462a81a415 100644 --- a/graylog2-web-interface/src/components/common/PaginatedList.test.tsx +++ b/graylog2-web-interface/src/components/common/PaginatedList.test.tsx @@ -19,7 +19,6 @@ import { render, screen, waitFor } from 'wrappedTestingLibrary'; import userEvent from '@testing-library/user-event'; import { useQueryParams } from 'routing/QueryParams'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import InteractiveContext from 'views/components/contexts/InteractiveContext'; import { asMock } from 'helpers/mocking'; @@ -33,15 +32,12 @@ jest.mock('routing/QueryParams', () => ({ })); describe('PaginatedList', () => { - const renderSUT = (component: React.ReactElement) => - render({component}); - beforeEach(() => { asMock(useQueryParams).mockImplementation(() => [{}, jest.fn()]); }); it('should display Pagination', () => { - renderSUT( + render( {}}>
The list
, @@ -52,7 +48,7 @@ describe('PaginatedList', () => { }); it('should not dived by 0 if pageSize is 0 Pagination', () => { - renderSUT( + render( {}}>
The list
, @@ -62,7 +58,7 @@ describe('PaginatedList', () => { }); it('should not display Pagination, when context is not interactive', () => { - const { queryByText } = renderSUT( + const { queryByText } = render( {}}>
The list
@@ -76,7 +72,7 @@ describe('PaginatedList', () => { it('should reset current page on page size change', async () => { const onChangeStub = jest.fn(); - const { getByRole } = renderSUT( + const { getByRole } = render(
The list
, @@ -102,7 +98,7 @@ describe('PaginatedList', () => { const currentPage = 4; asMock(useQueryParams).mockImplementation(() => [{ page: currentPage }, setQueryParams]); - const { findByTestId } = renderSUT( + const { findByTestId } = render( {}} activePage={3}>
The list
, @@ -118,7 +114,7 @@ describe('PaginatedList', () => { describe('with internal state', () => { it('should update active page, when prop changes', async () => { - const { findByTestId, rerender } = renderSUT( + const { findByTestId, rerender } = render( {}} activePage={3} useQueryParameter={false}>
The list
, @@ -130,11 +126,9 @@ describe('PaginatedList', () => { expect(activePageElement[0].textContent).toContain('3'); rerender( - - {}} activePage={1} useQueryParameter={false}> -
The list
- - , + {}} activePage={1} useQueryParameter={false}> +
The list
+ , ); await findByTestId('graylog-pagination'); diff --git a/graylog2-web-interface/src/components/indices/IndexSetFieldTypeProfiles/ProfilesList.test.tsx b/graylog2-web-interface/src/components/indices/IndexSetFieldTypeProfiles/ProfilesList.test.tsx index bb8717c01b..efaed5a877 100644 --- a/graylog2-web-interface/src/components/indices/IndexSetFieldTypeProfiles/ProfilesList.test.tsx +++ b/graylog2-web-interface/src/components/indices/IndexSetFieldTypeProfiles/ProfilesList.test.tsx @@ -27,7 +27,6 @@ import useFieldTypesForMappings from 'views/logic/fieldactions/ChangeFieldType/h import { profile1, attributes, profile2 } from 'fixtures/indexSetFieldTypeProfiles'; import ProfilesList from 'components/indices/IndexSetFieldTypeProfiles/ProfilesList'; import useFetchEntities from 'components/common/PaginatedEntityTable/useFetchEntities'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; const getData = (list = [profile1]) => ({ list, @@ -39,12 +38,9 @@ const getData = (list = [profile1]) => ({ const renderIndexSetFieldTypeProfilesList = () => render( - - - - - , - , + + + , ); jest.mock('routing/useParams', () => jest.fn()); diff --git a/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/IndexSetFieldTypesList.test.tsx b/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/IndexSetFieldTypesList.test.tsx index a925631431..b1f9d299ed 100644 --- a/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/IndexSetFieldTypesList.test.tsx +++ b/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/IndexSetFieldTypesList.test.tsx @@ -40,7 +40,6 @@ import { import useProfile from 'components/indices/IndexSetFieldTypeProfiles/hooks/useProfile'; import useIndexProfileWithMappingsByField from 'components/indices/IndexSetFieldTypes/hooks/useIndexProfileWithMappingsByField'; import useProfileOptions from 'components/indices/IndexSetFieldTypeProfiles/hooks/useProfileOptions'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; const getData = (list = [defaultField]) => ({ list, @@ -52,12 +51,9 @@ const getData = (list = [defaultField]) => ({ const renderIndexSetFieldTypesList = () => render( - - - - - , - , + + + , ); jest.mock('stores/indices/IndexSetsStore', () => ({ diff --git a/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/SetProfileModal.test.tsx b/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/SetProfileModal.test.tsx index fe3f6c2c5e..290b88b00b 100644 --- a/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/SetProfileModal.test.tsx +++ b/graylog2-web-interface/src/components/indices/IndexSetFieldTypes/SetProfileModal.test.tsx @@ -25,14 +25,9 @@ import asMock from 'helpers/mocking/AsMock'; import SetProfileModal from 'components/indices/IndexSetFieldTypes/SetProfileModal'; import useProfileOptions from 'components/indices/IndexSetFieldTypeProfiles/hooks/useProfileOptions'; import useRemoveProfileFromIndexMutation from 'components/indices/IndexSetFieldTypes/hooks/useRemoveProfileFromIndexMutation'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; const renderModal = (currentProfile = 'profile-id-111') => - render( - - {}} show /> - , - ); + render( {}} show />); jest.mock('routing/useParams', () => jest.fn()); jest.mock('components/indices/IndexSetFieldTypes/hooks/useSetIndexSetProfileMutation', () => jest.fn()); diff --git a/graylog2-web-interface/src/components/lookup-tables/adapter-list/list.test.tsx b/graylog2-web-interface/src/components/lookup-tables/adapter-list/list.test.tsx index 1f2e0e5f14..619b134e9d 100644 --- a/graylog2-web-interface/src/components/lookup-tables/adapter-list/list.test.tsx +++ b/graylog2-web-interface/src/components/lookup-tables/adapter-list/list.test.tsx @@ -21,7 +21,6 @@ import userEvent from '@testing-library/user-event'; import type { SearchParams } from 'stores/PaginationTypes'; import type { GenericEntityType } from 'logic/lookup-tables/types'; import { DATA_ADAPTERS, ERROR_STATE } from 'components/lookup-tables/fixtures'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import { attributes } from './constants'; import DataAdapterList from './index'; @@ -78,14 +77,10 @@ jest.mock('components/lookup-tables/hooks/useLookupTablesAPI', () => ({ })); const moreActionsName = { name: new RegExp(`More Actions for ${DATA_ADAPTERS[0].name}`, 'i') }; -const renderSUT = () => - render( - - - , - ); describe('Data Adapter List', () => { + const renderSUT = () => render(); + it('should render a list of data adapters', async () => { renderSUT(); diff --git a/graylog2-web-interface/src/components/lookup-tables/cache-list/list.test.tsx b/graylog2-web-interface/src/components/lookup-tables/cache-list/list.test.tsx index 3db398425d..a1aaa328ea 100644 --- a/graylog2-web-interface/src/components/lookup-tables/cache-list/list.test.tsx +++ b/graylog2-web-interface/src/components/lookup-tables/cache-list/list.test.tsx @@ -21,7 +21,6 @@ import userEvent from '@testing-library/user-event'; import type { SearchParams } from 'stores/PaginationTypes'; import type { GenericEntityType } from 'logic/lookup-tables/types'; import { CACHES } from 'components/lookup-tables/fixtures'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import { attributes } from './constants'; import CacheList from './index'; @@ -74,14 +73,10 @@ jest.mock('components/lookup-tables/hooks/useLookupTablesAPI', () => ({ })); const moreActionsName = { name: new RegExp(`More Actions for ${CACHES[0].name}`, 'i') }; -const renderSUT = () => - render( - - - , - ); describe('Cache List', () => { + const renderSUT = () => render(); + it('should render a list of caches', async () => { renderSUT(); diff --git a/graylog2-web-interface/src/components/lookup-tables/lookup-table-list/list.test.tsx b/graylog2-web-interface/src/components/lookup-tables/lookup-table-list/list.test.tsx index 1a3c0e3be3..5c656d04ec 100644 --- a/graylog2-web-interface/src/components/lookup-tables/lookup-table-list/list.test.tsx +++ b/graylog2-web-interface/src/components/lookup-tables/lookup-table-list/list.test.tsx @@ -21,7 +21,6 @@ import userEvent from '@testing-library/user-event'; import type { SearchParams } from 'stores/PaginationTypes'; import type { GenericEntityType, LookupTable } from 'logic/lookup-tables/types'; import { LOOKUP_TABLES, CACHES_MAP, ADAPTERS_MAP, ERROR_STATE } from 'components/lookup-tables/fixtures'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import { attributes } from './constants'; import LookupTableList from './index'; @@ -82,14 +81,10 @@ jest.mock('components/lookup-tables/hooks/useLookupTablesAPI', () => ({ })); const moreActionsName = { name: new RegExp(`More Actions for ${LOOKUP_TABLES[0].name}`, 'i') }; -const renderSUT = () => - render( - - - , - ); describe('Lookup Table List', () => { + const renderSUT = () => render(); + it('should render a list of lookup tables', async () => { renderSUT(); diff --git a/graylog2-web-interface/src/components/roles/RolesOverview/RolesOverview.test.tsx b/graylog2-web-interface/src/components/roles/RolesOverview/RolesOverview.test.tsx index 6269663f3f..3225b78d42 100644 --- a/graylog2-web-interface/src/components/roles/RolesOverview/RolesOverview.test.tsx +++ b/graylog2-web-interface/src/components/roles/RolesOverview/RolesOverview.test.tsx @@ -22,7 +22,6 @@ import { render, waitFor, screen } from 'wrappedTestingLibrary'; import mockAction from 'helpers/mocking/MockAction'; import { rolesList as mockRoles } from 'fixtures/roles'; import { AuthzRolesActions } from 'stores/roles/AuthzRolesStore'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import RolesOverview from './RolesOverview'; @@ -56,12 +55,7 @@ jest.mock('stores/roles/AuthzRolesStore', () => ({ })); describe('RolesOverview', () => { - const renderSUT = () => - render( - - - , - ); + const renderSUT = () => render(); afterEach(() => { jest.clearAllMocks(); diff --git a/graylog2-web-interface/src/components/sidecars/failure-tracking/SidecarFailureTrackingList.test.tsx b/graylog2-web-interface/src/components/sidecars/failure-tracking/SidecarFailureTrackingList.test.tsx index 81b31be940..3a492e94de 100644 --- a/graylog2-web-interface/src/components/sidecars/failure-tracking/SidecarFailureTrackingList.test.tsx +++ b/graylog2-web-interface/src/components/sidecars/failure-tracking/SidecarFailureTrackingList.test.tsx @@ -18,8 +18,6 @@ import userEvent from '@testing-library/user-event'; import * as React from 'react'; import { screen, render, waitFor } from 'wrappedTestingLibrary'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; - import SidecarFailureTrackingList from './SidecarFailureTrackingList'; import type { Collector, SidecarSummary } from '../types'; @@ -75,20 +73,18 @@ const toggleShowInactive = jest.fn(); const renderSUT = (sidecarsList: Array = [], collectorsList: Array = []) => render( - - - , + , ); describe('SidecarFailureTrackingList', () => { diff --git a/graylog2-web-interface/src/components/streams/StreamDetails/StreamDataRoutingIntake/StreamConnectedPipelines.test.tsx b/graylog2-web-interface/src/components/streams/StreamDetails/StreamDataRoutingIntake/StreamConnectedPipelines.test.tsx index 5fc8d2899f..05e44e9a04 100644 --- a/graylog2-web-interface/src/components/streams/StreamDetails/StreamDataRoutingIntake/StreamConnectedPipelines.test.tsx +++ b/graylog2-web-interface/src/components/streams/StreamDetails/StreamDataRoutingIntake/StreamConnectedPipelines.test.tsx @@ -20,7 +20,6 @@ import { render, screen, within } from 'wrappedTestingLibrary'; import { StreamRoutingRules } from '@graylog/server-api'; import type { Attribute } from 'stores/PaginationTypes'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import { createStreamFixture } from 'components/streams/fixtures'; import { asMock } from 'helpers/mocking'; import StreamConnectedPipelines from 'components/streams/StreamDetails/StreamDataRoutingIntake/StreamConnectedPipelines'; @@ -161,12 +160,7 @@ const listResponse = { }, }; -const renderList = () => - render( - - - , - ); +const renderList = () => render(); describe('', () => { beforeEach(() => { diff --git a/graylog2-web-interface/src/components/streams/StreamsOverview/StreamsOverview.test.tsx b/graylog2-web-interface/src/components/streams/StreamsOverview/StreamsOverview.test.tsx index 4cd34967c0..20473032cc 100644 --- a/graylog2-web-interface/src/components/streams/StreamsOverview/StreamsOverview.test.tsx +++ b/graylog2-web-interface/src/components/streams/StreamsOverview/StreamsOverview.test.tsx @@ -26,7 +26,6 @@ import useUserLayoutPreferences from 'components/common/EntityDataTable/hooks/us import { layoutPreferences } from 'fixtures/entityListLayoutPreferences'; import useStreamRuleTypes from 'components/streams/hooks/useStreamRuleTypes'; import { streamRuleTypes } from 'fixtures/streamRuleTypes'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import StreamsOverview from './StreamsOverview'; @@ -76,12 +75,7 @@ const paginatedStreams = (exampleStream = stream) => ({ }); describe('StreamsOverview', () => { - const renderSut = () => - render( - - - , - ); + const renderSut = () => render(); beforeEach(() => { asMock(useUserLayoutPreferences).mockReturnValue({ diff --git a/graylog2-web-interface/src/components/users/UsersOverview/UsersOverview.test.tsx b/graylog2-web-interface/src/components/users/UsersOverview/UsersOverview.test.tsx index 2c058066c1..e2c9e31cc5 100644 --- a/graylog2-web-interface/src/components/users/UsersOverview/UsersOverview.test.tsx +++ b/graylog2-web-interface/src/components/users/UsersOverview/UsersOverview.test.tsx @@ -25,7 +25,6 @@ import asMock from 'helpers/mocking/AsMock'; import mockAction from 'helpers/mocking/MockAction'; import { UsersActions } from 'stores/users/UsersStore'; import useWindowConfirmMock from 'helpers/mocking/useWindowConfirmMock'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import UsersOverview from './UsersOverview'; @@ -55,12 +54,7 @@ const clickMoreActions = async (username: string) => { const extendedTimeout = applyTimeoutMultiplier(30000); describe('UsersOverview', () => { - const renderSUT = () => - render( - - - , - ); + const renderSUT = () => render(); afterEach(() => { jest.clearAllMocks(); diff --git a/graylog2-web-interface/src/pages/IndexSetFieldTypesPage.test.tsx b/graylog2-web-interface/src/pages/IndexSetFieldTypesPage.test.tsx index 472bcbc44a..9832259abb 100644 --- a/graylog2-web-interface/src/pages/IndexSetFieldTypesPage.test.tsx +++ b/graylog2-web-interface/src/pages/IndexSetFieldTypesPage.test.tsx @@ -29,7 +29,6 @@ import useViewsPlugin from 'views/test/testViewsPlugin'; import IndexSetFieldTypesPage from 'pages/IndexSetFieldTypesPage'; import useFieldTypesForMappings from 'views/logic/fieldactions/ChangeFieldType/hooks/useFieldTypesForMappings'; import { overriddenIndexField, defaultField, attributes } from 'fixtures/indexSetFieldTypes'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; const getData = (list = [defaultField]) => ({ list, @@ -41,12 +40,9 @@ const getData = (list = [defaultField]) => ({ const renderIndexSetFieldTypesPage = () => render( - - - - - , - , + + + , ); jest.mock('views/logic/fieldactions/ChangeFieldType/hooks/useFieldTypesForMappings', () => jest.fn()); diff --git a/graylog2-web-interface/src/pages/RulesPage.test.tsx b/graylog2-web-interface/src/pages/RulesPage.test.tsx index f30e592647..37319a7407 100644 --- a/graylog2-web-interface/src/pages/RulesPage.test.tsx +++ b/graylog2-web-interface/src/pages/RulesPage.test.tsx @@ -19,7 +19,6 @@ import { render, screen } from 'wrappedTestingLibrary'; import { usePluginExports } from 'views/test/testPlugins'; import { prefixUrl } from 'routing/Routes'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import RulesPage from './RulesPage'; @@ -34,13 +33,9 @@ const rulesPlugin = { ], }; describe('RulesPage', () => { + const renderSUT = () => render(); + usePluginExports(rulesPlugin); - const renderSUT = () => - render( - - - , - ); it('should show create rule button', async () => { renderSUT(); diff --git a/graylog2-web-interface/src/views/components/contexts/WidgetFocusProvider.test.tsx b/graylog2-web-interface/src/views/components/contexts/WidgetFocusProvider.test.tsx index 63f72a7285..1687ee5fd1 100644 --- a/graylog2-web-interface/src/views/components/contexts/WidgetFocusProvider.test.tsx +++ b/graylog2-web-interface/src/views/components/contexts/WidgetFocusProvider.test.tsx @@ -16,7 +16,6 @@ */ import * as React from 'react'; import { render, screen } from 'wrappedTestingLibrary'; -import { useLocation } from 'react-router-dom'; import Immutable from 'immutable'; import userEvent from '@testing-library/user-event'; @@ -34,16 +33,15 @@ import useView from 'views/hooks/useView'; import View from 'views/logic/views/View'; import ViewState from 'views/logic/views/ViewState'; import { setNewWidget } from 'views/logic/slices/widgetsSlice'; +import useLocation from 'routing/useLocation'; + +jest.mock('routing/useLocation'); const mockNavigate = jest.fn(); jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom'), useNavigate: () => mockNavigate, - useLocation: jest.fn(() => ({ - pathname: '', - search: '', - })), })); jest.mock('views/stores/useViewsDispatch'); @@ -118,7 +116,7 @@ describe('WidgetFocusProvider', () => { }); it('should update url on widget focus close', async () => { - asMock(useLocation).mockReturnValueOnce({ + asMock(useLocation).mockReturnValue({ ...emptyLocation, search: '?focusedId=widget-id&focusing=true', }); diff --git a/graylog2-web-interface/src/views/components/dashboard/DashboardsOverview/DashboardActions.test.tsx b/graylog2-web-interface/src/views/components/dashboard/DashboardsOverview/DashboardActions.test.tsx index 5bbc727228..40d82d4dc6 100644 --- a/graylog2-web-interface/src/views/components/dashboard/DashboardsOverview/DashboardActions.test.tsx +++ b/graylog2-web-interface/src/views/components/dashboard/DashboardsOverview/DashboardActions.test.tsx @@ -32,7 +32,6 @@ import type { ContextValue } from 'components/common/PaginatedEntityTable/TableF import TableFetchContext from 'components/common/PaginatedEntityTable/TableFetchContext'; import useWindowConfirmMock from 'helpers/mocking/useWindowConfirmMock'; import { deleteView } from 'views/api/views'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; jest.mock('hooks/useCurrentUser'); jest.mock('components/common/EntityDataTable/hooks/useSelectedEntities'); @@ -71,11 +70,7 @@ describe('DashboardActions', () => { const simpleDashboard = simpleView(); const menuIsHidden = () => expect(screen.queryByRole('menu')).not.toBeInTheDocument(); const renderSUT = (props: React.ComponentProps = { dashboard: simpleDashboard }) => - render( - - - , - ); + render(); const clickDashboardAction = async (action: string) => { userEvent.click(await screen.findByRole('button', { name: /more/i })); diff --git a/graylog2-web-interface/src/views/components/dashboard/DashboardsOverview/DashboardsOverview.test.tsx b/graylog2-web-interface/src/views/components/dashboard/DashboardsOverview/DashboardsOverview.test.tsx index ad8ee7d1f8..ad57f9d7ac 100644 --- a/graylog2-web-interface/src/views/components/dashboard/DashboardsOverview/DashboardsOverview.test.tsx +++ b/graylog2-web-interface/src/views/components/dashboard/DashboardsOverview/DashboardsOverview.test.tsx @@ -22,7 +22,6 @@ import View from 'views/logic/views/View'; import Search from 'views/logic/search/Search'; import { asMock } from 'helpers/mocking'; import useFetchEntities from 'components/common/PaginatedEntityTable/useFetchEntities'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import DashboardsOverview from './DashboardsOverview'; @@ -88,11 +87,7 @@ const loadDashboardsResponse = (count = 1) => { }; describe('DashboardsOverview', () => { - const SUT = () => ( - - - - ); + const SUT = () => ; beforeEach(() => { asMock(useFetchEntities).mockReturnValue(loadDashboardsResponse(0)); diff --git a/graylog2-web-interface/src/views/pages/DashboardsPage.test.tsx b/graylog2-web-interface/src/views/pages/DashboardsPage.test.tsx index 374d9f789b..a6f07fde21 100644 --- a/graylog2-web-interface/src/views/pages/DashboardsPage.test.tsx +++ b/graylog2-web-interface/src/views/pages/DashboardsPage.test.tsx @@ -17,7 +17,6 @@ import * as React from 'react'; import { render, screen } from 'wrappedTestingLibrary'; -import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; import { usePluginExports } from 'views/test/testPlugins'; import { prefixUrl } from 'routing/Routes'; @@ -49,11 +48,7 @@ const pluginExports = { describe('DashboardsPage', () => { usePluginExports(pluginExports); it('should render header and list', async () => { - render( - - - , - ); + render(); await screen.findByRole('heading', { name: /dashboards/i }); await screen.findByText('No dashboards have been found.'); diff --git a/graylog2-web-interface/test/WrappingContainer.tsx b/graylog2-web-interface/test/WrappingContainer.tsx index ad0045c5de..84e6ed48bb 100644 --- a/graylog2-web-interface/test/WrappingContainer.tsx +++ b/graylog2-web-interface/test/WrappingContainer.tsx @@ -17,6 +17,8 @@ import React from 'react'; import { MemoryRouter } from 'react-router-dom'; +import DefaultQueryParamProvider from 'routing/DefaultQueryParamProvider'; + import DefaultQueryClientProvider from './DefaultQueryClientProvider'; import DefaultProviders from './DefaultProviders'; @@ -27,7 +29,9 @@ type Props = { const WrappingContainer = ({ children }: Props) => ( - {children} + + {children} + );