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/.changeset/eleven-trains-double.md b/.changeset/eleven-trains-double.md
new file mode 100644
index 0000000000..ec07372678
--- /dev/null
+++ b/.changeset/eleven-trains-double.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-graph': patch
+---
+
+The link from the `CatalogGraphCard` to the `CatalogGraphPage` no longer includes an explicit `maxDepth` parameter, letting the `CatalogGraphPage` choose the initial `maxDepth` instead.
diff --git a/.changeset/late-forks-rescue.md b/.changeset/late-forks-rescue.md
new file mode 100644
index 0000000000..294412a711
--- /dev/null
+++ b/.changeset/late-forks-rescue.md
@@ -0,0 +1,6 @@
+---
+'@backstage/plugin-explore-backend': patch
+'@backstage/plugin-explore': patch
+---
+
+Updated `README.md` examples
diff --git a/.changeset/nasty-planets-end.md b/.changeset/nasty-planets-end.md
new file mode 100644
index 0000000000..b361b28199
--- /dev/null
+++ b/.changeset/nasty-planets-end.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-events-backend': patch
+---
+
+The default event broker will now catch and log errors thrown by the `onEvent` method of subscribers. The returned promise from `publish` method will also not resolve until all subscribers have handled the event.
diff --git a/ADOPTERS.md b/ADOPTERS.md
index 9ee67e9bed..efa0003f2d 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -224,4 +224,4 @@ _You can do this by using the [Adopter form](https://info.backstage.spotify.com/
| [FanDuel](https://fanduel.com) | [Diego Herrera](https://github.com/diegoh), [Christy Campbell](https://github.com/FD-ChristopherCampbell) | We use backstage as our developer portal to provide visibility of our software, ownership, strategy, and the state of maturity across disciplines. |
| [Operate First](https://www.operate-first.cloud/) | [Tom Coufal](https://github.com/tumido), [Sam Kopecky](https://github.com/samokopecky) | Backstage provides us with a public service catalog and serves as a gateway to our community cloud. Our instance is publicly available to everyone [here](https://service-catalog.operate-first.cloud/) ([source](https://github.com/operate-first/service-catalog)) |
| [Tractable AI](https://tractable.ai/) | [Stephan Schielke](https://github.com/stephanschielke) | We are hitting a critical point in our scale (100+ engineers) and need to get a handle on discoverability and ownership. The Service Catalog, TechDocs and Search are essential to us to achieve that. |
-| [Garanti BBVA](https://www.garantibbva.com.tr/) | [Caglar Cataloglu](https://github.com/crozwise) | We are using Backstage focusing on improving experience of developer, minimizing friction from idea to code. We call our portal as "Hyperspace" and very excited for our community (2000+ engineers) that finally we have a platform to boost our productivity!
+| [Garanti BBVA Teknoloji](https://www.linkedin.com/company/garanti-teknoloji/) | [Caglar Cataloglu](https://github.com/crozwise) | We are using Backstage focusing on improving experience of developers, minimizing friction from idea to production. We call our portal as "Hyperspace" and very excited for our community (2000+ engineers) that finally we have a platform to boost our productivity!
diff --git a/docs/overview/versioning-policy.md b/docs/overview/versioning-policy.md
index ad5421585e..fdb3a974b1 100644
--- a/docs/overview/versioning-policy.md
+++ b/docs/overview/versioning-policy.md
@@ -116,9 +116,8 @@ For packages at version `1.0.0` or above, the following policy also applies:
before it can be removed.
- The release of breaking changes document a clear upgrade path in the
changelog, both when deprecations are introduced and when they are removed.
-- Exports that have been marked as `@alpha` or `@beta` may receive breaking
- changes without a deprecation period, but the changes must still adhere to
- semver.
+- Breaking changes to `@alpha` or `@beta` exports must result in at least a minor
+ version bump, and may be done without a deprecation period.
### Changes that are Not Considered Breaking
diff --git a/microsite-next/yarn.lock b/microsite-next/yarn.lock
index c7dcd41c28..3a632b3079 100644
--- a/microsite-next/yarn.lock
+++ b/microsite-next/yarn.lock
@@ -6749,11 +6749,11 @@ __metadata:
linkType: hard
"json5@npm:^2.1.2, json5@npm:^2.2.1":
- version: 2.2.1
- resolution: "json5@npm:2.2.1"
+ version: 2.2.3
+ resolution: "json5@npm:2.2.3"
bin:
json5: lib/cli.js
- checksum: 74b8a23b102a6f2bf2d224797ae553a75488b5adbaee9c9b6e5ab8b510a2fc6e38f876d4c77dea672d4014a44b2399e15f2051ac2b37b87f74c0c7602003543b
+ checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349
languageName: node
linkType: hard
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(
{value => (
-
-
- value.setProjectId?.(parseInt(e.target.value, 10) || undefined)
- }
- />
-
+
+ value.setProjectId?.(parseInt(e.target.value, 10) || undefined)
+ }
+ />
)}
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/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx b/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx
index 27b67102e4..adee03e298 100644
--- a/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx
+++ b/plugins/catalog-graph/src/components/CatalogGraphCard/CatalogGraphCard.test.tsx
@@ -133,7 +133,7 @@ describe('
- ,
+ it('should render an icon link', async () => {
+ await renderInTestApp(
+
- ,
+ const table = 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/events-backend/src/service/InMemoryEventBroker.test.ts b/plugins/events-backend/src/service/InMemoryEventBroker.test.ts
index 68a6f63a72..861cdda940 100644
--- a/plugins/events-backend/src/service/InMemoryEventBroker.test.ts
+++ b/plugins/events-backend/src/service/InMemoryEventBroker.test.ts
@@ -16,6 +16,7 @@
import { getVoidLogger } from '@backstage/backend-common';
import { TestEventSubscriber } from '@backstage/plugin-events-backend-test-utils';
+import { EventParams, EventSubscriber } from '@backstage/plugin-events-node';
import { InMemoryEventBroker } from './InMemoryEventBroker';
const logger = getVoidLogger();
@@ -63,4 +64,51 @@ describe('InMemoryEventBroker', () => {
eventPayload: { test: 'topicC' },
});
});
+
+ it('logs errors from subscribers', async () => {
+ const topic = 'testTopic';
+
+ const subscriber1 = new (class Subscriber1 implements EventSubscriber {
+ supportsEventTopics() {
+ return [topic];
+ }
+ async onEvent(event: EventParams) {
+ throw new Error(`NOPE ${event.eventPayload}`);
+ }
+ })();
+ const subscriber2 = new (class Subscriber2 implements EventSubscriber {
+ supportsEventTopics() {
+ return [topic];
+ }
+ async onEvent(event: EventParams) {
+ throw new Error(`NOPE ${event.eventPayload}`);
+ }
+ })();
+
+ const errorSpy = jest.spyOn(logger, 'error');
+ const eventBroker = new InMemoryEventBroker(logger);
+
+ eventBroker.subscribe(subscriber1);
+ await eventBroker.publish({ topic, eventPayload: '1' });
+
+ expect(errorSpy).toHaveBeenCalledTimes(1);
+ expect(errorSpy).toHaveBeenCalledWith(
+ 'Subscriber "Subscriber1" failed to process event',
+ new Error('NOPE 1'),
+ );
+
+ eventBroker.subscribe(subscriber2);
+ await eventBroker.publish({ topic, eventPayload: '2' });
+
+ // With two subscribers we should not halt on the first error but call all subscribers
+ expect(errorSpy).toHaveBeenCalledTimes(3);
+ expect(errorSpy).toHaveBeenCalledWith(
+ 'Subscriber "Subscriber1" failed to process event',
+ new Error('NOPE 2'),
+ );
+ expect(errorSpy).toHaveBeenCalledWith(
+ 'Subscriber "Subscriber2" failed to process event',
+ new Error('NOPE 2'),
+ );
+ });
});
diff --git a/plugins/events-backend/src/service/InMemoryEventBroker.ts b/plugins/events-backend/src/service/InMemoryEventBroker.ts
index 90c7d912fe..04be01f658 100644
--- a/plugins/events-backend/src/service/InMemoryEventBroker.ts
+++ b/plugins/events-backend/src/service/InMemoryEventBroker.ts
@@ -42,7 +42,18 @@ export class InMemoryEventBroker implements EventBroker {
);
const subscribed = this.subscribers[params.topic] ?? [];
- subscribed.forEach(subscriber => subscriber.onEvent(params));
+ await Promise.all(
+ subscribed.map(async subscriber => {
+ try {
+ await subscriber.onEvent(params);
+ } catch (error) {
+ this.logger.error(
+ `Subscriber "${subscriber.constructor.name}" failed to process event`,
+ error,
+ );
+ }
+ }),
+ );
}
subscribe(
diff --git a/plugins/explore-backend/README.md b/plugins/explore-backend/README.md
index d1714806f4..3edf48249a 100644
--- a/plugins/explore-backend/README.md
+++ b/plugins/explore-backend/README.md
@@ -11,32 +11,32 @@ for these tools.
```bash
# From your Backstage root directory
-yarn add --cwd packages/backend @backstage/plugin-explore-backend
+yarn add --cwd packages/backend @backstage/plugin-explore-backend @backstage/plugin-explore-common
```
### Adding the plugin to your `packages/backend`
You'll need to add the plugin to the router in your `backend` package. You can
-do this by creating a file called `packages/backend/src/plugins/explore.ts`
+do this by creating a file called `packages/backend/src/plugins/explore.ts` with the following content:
```ts
import {
createRouter,
StaticExploreToolProvider,
} from '@backstage/plugin-explore-backend';
+import { ExploreTool } from '@backstage/plugin-explore-common';
import { Router } from 'express';
import { PluginEnvironment } from '../types';
// List of tools you want to surface in the Explore plugin "Tools" page.
-const tools: ExploreTool[] = [
+const exploreTools: ExploreTool[] = [
{
title: 'New Relic',
- description:'new relic plugin',
+ description: 'new relic plugin',
url: '/newrelic',
image: 'https://i.imgur.com/L37ikrX.jpg',
tags: ['newrelic', 'proxy', 'nerdGraph'],
},
- ...
];
export default async function createPlugin(
diff --git a/plugins/explore/README.md b/plugins/explore/README.md
index 0204f34714..2388d97ac1 100644
--- a/plugins/explore/README.md
+++ b/plugins/explore/README.md
@@ -68,6 +68,7 @@ ready to make modifications, add the following code snippet to add the
```diff
+import { ToolSearchResultListItem } from '@backstage/plugin-explore';
++import BuildIcon from '@material-ui/icons/Build';
const SearchPage = () => {
...
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('
-
- {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/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.test.tsx b/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.test.tsx
index 7724a2ae23..3156662bf3 100644
--- a/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.test.tsx
+++ b/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.test.tsx
@@ -15,41 +15,33 @@
*/
import React from 'react';
-import { render } from '@testing-library/react';
+import { renderInTestApp } from '@backstage/test-utils';
import { GraphiQLBrowser } from './GraphiQLBrowser';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
-jest.mock('graphiql', () => () => '
- ,
- );
+ it('should render error text if there are no endpoints', async () => {
+ const rendered = await renderInTestApp(
- ,
+ it('should render endpoint tabs', async () => {
+ const rendered = await renderInTestApp(
+
-
-
- ,
+ const rendered = await renderInTestApp(
+
+ ,
);
act(() => {
@@ -66,16 +54,9 @@ describe('GraphiQLPage', () => {
},
};
- const rendered = await renderWithEffects(
-
-
-
+ const rendered = await renderInTestApp(
+
+ ,
);
@@ -90,16 +71,9 @@ describe('GraphiQLPage', () => {
},
};
- const rendered = await renderWithEffects(
-
-
-
+ const rendered = await renderInTestApp(
+
+ ,
);
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(
-
- ,
+
- ,
+
- ,
+
- ,
+ = {
- post: jest.fn(),
- error$: jest.fn(),
- };
-
- beforeEach(() => {
- apis = TestApiRegistry.from(
- [lighthouseApiRef, new LighthouseRestApi('http://lighthouse')],
- [errorApiRef, mockErrorApi],
- );
-
- (useWebsiteForEntity as jest.Mock).mockReturnValue({
- value: entityWebsite,
- loading: false,
- error: null,
- });
+ afterEach(() => {
+ jest.resetAllMocks();
});
const entity: Entity = {
@@ -78,66 +57,55 @@ describe('
-
-
-
-
-
-
- ,
- );
+ const subject = () => (
+
+
+
+
+ );
it('renders the audit list for the entity', async () => {
- const { findByText } = subject();
+ useWebsiteForEntityMock.mockReturnValue({
+ value: entityWebsite,
+ loading: false,
+ error: null,
+ });
+ const { findByText } = await renderInTestApp(subject());
expect(await findByText(entityWebsite.url)).toBeInTheDocument();
});
- describe('where the data is loading', () => {
- beforeEach(() => {
- (useWebsiteForEntity as jest.Mock).mockReturnValue({
- value: null,
- loading: true,
- error: null,
- });
+ it('renders a Progress element where the data is loading', async () => {
+ useWebsiteForEntityMock.mockReturnValue({
+ value: null,
+ loading: true,
+ error: null,
});
- it('renders a Progress element', async () => {
- const { findByTestId } = subject();
- expect(await findByTestId('progress')).toBeInTheDocument();
- });
+ const { findByTestId } = await renderInTestApp(subject());
+ expect(await findByTestId('progress')).toBeInTheDocument();
});
- describe('where there is an error loading data', () => {
- beforeEach(() => {
- (useWebsiteForEntity as jest.Mock).mockReturnValue({
- value: null,
- loading: false,
- error: 'error',
- });
- });
-
- it('renders nothing', async () => {
- const { queryByTestId } = subject();
- expect(queryByTestId('AuditListTable')).toBeNull();
+ it('renders nothing where there is an error loading data', async () => {
+ useWebsiteForEntityMock.mockReturnValue({
+ value: null,
+ loading: false,
+ error: 'error',
});
+ const { queryByTestId } = await renderInTestApp(subject());
+ expect(queryByTestId('AuditListTable')).toBeNull();
});
- describe('where there is not data', () => {
- beforeEach(() => {
- (useWebsiteForEntity as jest.Mock).mockReturnValue({
- value: null,
- loading: false,
- error: null,
- });
+ it('renders nothing where there is not data', async () => {
+ useWebsiteForEntityMock.mockReturnValue({
+ value: null,
+ loading: false,
+ error: null,
});
- it('renders nothing', async () => {
- const { queryByTestId } = subject();
- expect(queryByTestId('AuditListTable')).toBeNull();
- });
+ const { queryByTestId } = await renderInTestApp(subject());
+ expect(queryByTestId('AuditListTable')).toBeNull();
});
});
diff --git a/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.test.tsx b/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.test.tsx
index ab1e2683b6..c59458f3f3 100644
--- a/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.test.tsx
+++ b/plugins/lighthouse/src/components/Cards/LastLighthouseAuditCard.test.tsx
@@ -16,11 +16,8 @@
import { Entity } from '@backstage/catalog-model';
import { EntityProvider } from '@backstage/plugin-catalog-react';
-import { lightTheme } from '@backstage/theme';
-import { ThemeProvider } from '@material-ui/core';
-import { render } from '@testing-library/react';
+import { renderInTestApp } from '@backstage/test-utils';
import React from 'react';
-import { MemoryRouter } from 'react-router-dom';
import {
AuditCompleted,
LighthouseCategoryId,
@@ -64,22 +61,15 @@ describe('
-
-
-
-
- ,
- );
-
describe('where the last audit completed successfully', () => {
const audit = entityWebsite.lastAudit as AuditCompleted;
it('renders the performance data for the audit', async () => {
- const { findByText } = subject();
+ const { findByText } = await renderInTestApp(
+
+ ,
+ );
expect(await findByText(audit.url)).toBeInTheDocument();
expect(await findByText(audit.status)).toBeInTheDocument();
for (const category of Object.keys(audit.categories)) {
@@ -101,7 +91,11 @@ describe('
+ ,
+ );
expect(await findByText('N/A')).toBeInTheDocument();
});
});
@@ -119,7 +113,11 @@ describe('
+ ,
+ );
expect(await findByText(audit.url)).toBeInTheDocument();
expect(await findByText(audit.status)).toBeInTheDocument();
});
@@ -135,7 +133,11 @@ describe('
+ ,
+ );
expect(await findByTestId('progress')).toBeInTheDocument();
});
});
@@ -150,7 +152,11 @@ describe('
+ ,
+ );
expect(queryByTestId('AuditListTable')).toBeNull();
});
});
@@ -165,7 +171,11 @@ describe('
+ ,
+ );
expect(queryByTestId('AuditListTable')).toBeNull();
});
});
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('should render an icon link', async () => {
+ const rendered = await renderInTestApp(
+
- ,
- );
+ const cell = await renderInTestApp(
- ,
- );
+ const cell = await renderInTestApp(
- ,
+ const table = await renderInTestApp(
+
- ,
+ const table = await renderInTestApp(
+
- ,
+ const table = await renderInTestApp(
+ {children}
+ {children}
);
diff --git a/plugins/tech-radar/src/components/Radar/Radar.test.tsx b/plugins/tech-radar/src/components/Radar/Radar.test.tsx
index 1b9e10ae5b..b76eb20a16 100644
--- a/plugins/tech-radar/src/components/Radar/Radar.test.tsx
+++ b/plugins/tech-radar/src/components/Radar/Radar.test.tsx
@@ -15,9 +15,7 @@
*/
import React from 'react';
-import { render } from '@testing-library/react';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
+import { renderInTestApp } from '@backstage/test-utils';
import GetBBoxPolyfill from '../../utils/polyfills/getBBox';
import Radar, { Props } from './Radar';
@@ -48,12 +46,8 @@ describe('Radar', () => {
GetBBoxPolyfill.remove();
});
- it('should render', () => {
- const rendered = render(
-
- ,
- );
+ it('should render', async () => {
+ const rendered = await renderInTestApp(
-
-
- ,
+ it('should render', async () => {
+ const rendered = await renderInTestApp(
+
+ ,
);
expect(rendered.getByText(minProps.text)).toBeInTheDocument();
diff --git a/plugins/tech-radar/src/components/RadarComponent.test.tsx b/plugins/tech-radar/src/components/RadarComponent.test.tsx
index 3d3b1bfd17..4bb207a1de 100644
--- a/plugins/tech-radar/src/components/RadarComponent.test.tsx
+++ b/plugins/tech-radar/src/components/RadarComponent.test.tsx
@@ -15,10 +15,7 @@
*/
import React from 'react';
-import { act, render, waitFor } from '@testing-library/react';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
-import { TestApiProvider, withLogCollector } from '@backstage/test-utils';
+import { renderInTestApp, TestApiProvider } from '@backstage/test-utils';
import GetBBoxPolyfill from '../utils/polyfills/getBBox';
import { RadarComponent } from './RadarComponent';
@@ -36,7 +33,9 @@ describe('RadarComponent', () => {
});
class MockClient implements TechRadarApi {
+ constructor(private delay = 0) {}
async load(): Promise {
+ await new Promise(resolve => setTimeout(resolve, this.delay));
return {
entries: [],
quadrants: [],
@@ -45,87 +44,52 @@ describe('RadarComponent', () => {
}
}
- const mockClient = new MockClient();
-
it('should render a progress bar', async () => {
jest.useFakeTimers();
- const errorApi = { post: () => {} };
- const { getByTestId, findByTestId } = render(
-
-
-
- ,
+ const { findByTestId } = await renderInTestApp(
+
+ ,
);
- act(() => {
- jest.advanceTimersByTime(250);
- });
- expect(getByTestId('progress')).toBeInTheDocument();
+ jest.advanceTimersByTime(250);
+ await expect(findByTestId('progress')).resolves.toBeInTheDocument();
+
+ jest.advanceTimersByTime(250);
+ await expect(findByTestId('tech-radar-svg')).resolves.toBeInTheDocument();
- await findByTestId('tech-radar-svg');
jest.useRealTimers();
});
it('should call the errorApi if load fails', async () => {
const errorApi = { post: jest.fn() };
+ const mockClient = new MockClient();
jest
.spyOn(mockClient, 'load')
.mockRejectedValue(new Error('404 Page Not Found'));
- const { queryByTestId } = render(
-
-
-
- ,
+ const { queryByTestId } = await renderInTestApp(
+
+ ,
);
- await waitFor(() => !queryByTestId('progress'));
-
expect(errorApi.post).toHaveBeenCalledTimes(1);
expect(errorApi.post).toHaveBeenCalledWith(new Error('404 Page Not Found'));
expect(queryByTestId('tech-radar-svg')).not.toBeInTheDocument();
});
-
- it('should not render without errorApiRef', () => {
- expect(
- withLogCollector(['error'], () => {
- expect(() => {
- render(
-
-
-
- ,
- );
- }).toThrow();
- }).error[0],
- ).toMatchObject({
- detail: new Error('No implementation available for apiRef{core.error}'),
- });
- });
});
diff --git a/plugins/tech-radar/src/components/RadarDescription/RadarDescription.test.tsx b/plugins/tech-radar/src/components/RadarDescription/RadarDescription.test.tsx
index 7249b9f194..7f2dcbe6ac 100644
--- a/plugins/tech-radar/src/components/RadarDescription/RadarDescription.test.tsx
+++ b/plugins/tech-radar/src/components/RadarDescription/RadarDescription.test.tsx
@@ -15,11 +15,10 @@
*/
import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
+import { screen } from '@testing-library/react';
import { Props, RadarDescription } from './RadarDescription';
+import { renderInTestApp } from '@backstage/test-utils';
const minProps: Props = {
open: true,
@@ -29,12 +28,8 @@ const minProps: Props = {
};
describe('RadarDescription', () => {
- it('should render', () => {
- render(
-
- ,
- );
+ it('should render', async () => {
+ await renderInTestApp(
-
-
- ,
+ it('should render link only', async () => {
+ await renderInTestApp(
+
+ ,
);
const radarEntry = screen.getByTestId('radar-entry');
@@ -62,12 +59,10 @@ describe('RadarEntry', () => {
});
it('should render with description', async () => {
- render(
-
-
-
- ,
+ await renderInTestApp(
+
+ ,
);
await userEvent.click(screen.getByRole('button'));
@@ -80,17 +75,15 @@ describe('RadarEntry', () => {
expect(screen.getByText(String(minProps.value))).toBeInTheDocument();
});
- it('should render blip with url equal to # if description present', () => {
+ it('should render blip with url equal to # if description present', async () => {
const withUrl = {
...optionalProps,
url: 'http://backstage.io',
};
- render(
-
-
-
- ,
+ await renderInTestApp(
+
+ ,
);
expect(screen.getByRole('button')).toHaveAttribute('href', '#');
diff --git a/plugins/tech-radar/src/components/RadarFooter/RadarFooter.test.tsx b/plugins/tech-radar/src/components/RadarFooter/RadarFooter.test.tsx
index b76405f2bf..df56e2ad2c 100644
--- a/plugins/tech-radar/src/components/RadarFooter/RadarFooter.test.tsx
+++ b/plugins/tech-radar/src/components/RadarFooter/RadarFooter.test.tsx
@@ -15,9 +15,7 @@
*/
import React from 'react';
-import { render } from '@testing-library/react';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
+import { renderInTestApp } from '@backstage/test-utils';
import GetBBoxPolyfill from '../../utils/polyfills/getBBox';
import RadarFooter, { Props } from './RadarFooter';
@@ -36,13 +34,11 @@ describe('RadarFooter', () => {
GetBBoxPolyfill.remove();
});
- it('should render', () => {
- const rendered = render(
-
-
-
- ,
+ it('should render', async () => {
+ const rendered = await renderInTestApp(
+
+ ,
);
const radarFooter = rendered.getByTestId('radar-footer');
const { x, y } = minProps;
diff --git a/plugins/tech-radar/src/components/RadarGrid/RadarGrid.test.tsx b/plugins/tech-radar/src/components/RadarGrid/RadarGrid.test.tsx
index d5636d74b8..2e0a5a225c 100644
--- a/plugins/tech-radar/src/components/RadarGrid/RadarGrid.test.tsx
+++ b/plugins/tech-radar/src/components/RadarGrid/RadarGrid.test.tsx
@@ -15,9 +15,7 @@
*/
import React from 'react';
-import { render } from '@testing-library/react';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
+import { renderInTestApp } from '@backstage/test-utils';
import GetBBoxPolyfill from '../../utils/polyfills/getBBox';
import RadarGrid, { Props } from './RadarGrid';
@@ -36,13 +34,11 @@ describe('RadarGrid', () => {
GetBBoxPolyfill.remove();
});
- it('should render', () => {
- const rendered = render(
-
-
-
- ,
+ it('should render', async () => {
+ const rendered = await renderInTestApp(
+
+ ,
);
expect(rendered.getByTestId('radar-grid-x-line')).toBeInTheDocument();
diff --git a/plugins/tech-radar/src/components/RadarLegend/RadarLegend.test.tsx b/plugins/tech-radar/src/components/RadarLegend/RadarLegend.test.tsx
index e0b5f09a63..de8bfd15d7 100644
--- a/plugins/tech-radar/src/components/RadarLegend/RadarLegend.test.tsx
+++ b/plugins/tech-radar/src/components/RadarLegend/RadarLegend.test.tsx
@@ -14,9 +14,7 @@
* limitations under the License.
*/
-import { lightTheme } from '@backstage/theme';
-import { ThemeProvider } from '@material-ui/core';
-import { render } from '@testing-library/react';
+import { renderInTestApp } from '@backstage/test-utils';
import React from 'react';
import GetBBoxPolyfill from '../../utils/polyfills/getBBox';
@@ -47,13 +45,11 @@ describe('RadarLegend', () => {
GetBBoxPolyfill.remove();
});
- it('should render', () => {
- const rendered = render(
-
-
-
- ,
+ it('should render', async () => {
+ const rendered = await renderInTestApp(
+
+ ,
);
expect(rendered.getByTestId('radar-legend')).toBeInTheDocument();
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/tech-radar/src/components/RadarPlot/RadarPlot.test.tsx b/plugins/tech-radar/src/components/RadarPlot/RadarPlot.test.tsx
index fd03111b49..7557755ed2 100644
--- a/plugins/tech-radar/src/components/RadarPlot/RadarPlot.test.tsx
+++ b/plugins/tech-radar/src/components/RadarPlot/RadarPlot.test.tsx
@@ -15,9 +15,7 @@
*/
import React from 'react';
-import { render } from '@testing-library/react';
-import { ThemeProvider } from '@material-ui/core';
-import { lightTheme } from '@backstage/theme';
+import { renderInTestApp } from '@backstage/test-utils';
import GetBBoxPolyfill from '../../utils/polyfills/getBBox';
import RadarPlot, { Props } from './RadarPlot';
@@ -49,13 +47,11 @@ describe('RadarPlot', () => {
GetBBoxPolyfill.remove();
});
- it('should render', () => {
- const rendered = render(
-
-
-
- ,
+ it('should render', async () => {
+ const rendered = await renderInTestApp(
+
+ ,
);
expect(rendered.getByTestId('radar-plot')).toBeInTheDocument();
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('
-
-
- {children}
-
-
-
+
+
+ {children}
+
+
);
describe('