From bcbff6d76f68a53bfa7f6bb90779ea393d8017b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Feb 2021 14:49:44 +0000 Subject: [PATCH 1/2] chore(deps): bump @testing-library/react from 10.4.3 to 11.2.5 Bumps [@testing-library/react](https://github.com/testing-library/react-testing-library) from 10.4.3 to 11.2.5. - [Release notes](https://github.com/testing-library/react-testing-library/releases) - [Changelog](https://github.com/testing-library/react-testing-library/blob/master/CHANGELOG.md) - [Commits](https://github.com/testing-library/react-testing-library/compare/v10.4.3...v11.2.5) Signed-off-by: dependabot[bot] --- packages/app/package.json | 2 +- packages/core-api/package.json | 2 +- packages/core/package.json | 2 +- packages/dev-utils/package.json | 2 +- packages/test-utils-core/package.json | 2 +- packages/test-utils/package.json | 2 +- plugins/api-docs/package.json | 2 +- plugins/catalog-import/package.json | 2 +- .../StepPrepareCreatePullRequest.test.tsx | 18 +++-- plugins/catalog-react/package.json | 2 +- plugins/catalog/package.json | 2 +- plugins/circleci/package.json | 2 +- plugins/cloudbuild/package.json | 2 +- plugins/cost-insights/package.json | 2 +- plugins/explore-react/package.json | 2 +- plugins/explore/package.json | 2 +- plugins/fossa/package.json | 2 +- plugins/gcp-projects/package.json | 2 +- plugins/github-actions/package.json | 2 +- plugins/gitops-profiles/package.json | 2 +- plugins/graphiql/package.json | 2 +- plugins/jenkins/package.json | 2 +- plugins/kafka/package.json | 2 +- plugins/kubernetes/package.json | 2 +- plugins/lighthouse/package.json | 2 +- plugins/newrelic/package.json | 2 +- plugins/org/package.json | 2 +- plugins/pagerduty/package.json | 2 +- plugins/register-component/package.json | 2 +- plugins/rollbar/package.json | 2 +- plugins/scaffolder/package.json | 2 +- plugins/search/package.json | 2 +- plugins/sentry/package.json | 2 +- plugins/sonarqube/package.json | 2 +- plugins/splunk-on-call/package.json | 2 +- plugins/tech-radar/package.json | 2 +- plugins/techdocs/package.json | 2 +- plugins/user-settings/package.json | 2 +- plugins/welcome/package.json | 2 +- yarn.lock | 70 +++++++++++++------ 40 files changed, 96 insertions(+), 68 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 76a087a4fd..a52d0db483 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -56,7 +56,7 @@ "@backstage/test-utils": "^0.1.8", "@testing-library/cypress": "^7.0.1", "@testing-library/jest-dom": "^5.10.1", - "@testing-library/react": "^10.4.1", + "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^12.0.7", "@types/jest": "^26.0.7", "@types/jquery": "^3.3.34", diff --git a/packages/core-api/package.json b/packages/core-api/package.json index d3eb0d7791..2b01d209ec 100644 --- a/packages/core-api/package.json +++ b/packages/core-api/package.json @@ -46,7 +46,7 @@ "@backstage/test-utils": "^0.1.8", "@backstage/test-utils-core": "^0.1.1", "@testing-library/jest-dom": "^5.10.1", - "@testing-library/react": "^10.4.1", + "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^12.0.7", "@types/jest": "^26.0.7", "@types/node": "^12.0.0", diff --git a/packages/core/package.json b/packages/core/package.json index c2fae32d6c..2de07ebcca 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -71,7 +71,7 @@ "@backstage/cli": "^0.6.2", "@backstage/test-utils": "^0.1.8", "@testing-library/jest-dom": "^5.10.1", - "@testing-library/react": "^10.4.1", + "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^12.0.7", "@types/classnames": "^2.2.9", "@types/d3-selection": "^2.0.0", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 0d2af1bc69..54c42ac70c 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -37,7 +37,7 @@ "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", "@testing-library/jest-dom": "^5.10.1", - "@testing-library/react": "^10.4.1", + "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^12.0.7", "@types/react": "^16.9", "react": "^16.12.0", diff --git a/packages/test-utils-core/package.json b/packages/test-utils-core/package.json index b35aef77d3..ab1fea89b5 100644 --- a/packages/test-utils-core/package.json +++ b/packages/test-utils-core/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@testing-library/jest-dom": "^5.10.1", - "@testing-library/react": "^10.4.1", + "@testing-library/react": "^11.2.5", "@types/react": "^16.9", "react": "^16.12.0", "react-dom": "^16.12.0" diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index fbbd4f9eca..47d223539e 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -34,7 +34,7 @@ "@backstage/theme": "^0.2.3", "@material-ui/core": "^4.11.0", "@testing-library/jest-dom": "^5.10.1", - "@testing-library/react": "^10.4.1", + "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^12.0.7", "@types/react": "^16.9", "msw": "^0.21.3", diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index bdf6ccf47c..4aaace1841 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -53,7 +53,7 @@ "@backstage/dev-utils": "^0.1.12", "@backstage/test-utils": "^0.1.8", "@testing-library/jest-dom": "^5.10.1", - "@testing-library/react": "^10.4.1", + "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^12.0.7", "@types/jest": "^26.0.7", "@types/node": "^12.0.0", diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index a427a0e884..83c9a0394e 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -55,7 +55,7 @@ "@backstage/dev-utils": "^0.1.12", "@backstage/test-utils": "^0.1.8", "@testing-library/jest-dom": "^5.10.1", - "@testing-library/react": "^10.4.1", + "@testing-library/react": "^11.2.5", "@testing-library/react-hooks": "^3.3.0", "@testing-library/user-event": "^12.0.7", "@types/jest": "^26.0.7", diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx index 606f9ff88e..bef0926192 100644 --- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx +++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/StepPrepareCreatePullRequest.test.tsx @@ -17,7 +17,7 @@ import { ApiProvider, ApiRegistry } from '@backstage/core'; import { catalogApiRef } from '@backstage/plugin-catalog-react'; import { TextField } from '@material-ui/core'; -import { act, render, RenderResult } from '@testing-library/react'; +import { act, render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import React from 'react'; import { AnalyzeResult, catalogImportApiRef } from '../../api'; @@ -120,9 +120,8 @@ describe('', () => { }), ); - let result: RenderResult; await act(async () => { - result = await render( + await render( ', () => { }, ); - await userEvent.type(await result.getByLabelText('name'), '-changed'); - await userEvent.type(await result.getByLabelText('owner'), '-changed'); + await userEvent.type(await screen.getByLabelText('name'), '-changed'); + await userEvent.type(await screen.getByLabelText('owner'), '-changed'); await userEvent.click( - await result.getByRole('button', { name: /Create PR/i }), + await screen.getByRole('button', { name: /Create PR/i }), ); }); @@ -211,9 +210,8 @@ spec: new Error('some error'), ); - let result: RenderResult; await act(async () => { - result = await render( + await render( Date: Mon, 1 Mar 2021 16:33:20 +0100 Subject: [PATCH 2/2] cli: bump tlr dependency in plugin template Signed-off-by: Patrik Oldsberg --- .changeset/nice-spies-beam.md | 5 +++++ packages/cli/templates/default-plugin/package.json.hbs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/nice-spies-beam.md diff --git a/.changeset/nice-spies-beam.md b/.changeset/nice-spies-beam.md new file mode 100644 index 0000000000..0ac956709a --- /dev/null +++ b/.changeset/nice-spies-beam.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': patch +--- + +Bump `@testing-library/react` in the plugin template from `^10.4.1` to `^11.2.5`. To apply this to an existing plugin, update the dependency in your `package.json`. diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs index a3f924408a..ffd197d163 100644 --- a/packages/cli/templates/default-plugin/package.json.hbs +++ b/packages/cli/templates/default-plugin/package.json.hbs @@ -38,7 +38,7 @@ "@backstage/dev-utils": "^{{version '@backstage/dev-utils'}}", "@backstage/test-utils": "^{{version '@backstage/test-utils'}}", "@testing-library/jest-dom": "^5.10.1", - "@testing-library/react": "^10.4.1", + "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^12.0.7", "@types/jest": "^26.0.7", "@types/node": "^12.0.0",