From 530a1f12992f503cb7ccd77a1008c34adf42d7cf Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Mon, 12 Dec 2022 19:00:04 +0100 Subject: [PATCH] plugins: replace react-router mocks with react-router-dom Signed-off-by: Patrik Oldsberg --- .../src/components/ApiExplorerPage/ApiExplorerPage.test.tsx | 4 ++-- .../src/components/CatalogGraphPage/CatalogGraphPage.test.tsx | 4 ++-- .../components/CatalogGraphPage/useCatalogGraphPage.test.ts | 2 +- .../src/components/ImportPage/ImportPage.test.tsx | 4 ++-- .../catalog/src/components/CatalogPage/CatalogPage.test.tsx | 4 ++-- .../explore/src/components/ExplorePage/ExplorePage.test.tsx | 4 ++-- .../src/features/RepoDetailsForm/Owner.test.tsx | 2 +- .../src/features/RepoDetailsForm/Repo.test.tsx | 2 +- .../src/features/RepoDetailsForm/VersioningStrategy.test.tsx | 2 +- .../git-release-manager/src/hooks/useQueryHandler.test.tsx | 2 +- plugins/search/src/components/SearchPage/SearchPage.test.tsx | 4 ++-- .../techdocs/src/home/components/TechDocsIndexPage.test.tsx | 4 ++-- .../DefaultSettingsPage/DefaultSettingsPage.test.tsx | 4 ++-- .../src/components/SettingsPage/SettingsPage.test.tsx | 4 ++-- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerPage.test.tsx b/plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerPage.test.tsx index 99bcd308d2..ea091f75f0 100644 --- a/plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerPage.test.tsx +++ b/plugins/api-docs/src/components/ApiExplorerPage/ApiExplorerPage.test.tsx @@ -19,8 +19,8 @@ import { renderInTestApp } from '@backstage/test-utils'; import { useOutlet } from 'react-router-dom'; import { ApiExplorerPage } from './ApiExplorerPage'; -jest.mock('react-router', () => ({ - ...jest.requireActual('react-router'), +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), useOutlet: jest.fn().mockReturnValue('Route Children'), })); diff --git a/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx b/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx index f7e1a9fbe7..17bec9a475 100644 --- a/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx +++ b/plugins/catalog-graph/src/components/CatalogGraphPage/CatalogGraphPage.test.tsx @@ -29,8 +29,8 @@ import { CatalogGraphPage } from './CatalogGraphPage'; const navigate = jest.fn(); -jest.mock('react-router', () => ({ - ...jest.requireActual('react-router'), +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), useNavigate: () => navigate, })); diff --git a/plugins/catalog-graph/src/components/CatalogGraphPage/useCatalogGraphPage.test.ts b/plugins/catalog-graph/src/components/CatalogGraphPage/useCatalogGraphPage.test.ts index c693a7788c..7a4d836365 100644 --- a/plugins/catalog-graph/src/components/CatalogGraphPage/useCatalogGraphPage.test.ts +++ b/plugins/catalog-graph/src/components/CatalogGraphPage/useCatalogGraphPage.test.ts @@ -19,7 +19,7 @@ import { useLocation as useLocationMocked } from 'react-router-dom'; import { Direction } from '../EntityRelationsGraph'; import { useCatalogGraphPage } from './useCatalogGraphPage'; -jest.mock('react-router', () => ({ +jest.mock('react-router-dom', () => ({ useLocation: jest.fn(), })); diff --git a/plugins/catalog-import/src/components/ImportPage/ImportPage.test.tsx b/plugins/catalog-import/src/components/ImportPage/ImportPage.test.tsx index 8ec4a79bd5..1b0ddcfc04 100644 --- a/plugins/catalog-import/src/components/ImportPage/ImportPage.test.tsx +++ b/plugins/catalog-import/src/components/ImportPage/ImportPage.test.tsx @@ -25,8 +25,8 @@ import { useOutlet } from 'react-router-dom'; import { catalogImportApiRef, CatalogImportClient } from '../../api'; import { ImportPage } from './ImportPage'; -jest.mock('react-router', () => ({ - ...jest.requireActual('react-router'), +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), useOutlet: jest.fn(), })); diff --git a/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx b/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx index 7c14bd22a9..0efdd37a34 100644 --- a/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx +++ b/plugins/catalog/src/components/CatalogPage/CatalogPage.test.tsx @@ -20,8 +20,8 @@ import { screen } from '@testing-library/react'; import { useOutlet } from 'react-router-dom'; import { CatalogPage } from './CatalogPage'; -jest.mock('react-router', () => ({ - ...jest.requireActual('react-router'), +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), useOutlet: jest.fn().mockReturnValue('Route Children'), })); diff --git a/plugins/explore/src/components/ExplorePage/ExplorePage.test.tsx b/plugins/explore/src/components/ExplorePage/ExplorePage.test.tsx index ed3c54e370..dca8722b46 100644 --- a/plugins/explore/src/components/ExplorePage/ExplorePage.test.tsx +++ b/plugins/explore/src/components/ExplorePage/ExplorePage.test.tsx @@ -19,8 +19,8 @@ import React from 'react'; import { useOutlet } from 'react-router-dom'; import { ExplorePage } from './ExplorePage'; -jest.mock('react-router', () => ({ - ...jest.requireActual('react-router'), +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), useLocation: jest.fn().mockReturnValue({ search: '', }), diff --git a/plugins/git-release-manager/src/features/RepoDetailsForm/Owner.test.tsx b/plugins/git-release-manager/src/features/RepoDetailsForm/Owner.test.tsx index d73f6bf2aa..477821f4d8 100644 --- a/plugins/git-release-manager/src/features/RepoDetailsForm/Owner.test.tsx +++ b/plugins/git-release-manager/src/features/RepoDetailsForm/Owner.test.tsx @@ -27,7 +27,7 @@ import { useProjectContext } from '../../contexts/ProjectContext'; import { Owner } from './Owner'; import { mockApiClient } from '../../test-helpers/mock-api-client'; -jest.mock('react-router', () => ({ +jest.mock('react-router-dom', () => ({ useNavigate: jest.fn(), useLocation: jest.fn(() => ({ search: mockSearchCalver, diff --git a/plugins/git-release-manager/src/features/RepoDetailsForm/Repo.test.tsx b/plugins/git-release-manager/src/features/RepoDetailsForm/Repo.test.tsx index 38f164bf90..ab94c977a3 100644 --- a/plugins/git-release-manager/src/features/RepoDetailsForm/Repo.test.tsx +++ b/plugins/git-release-manager/src/features/RepoDetailsForm/Repo.test.tsx @@ -26,7 +26,7 @@ import { Repo } from './Repo'; import { TEST_IDS } from '../../test-helpers/test-ids'; import { useProjectContext } from '../../contexts/ProjectContext'; -jest.mock('react-router', () => ({ +jest.mock('react-router-dom', () => ({ useNavigate: jest.fn(), useLocation: jest.fn(() => ({ search: mockSearchCalver, diff --git a/plugins/git-release-manager/src/features/RepoDetailsForm/VersioningStrategy.test.tsx b/plugins/git-release-manager/src/features/RepoDetailsForm/VersioningStrategy.test.tsx index e54e6a9ae3..0f230be46e 100644 --- a/plugins/git-release-manager/src/features/RepoDetailsForm/VersioningStrategy.test.tsx +++ b/plugins/git-release-manager/src/features/RepoDetailsForm/VersioningStrategy.test.tsx @@ -25,7 +25,7 @@ import { VersioningStrategy } from './VersioningStrategy'; const mockNavigate = jest.fn(); -jest.mock('react-router', () => ({ +jest.mock('react-router-dom', () => ({ useNavigate: () => mockNavigate, useLocation: jest.fn(() => ({ search: mockSearchCalver, diff --git a/plugins/git-release-manager/src/hooks/useQueryHandler.test.tsx b/plugins/git-release-manager/src/hooks/useQueryHandler.test.tsx index 020b068188..fb65f97fad 100644 --- a/plugins/git-release-manager/src/hooks/useQueryHandler.test.tsx +++ b/plugins/git-release-manager/src/hooks/useQueryHandler.test.tsx @@ -20,7 +20,7 @@ import { render } from '@testing-library/react'; import { mockSearchSemver } from '../test-helpers/test-helpers'; import { useQueryHandler } from './useQueryHandler'; -jest.mock('react-router', () => ({ +jest.mock('react-router-dom', () => ({ useLocation: jest.fn(() => ({ search: mockSearchSemver, })), diff --git a/plugins/search/src/components/SearchPage/SearchPage.test.tsx b/plugins/search/src/components/SearchPage/SearchPage.test.tsx index 2237233fe3..be9e7f7b10 100644 --- a/plugins/search/src/components/SearchPage/SearchPage.test.tsx +++ b/plugins/search/src/components/SearchPage/SearchPage.test.tsx @@ -20,8 +20,8 @@ import { useLocation } from 'react-router-dom'; import { useSearch } from '@backstage/plugin-search-react'; import { SearchPage } from './SearchPage'; -jest.mock('react-router', () => ({ - ...jest.requireActual('react-router'), +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), useLocation: jest.fn().mockReturnValue({ search: '', }), diff --git a/plugins/techdocs/src/home/components/TechDocsIndexPage.test.tsx b/plugins/techdocs/src/home/components/TechDocsIndexPage.test.tsx index 70ea4dfed7..8173cf1f94 100644 --- a/plugins/techdocs/src/home/components/TechDocsIndexPage.test.tsx +++ b/plugins/techdocs/src/home/components/TechDocsIndexPage.test.tsx @@ -19,8 +19,8 @@ import { renderInTestApp } from '@backstage/test-utils'; import { useOutlet } from 'react-router-dom'; import { TechDocsIndexPage } from './TechDocsIndexPage'; -jest.mock('react-router', () => ({ - ...jest.requireActual('react-router'), +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), useOutlet: jest.fn().mockReturnValue('Route Children'), })); diff --git a/plugins/user-settings/src/components/DefaultSettingsPage/DefaultSettingsPage.test.tsx b/plugins/user-settings/src/components/DefaultSettingsPage/DefaultSettingsPage.test.tsx index 9001d22451..e2ec3b0ba9 100644 --- a/plugins/user-settings/src/components/DefaultSettingsPage/DefaultSettingsPage.test.tsx +++ b/plugins/user-settings/src/components/DefaultSettingsPage/DefaultSettingsPage.test.tsx @@ -21,8 +21,8 @@ import { UserSettingsTab } from '../UserSettingsTab'; import { useOutlet } from 'react-router-dom'; import { SettingsLayout } from '../SettingsLayout'; -jest.mock('react-router', () => ({ - ...jest.requireActual('react-router'), +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), useOutlet: jest.fn().mockReturnValue(undefined), })); diff --git a/plugins/user-settings/src/components/SettingsPage/SettingsPage.test.tsx b/plugins/user-settings/src/components/SettingsPage/SettingsPage.test.tsx index 27d368bdbe..89c755f3e3 100644 --- a/plugins/user-settings/src/components/SettingsPage/SettingsPage.test.tsx +++ b/plugins/user-settings/src/components/SettingsPage/SettingsPage.test.tsx @@ -23,8 +23,8 @@ import { SettingsLayout } from '../SettingsLayout'; import { screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; -jest.mock('react-router', () => ({ - ...jest.requireActual('react-router'), +jest.mock('react-router-dom', () => ({ + ...jest.requireActual('react-router-dom'), useOutlet: jest.fn().mockReturnValue(undefined), }));