From 4d88b29995acf47b3065fa83bb89d9340f7bd806 Mon Sep 17 00:00:00 2001
From: Benjamin Janssens <benji.janssens@gmail.com>
Date: Thu, 13 Jun 2024 18:01:21 +0200
Subject: [PATCH] test: update tests to work with onChange

Signed-off-by: Benjamin Janssens <benji.janssens@gmail.com>
---
 .../RepoUrlPicker/BitbucketRepoPicker.test.tsx | 18 ++++++++++++------
 .../RepoUrlPicker/RepoUrlPicker.test.tsx       | 13 ++++++++++---
 .../RepoUrlPickerRepoName.test.tsx             |  8 +++++---
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
index 10c049b3a0..eb8c1f3a2c 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/BitbucketRepoPicker.test.tsx
@@ -101,9 +101,13 @@ describe('BitbucketRepoPicker', () => {
 
       const workspaceInput = getAllByRole('textbox')[0];
 
-      act(() => workspaceInput.focus());
-      fireEvent.change(workspaceInput, { target: { value: 'test-workspace' } });
-      act(() => workspaceInput.blur());
+      act(() => {
+        workspaceInput.focus();
+        fireEvent.change(workspaceInput, {
+          target: { value: 'test-workspace' },
+        });
+        workspaceInput.blur();
+      });
 
       expect(onChange).toHaveBeenCalledWith({ workspace: 'test-workspace' });
     });
@@ -124,9 +128,11 @@ describe('BitbucketRepoPicker', () => {
 
       const projectInput = getAllByRole('textbox')[1];
 
-      act(() => projectInput.focus());
-      fireEvent.change(projectInput, { target: { value: 'test-project' } });
-      act(() => projectInput.blur());
+      act(() => {
+        projectInput.focus();
+        fireEvent.change(projectInput, { target: { value: 'test-project' } });
+        projectInput.blur();
+      });
 
       expect(onChange).toHaveBeenCalledWith({ project: 'test-project' });
     });
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
index 59c09c106c..af78bc0395 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPicker.test.tsx
@@ -32,7 +32,7 @@ import {
   useTemplateSecrets,
   ScaffolderRJSFField,
 } from '@backstage/plugin-scaffolder-react';
-import { act, fireEvent } from '@testing-library/react';
+import { act, fireEvent, waitFor } from '@testing-library/react';
 
 describe('RepoUrlPicker', () => {
   const mockScaffolderApi: Partial<ScaffolderApi> = {
@@ -98,8 +98,15 @@ describe('RepoUrlPicker', () => {
       const [ownerInput, repoInput] = getAllByRole('textbox');
       const submitButton = getByRole('button');
 
-      fireEvent.change(ownerInput, { target: { value: 'backstage' } });
-      fireEvent.change(repoInput, { target: { value: 'repo123' } });
+      act(() => {
+        ownerInput.focus();
+        fireEvent.change(ownerInput, { target: { value: 'backstage' } });
+        ownerInput.blur();
+
+        repoInput.focus();
+        fireEvent.change(repoInput, { target: { value: 'repo123' } });
+        repoInput.blur();
+      });
 
       fireEvent.click(submitButton);
 
diff --git a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.test.tsx b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.test.tsx
index efc3c94e71..3a32b6e175 100644
--- a/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.test.tsx
+++ b/plugins/scaffolder/src/components/fields/RepoUrlPicker/RepoUrlPickerRepoName.test.tsx
@@ -71,9 +71,11 @@ describe('RepoUrlPickerRepoName', () => {
 
     expect(textArea).toBeVisible();
 
-    act(() => textArea.focus());
-    fireEvent.change(textArea, { target: { value: 'foo' } });
-    act(() => textArea.blur());
+    act(() => {
+      textArea.focus();
+      fireEvent.change(textArea, { target: { value: 'foo' } });
+      textArea.blur();
+    });
 
     expect(onChange).toHaveBeenCalledWith('foo');
   });