From d09df7ac27e01707348f31b700be2528480ef9e1 Mon Sep 17 00:00:00 2001 From: Mohamed Mohamed Date: Thu, 10 Nov 2022 11:37:41 -0600 Subject: [PATCH 1/3] have code follow eslint rules Signed-off-by: Mohamed Mohamed --- .../ExampleComponent/ExampleComponent.test.tsx.hbs | 5 +++-- .../ExampleFetchComponent.test.tsx.hbs | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) 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 ccbebcac40..ae626c0d57 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 @@ -4,6 +4,7 @@ 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'; import { setupRequestMockHandlers, renderInTestApp, @@ -22,11 +23,11 @@ describe('ExampleComponent', () => { }); it('should render', async () => { - const rendered = await renderInTestApp( + await renderInTestApp( , ); - expect(rendered.getByText('Welcome to {{ id }}!')).toBeInTheDocument(); + expect(screen.getByText('Welcome to {{ id }}!')).toBeInTheDocument(); }); }); diff --git a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs index 95533c899d..0dded1dcc2 100644 --- a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs +++ b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs @@ -1,10 +1,11 @@ import React from 'react'; -import { render } from '@testing-library/react'; +import { render, screen } from '@testing-library/react'; import { ExampleFetchComponent } from './ExampleFetchComponent'; import { rest } from 'msw'; import { setupServer } from 'msw/node'; import { setupRequestMockHandlers } from '@backstage/test-utils'; + describe('ExampleFetchComponent', () => { const server = setupServer(); // Enable sane handlers for network requests @@ -19,7 +20,7 @@ describe('ExampleFetchComponent', () => { ); }); it('should render', async () => { - const rendered = render(); - expect(await rendered.findByTestId('progress')).toBeInTheDocument(); + await render(); + expect(await screen.findByTestId('progress')).toBeInTheDocument(); }); }); From 91d050c140b95b5cd0479764fe8fbd4f21d653fb Mon Sep 17 00:00:00 2001 From: Mohamed Mohamed Date: Fri, 11 Nov 2022 10:23:40 -0600 Subject: [PATCH 2/3] yarn changeset Signed-off-by: Mohamed Mohamed --- .changeset/early-hairs-switch.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/early-hairs-switch.md diff --git a/.changeset/early-hairs-switch.md b/.changeset/early-hairs-switch.md new file mode 100644 index 0000000000..328072ec51 --- /dev/null +++ b/.changeset/early-hairs-switch.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': minor +--- + +changed tests created by create-plugin to follow eslint-rules best practices particularly testing-library/prefer-screen-queries and testing-library/render-result-naming-convention From 1f15c28ae68bad5d1907476fc548a87057f6caf7 Mon Sep 17 00:00:00 2001 From: Mohamed Mohamed Date: Mon, 14 Nov 2022 09:44:04 -0600 Subject: [PATCH 3/3] pr review changes Signed-off-by: Mohamed Mohamed --- .changeset/early-hairs-switch.md | 2 +- .../ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.changeset/early-hairs-switch.md b/.changeset/early-hairs-switch.md index 328072ec51..16f4298db5 100644 --- a/.changeset/early-hairs-switch.md +++ b/.changeset/early-hairs-switch.md @@ -1,5 +1,5 @@ --- -'@backstage/cli': minor +'@backstage/cli': patch --- changed tests created by create-plugin to follow eslint-rules best practices particularly testing-library/prefer-screen-queries and testing-library/render-result-naming-convention diff --git a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs index 0dded1dcc2..a553ecd0b0 100644 --- a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs +++ b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.test.tsx.hbs @@ -5,7 +5,6 @@ import { rest } from 'msw'; import { setupServer } from 'msw/node'; import { setupRequestMockHandlers } from '@backstage/test-utils'; - describe('ExampleFetchComponent', () => { const server = setupServer(); // Enable sane handlers for network requests