diff --git a/.changeset/blue-carrots-cross.md b/.changeset/blue-carrots-cross.md
new file mode 100644
index 0000000000..fdf91e673c
--- /dev/null
+++ b/.changeset/blue-carrots-cross.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Removed unnecessary usage of `ThemeProvider` from the `ExampleComponent` test in the plugin template.
diff --git a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
index ae626c0d57..b04e8a2f48 100644
--- a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
+++ b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs
@@ -1,7 +1,5 @@
import React from 'react';
import { ExampleComponent } from './ExampleComponent';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
import { rest } from 'msw';
import { setupServer } from 'msw/node';
import { screen } from '@testing-library/react';
@@ -23,11 +21,7 @@ describe('ExampleComponent', () => {
});
it('should render', async () => {
- await renderInTestApp(
-
-
- ,
- );
+ await renderInTestApp();
expect(screen.getByText('Welcome to {{ id }}!')).toBeInTheDocument();
});
});
diff --git a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
index e6355d861f..a21ecbe10e 100644
--- a/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
+++ b/plugins/allure/src/components/AllureReportComponent/AllureReportComponent.test.tsx
@@ -15,8 +15,6 @@
*/
import React from 'react';
import { AllureReportComponent } from './AllureReportComponent';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
import { rest } from 'msw';
import { setupServer } from 'msw/node';
import {
@@ -39,17 +37,15 @@ describe('ExampleComponent', () => {
it('should render', async () => {
const rendered = await renderInTestApp(
-
-
-
-
- ,
+
+
+ ,
);
expect(rendered.getByText('Missing Annotation')).toBeInTheDocument();
});
diff --git a/plugins/codescene/src/components/CodeScenePageComponent/CodeScenePageComponent.test.tsx b/plugins/codescene/src/components/CodeScenePageComponent/CodeScenePageComponent.test.tsx
index d8ffca841d..a1d7690ca8 100644
--- a/plugins/codescene/src/components/CodeScenePageComponent/CodeScenePageComponent.test.tsx
+++ b/plugins/codescene/src/components/CodeScenePageComponent/CodeScenePageComponent.test.tsx
@@ -15,8 +15,6 @@
*/
import React from 'react';
import { CodeScenePageComponent } from './CodeScenePageComponent';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
import { rest } from 'msw';
import { setupServer } from 'msw/node';
import { rootRouteRef } from '../../routes';
@@ -54,9 +52,7 @@ describe('CodeScenePageComponent', () => {
it('should render', async () => {
const rendered = await renderInTestApp(
-
-
-
+
,
{
mountedRoutes: {
diff --git a/plugins/codescene/src/components/CodeSceneProjectDetailsPage/CodeSceneProjectDetailsPage.test.tsx b/plugins/codescene/src/components/CodeSceneProjectDetailsPage/CodeSceneProjectDetailsPage.test.tsx
index 9ace0f1224..8ea1a0235f 100644
--- a/plugins/codescene/src/components/CodeSceneProjectDetailsPage/CodeSceneProjectDetailsPage.test.tsx
+++ b/plugins/codescene/src/components/CodeSceneProjectDetailsPage/CodeSceneProjectDetailsPage.test.tsx
@@ -15,8 +15,6 @@
*/
import React from 'react';
import { CodeSceneProjectDetailsPage } from './CodeSceneProjectDetailsPage';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
import { rest } from 'msw';
import { setupServer } from 'msw/node';
import {
@@ -90,9 +88,7 @@ describe('CodeSceneProjectDetailsPage', () => {
it('should render', async () => {
const rendered = await renderInTestApp(
-
-
-
+
,
);
expect(rendered.getByText('CodeScene: test-project')).toBeInTheDocument();
diff --git a/plugins/codescene/src/components/ProjectsComponent/ProjectsComponent.test.tsx b/plugins/codescene/src/components/ProjectsComponent/ProjectsComponent.test.tsx
index 4c9ee9ed42..40aee57312 100644
--- a/plugins/codescene/src/components/ProjectsComponent/ProjectsComponent.test.tsx
+++ b/plugins/codescene/src/components/ProjectsComponent/ProjectsComponent.test.tsx
@@ -15,8 +15,6 @@
*/
import React from 'react';
import { ProjectsComponent } from './ProjectsComponent';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
import { rest } from 'msw';
import { setupServer } from 'msw/node';
import { rootRouteRef } from '../../routes';
@@ -90,9 +88,7 @@ describe('ProjectsComponent', () => {
it('should render', async () => {
const rendered = await renderInTestApp(
-
-
-
+
,
{
mountedRoutes: {
diff --git a/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.test.tsx b/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.test.tsx
index f3cca5642f..7c5259d96b 100644
--- a/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.test.tsx
+++ b/plugins/explore/src/components/ToolExplorerContent/ToolExplorerContent.test.tsx
@@ -16,8 +16,6 @@
import { ExploreTool } from '@backstage/plugin-explore-common';
import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
-import { lightTheme } from '@backstage/theme';
-import { ThemeProvider } from '@material-ui/core';
import { waitFor } from '@testing-library/react';
import React from 'react';
import { exploreApiRef } from '../../api';
@@ -29,11 +27,9 @@ describe('', () => {
};
const Wrapper = ({ children }: { children?: React.ReactNode }) => (
-
-
- {children}
-
-
+
+ {children}
+
);
beforeEach(() => {
diff --git a/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx b/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx
index e158bcf6ad..5aa59a1cae 100644
--- a/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx
+++ b/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx
@@ -15,8 +15,6 @@
*/
import { renderInTestApp, TestApiRegistry } from '@backstage/test-utils';
-import { lightTheme } from '@backstage/theme';
-import { ThemeProvider } from '@material-ui/core';
import React from 'react';
import { gitOpsApiRef, GitOpsRestApi } from '../../api';
import ProfileCatalog from './ProfileCatalog';
@@ -47,11 +45,9 @@ describe('ProfileCatalog', () => {
);
const { getByText } = await renderInTestApp(
-
-
-
-
- ,
+
+
+ ,
);
expect(getByText('Create GitOps-managed Cluster')).toBeInTheDocument();
diff --git a/plugins/home/src/homePageComponents/HeaderWorldClock/HeaderWorldClock.test.tsx b/plugins/home/src/homePageComponents/HeaderWorldClock/HeaderWorldClock.test.tsx
index db92fbb89f..03f19fb046 100644
--- a/plugins/home/src/homePageComponents/HeaderWorldClock/HeaderWorldClock.test.tsx
+++ b/plugins/home/src/homePageComponents/HeaderWorldClock/HeaderWorldClock.test.tsx
@@ -17,8 +17,6 @@
import { renderInTestApp } from '@backstage/test-utils';
import { HeaderWorldClock, ClockConfig } from './HeaderWorldClock';
import React from 'react';
-import { lightTheme } from '@backstage/theme';
-import { ThemeProvider } from '@material-ui/core';
describe('HeaderWorldClock with valid Time Zones', () => {
it('displays Time Zones as expected', async () => {
@@ -42,9 +40,7 @@ describe('HeaderWorldClock with valid Time Zones', () => {
];
const rendered = await renderInTestApp(
-
-
- ,
+ ,
);
expect(rendered.getByText('NYC')).toBeInTheDocument();
@@ -59,9 +55,7 @@ describe('HeaderWorldClock with no Time Zones provided', () => {
const clockConfigs: ClockConfig[] = [];
const rendered = await renderInTestApp(
-
-
- ,
+ ,
);
expect(rendered.container).toBeEmptyDOMElement();
@@ -78,9 +72,7 @@ describe('HeaderWorldClock with invalid Time Zone', () => {
];
const rendered = await renderInTestApp(
-
-
- ,
+ ,
);
expect(rendered.getByText('GMT')).toBeInTheDocument();
@@ -105,12 +97,10 @@ describe('HeaderWorldClock with custom Time Format', () => {
};
const rendered = await renderInTestApp(
-
-
- ,
+ ,
);
expect(rendered.getByText('09:10')).toBeInTheDocument();
diff --git a/plugins/playlist/src/components/PlaylistCard/PlaylistCard.test.tsx b/plugins/playlist/src/components/PlaylistCard/PlaylistCard.test.tsx
index 177cc23b81..5a34aa93e2 100644
--- a/plugins/playlist/src/components/PlaylistCard/PlaylistCard.test.tsx
+++ b/plugins/playlist/src/components/PlaylistCard/PlaylistCard.test.tsx
@@ -16,8 +16,6 @@
import { entityRouteRef } from '@backstage/plugin-catalog-react';
import { renderInTestApp } from '@backstage/test-utils';
-import { lightTheme } from '@backstage/theme';
-import { ThemeProvider } from '@material-ui/core';
import React from 'react';
import { rootRouteRef } from '../../routes';
@@ -26,20 +24,18 @@ import { PlaylistCard } from './PlaylistCard';
describe('', () => {
it('renders playlist info', async () => {
const rendered = await renderInTestApp(
-
-
- ,
+ ,
{
mountedRoutes: {
'/playlists': rootRouteRef,
diff --git a/plugins/sonarqube/src/components/SonarQubeContentPage/SonarQubeContentPage.test.tsx b/plugins/sonarqube/src/components/SonarQubeContentPage/SonarQubeContentPage.test.tsx
index 22175d14bc..59258e5312 100644
--- a/plugins/sonarqube/src/components/SonarQubeContentPage/SonarQubeContentPage.test.tsx
+++ b/plugins/sonarqube/src/components/SonarQubeContentPage/SonarQubeContentPage.test.tsx
@@ -16,8 +16,6 @@
import { EntityProvider } from '@backstage/plugin-catalog-react';
import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
-import { lightTheme } from '@backstage/theme';
-import { ThemeProvider } from '@material-ui/core';
import React from 'react';
import {
isSonarQubeAvailable,
@@ -44,7 +42,7 @@ const Providers = ({
kind: 'Component',
}}
>
- {children}
+ {children}
);
diff --git a/plugins/tech-radar/src/components/RadarPage.test.tsx b/plugins/tech-radar/src/components/RadarPage.test.tsx
index f0c2a04590..b65d9b31b2 100644
--- a/plugins/tech-radar/src/components/RadarPage.test.tsx
+++ b/plugins/tech-radar/src/components/RadarPage.test.tsx
@@ -20,8 +20,6 @@ import {
TestApiProvider,
wrapInTestApp,
} from '@backstage/test-utils';
-import { lightTheme } from '@backstage/theme';
-import { ThemeProvider } from '@material-ui/core';
import { act, render, waitFor } from '@testing-library/react';
import React from 'react';
import GetBBoxPolyfill from '../utils/polyfills/getBBox';
@@ -61,11 +59,9 @@ describe('RadarPage', () => {
const { getByTestId, findByTestId } = render(
wrapInTestApp(
-
-
-
-
- ,
+
+
+ ,
),
);
@@ -87,11 +83,9 @@ describe('RadarPage', () => {
jest.spyOn(mockClient, 'load');
const { getByText, findByTestId } = await renderInTestApp(
-
-
-
-
- ,
+
+
+ ,
);
await expect(findByTestId('tech-radar-svg')).resolves.toBeInTheDocument();
@@ -111,11 +105,9 @@ describe('RadarPage', () => {
jest.spyOn(mockClient, 'load');
const { findByTestId } = await renderInTestApp(
-
-
-
-
- ,
+
+
+ ,
);
await expect(findByTestId('tech-radar-svg')).resolves.toBeInTheDocument();
@@ -136,16 +128,14 @@ describe('RadarPage', () => {
};
const { queryByTestId } = await renderInTestApp(
-
-
-
-
- ,
+
+
+ ,
);
await waitFor(() => !queryByTestId('progress'));
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx
index 808cb84ccf..4e8f331c7f 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsReaderPage.test.tsx
@@ -15,10 +15,8 @@
*/
import React from 'react';
import { act } from '@testing-library/react';
-import { ThemeProvider } from '@material-ui/core';
import { scmIntegrationsApiRef } from '@backstage/integration-react';
-import { lightTheme } from '@backstage/theme';
import { entityRouteRef } from '@backstage/plugin-catalog-react';
import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
@@ -84,17 +82,15 @@ jest.mock('@backstage/core-components', () => ({
const Wrapper = ({ children }: { children: React.ReactNode }) => {
return (
-
-
- {children}
-
-
+
+ {children}
+
);
};
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.test.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.test.tsx
index 7db00f6590..3e5a4c73c3 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.test.tsx
@@ -16,9 +16,6 @@
import React from 'react';
import { act, waitFor } from '@testing-library/react';
-import { ThemeProvider } from '@material-ui/core';
-
-import { lightTheme } from '@backstage/theme';
import { CompoundEntityRef } from '@backstage/catalog-model';
import {
techdocsApiRef,
@@ -79,13 +76,11 @@ const Wrapper = ({
entityRef?: CompoundEntityRef;
children: React.ReactNode;
}) => (
-
-
-
- {children}
-
-
-
+
+
+ {children}
+
+
);
describe('', () => {
diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageHeader/TechDocsReaderPageHeader.test.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageHeader/TechDocsReaderPageHeader.test.tsx
index da193430d5..a3e03b7cf0 100644
--- a/plugins/techdocs/src/reader/components/TechDocsReaderPageHeader/TechDocsReaderPageHeader.test.tsx
+++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageHeader/TechDocsReaderPageHeader.test.tsx
@@ -16,9 +16,6 @@
import React from 'react';
import { act, waitFor } from '@testing-library/react';
-import { ThemeProvider } from '@material-ui/core';
-
-import { lightTheme } from '@backstage/theme';
import { CompoundEntityRef } from '@backstage/catalog-model';
import { entityRouteRef } from '@backstage/plugin-catalog-react';
import {
@@ -71,13 +68,11 @@ const Wrapper = ({
entityRef?: CompoundEntityRef;
children: React.ReactNode;
}) => (
-
-
-
- {children}
-
-
-
+
+
+ {children}
+
+
);
describe('', () => {