From 8a659d0b2fc7dd72e2543da06179d0a354e5fc6d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 11 Nov 2023 14:01:57 +0000
Subject: [PATCH 1/2] chore(deps): update dependency
 eslint-plugin-testing-library to v6

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json |  2 +-
 yarn.lock    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 25d89ba398..cfcaeb6f9b 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "eslint": "^8.6.0",
     "eslint-plugin-notice": "^0.9.10",
     "eslint-plugin-react": "^7.28.0",
-    "eslint-plugin-testing-library": "^5.9.1",
+    "eslint-plugin-testing-library": "^6.0.0",
     "fs-extra": "10.1.0",
     "husky": "^8.0.0",
     "lint-staged": "^13.0.0",
diff --git a/yarn.lock b/yarn.lock
index 09e89406a9..d3ba4e8065 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -27057,14 +27057,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-testing-library@npm:^5.9.1":
-  version: 5.11.1
-  resolution: "eslint-plugin-testing-library@npm:5.11.1"
+"eslint-plugin-testing-library@npm:^6.0.0":
+  version: 6.1.2
+  resolution: "eslint-plugin-testing-library@npm:6.1.2"
   dependencies:
     "@typescript-eslint/utils": ^5.58.0
   peerDependencies:
     eslint: ^7.5.0 || ^8.0.0
-  checksum: 9f3fc68ef9f13016a4381b33ab5dbffcc189e5de3eaeba184bcf7d2771faa7f54e59c04b652162fb1c0f83fb52428dd909db5450a25508b94be59eba69fcc990
+  checksum: 74e6b1bdff52e9a3937be1ae0e3ddb6cfedcd97044ac5275be6e7472c77cf8ae0f6e29fd7d3b90aac1318e22850086e73ee8dde7de8d9034be59cdfed9ba7bd7
   languageName: node
   linkType: hard
 
@@ -41329,7 +41329,7 @@ __metadata:
     eslint: ^8.6.0
     eslint-plugin-notice: ^0.9.10
     eslint-plugin-react: ^7.28.0
-    eslint-plugin-testing-library: ^5.9.1
+    eslint-plugin-testing-library: ^6.0.0
     fs-extra: 10.1.0
     husky: ^8.0.0
     lint-staged: ^13.0.0

From c9f113f8747676bda2192f5506b7b900e8fc01cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Mon, 13 Nov 2023 09:59:37 +0100
Subject: [PATCH 2/2] fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .eslintrc.js                                               | 7 +++----
 .../EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx | 4 ++--
 .../src/scaffolder/actions/builtin/github/helpers.ts       | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 0d937fc6b4..2df965ab73 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -45,13 +45,12 @@ module.exports = {
           "CallExpression[arguments.length=0] > MemberExpression[property.name='toUpperCase']",
       },
     ],
-    'testing-library/await-async-query': 'error',
+    'testing-library/await-async-queries': 'error',
     'testing-library/await-async-utils': 'error',
-    'testing-library/no-await-sync-query': 'error',
-    'testing-library/prefer-wait-for': 'error',
+    'testing-library/no-await-sync-queries': 'error',
     'testing-library/no-dom-import': 'error',
     'testing-library/no-wait-for-side-effects': 'error',
-    'testing-library/no-wait-for-empty-callback': 'error',
+    'testing-library/await-async-events': 'error',
     'no-restricted-globals': [
       'error',
       [
diff --git a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
index 85a477801a..d8bd8f11a6 100644
--- a/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
+++ b/plugins/catalog-react/src/components/EntityPeekAheadPopover/EntityPeekAheadPopover.test.tsx
@@ -66,12 +66,12 @@ describe('<EntityPeekAheadPopover/>', () => {
     );
     expect(screen.getByText('s1')).toBeInTheDocument();
     expect(screen.queryByText('service1')).toBeNull();
-    user.hover(screen.getByTestId('popover1'));
+    await user.hover(screen.getByTestId('popover1'));
     expect(await screen.findByText('service1')).toBeInTheDocument();
 
     expect(screen.getByText('s2')).toBeInTheDocument();
     expect(screen.queryByText('service2')).toBeNull();
-    user.hover(screen.getByTestId('popover2'));
+    await user.hover(screen.getByTestId('popover2'));
     expect(
       await screen.findByText('Error: component:default/service2 not found'),
     ).toBeInTheDocument();
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
index edef7cec5c..d91f3bf3a2 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/helpers.ts
@@ -134,7 +134,7 @@ export async function createGithubRepoWithCollaboratorsAndTopics(
   secrets: { [key: string]: string } | undefined,
   logger: Logger,
 ) {
-  // eslint-disable-next-line testing-library/no-await-sync-query
+  // eslint-disable-next-line testing-library/no-await-sync-queries
   const user = await client.rest.users.getByUsername({
     username: owner,
   });
@@ -409,7 +409,7 @@ async function validateAccessTeam(client: Octokit, access: string) {
   try {
     // Below rule disabled because of a 'getByName' check for a different library
     // incorrectly triggers here.
-    // eslint-disable-next-line testing-library/no-await-sync-query
+    // eslint-disable-next-line testing-library/no-await-sync-queries
     await client.rest.teams.getByName({
       org,
       team_slug,