From 9f6c4233ac7aa37e019dd1b61f6b80d538d84c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Wed, 13 Oct 2021 16:18:59 +0200
Subject: [PATCH] made more tests async
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .../PreviewCatalogInfoComponent.test.tsx      | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx
index 2618fab57a..ea3ea3e96f 100644
--- a/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx
+++ b/plugins/catalog-import/src/components/StepPrepareCreatePullRequest/PreviewCatalogInfoComponent.test.tsx
@@ -16,7 +16,7 @@
 
 import { Entity } from '@backstage/catalog-model';
 import { makeStyles } from '@material-ui/core';
-import { render } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { renderHook } from '@testing-library/react-hooks';
 import React from 'react';
 import { PreviewCatalogInfoComponent } from './PreviewCatalogInfoComponent';
@@ -46,15 +46,17 @@ const entities: Entity[] = [
 
 describe('<PreviewCatalogInfoComponent />', () => {
   it('renders without exploding', async () => {
-    const { getByText, findByText } = render(
+    render(
       <PreviewCatalogInfoComponent
         repositoryUrl="http://my-repository/a/"
         entities={entities}
       />,
     );
 
-    const repositoryUrl = getByText('http://my-repository/a/catalog-info.yaml');
-    const kindText = await findByText('Kind_2');
+    const repositoryUrl = screen.getByText(
+      'http://my-repository/a/catalog-info.yaml',
+    );
+    const kindText = await screen.findByText('Kind_2');
     expect(repositoryUrl).toBeInTheDocument();
     expect(repositoryUrl).toBeVisible();
     expect(kindText).toBeInTheDocument();
@@ -64,7 +66,7 @@ describe('<PreviewCatalogInfoComponent />', () => {
   it('renders card with custom styles', async () => {
     const { result } = renderHook(() => useStyles());
 
-    const { getByText } = render(
+    render(
       <PreviewCatalogInfoComponent
         repositoryUrl="http://my-repository/a/"
         entities={entities}
@@ -72,8 +74,10 @@ describe('<PreviewCatalogInfoComponent />', () => {
       />,
     );
 
-    const repositoryUrl = getByText('http://my-repository/a/catalog-info.yaml');
-    const kindText = getByText('Kind_2');
+    const repositoryUrl = screen.getByText(
+      'http://my-repository/a/catalog-info.yaml',
+    );
+    const kindText = await screen.findByText('Kind_2');
     expect(repositoryUrl).toBeInTheDocument();
     expect(repositoryUrl).not.toBeVisible();
     expect(kindText).toBeInTheDocument();
@@ -83,7 +87,7 @@ describe('<PreviewCatalogInfoComponent />', () => {
   it('renders with custom styles', async () => {
     const { result } = renderHook(() => useStyles());
 
-    const { getByText } = render(
+    render(
       <PreviewCatalogInfoComponent
         repositoryUrl="http://my-repository/a/"
         entities={entities}
@@ -91,8 +95,10 @@ describe('<PreviewCatalogInfoComponent />', () => {
       />,
     );
 
-    const repositoryUrl = getByText('http://my-repository/a/catalog-info.yaml');
-    const kindText = getByText('Kind_2');
+    const repositoryUrl = screen.getByText(
+      'http://my-repository/a/catalog-info.yaml',
+    );
+    const kindText = await screen.findByText('Kind_2');
     expect(repositoryUrl).toBeInTheDocument();
     expect(repositoryUrl).toBeVisible();
     expect(kindText).toBeInTheDocument();