Fix link control tests by querying explicitly for the spinner

WordPress · Sep 7, 2023 · 5761d79 · 5761d79
1 parent 968add1
commit 5761d79
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/packages/block-editor/src/components/link-control/test/index.js b/packages/block-editor/src/components/link-control/test/index.js
@@ -176,7 +176,9 @@ describe( 'Basic rendering', () => {
 		await user.type( searchInput, 'Hello' );
 
 		// Wait for the spinner SVG icon to be rendered.
-		expect( await screen.findByRole( 'presentation' ) ).toBeVisible();
+		expect(
+			await screen.findByTestId( 'components-spinner' )
+		).toBeVisible();
 		// Check the suggestions list is not rendered yet.
 		expect( screen.queryByRole( 'listbox' ) ).not.toBeInTheDocument();
 
@@ -190,7 +192,9 @@ describe( 'Basic rendering', () => {
 		// Check the suggestions list is rendered.
 		expect( resultsList ).toBeVisible();
 		// Check the spinner SVG icon is not rendered any longer.
-		expect( screen.queryByRole( 'presentation' ) ).not.toBeInTheDocument();
+		expect(
+			screen.queryByTestId( 'components-spinner' )
+		).not.toBeInTheDocument();
 
 		const searchResultElements =
 			within( resultsList ).getAllByRole( 'option' );
@@ -455,14 +459,18 @@ describe( 'Searching for a link', () => {
 		// Simulate searching for a term.
 		await user.type( searchInput, searchTerm );
 
-		expect( await screen.findByRole( 'presentation' ) ).toBeVisible();
+		expect(
+			await screen.findByTestId( 'components-spinner' )
+		).toBeVisible();
 		expect( screen.queryByRole( 'listbox' ) ).not.toBeInTheDocument();
 
 		// make the search suggestions fetch return a response
 		resolver( fauxEntitySuggestions );
 
 		expect( await screen.findByRole( 'listbox' ) ).toBeVisible();
-		expect( screen.queryByRole( 'presentation' ) ).not.toBeInTheDocument();
+		expect(
+			screen.queryByTestId( 'components-spinner' )
+		).not.toBeInTheDocument();
 	} );
 
 	it.each( [ 'With spaces', 'Uppercase', 'lowercase' ] )(

diff --git a/packages/components/src/spinner/index.tsx b/packages/components/src/spinner/index.tsx
@@ -30,6 +30,7 @@ export function UnforwardedSpinner(
 			focusable="false"
 			{ ...props }
 			ref={ forwardedRef }
+			data-testid="components-spinner"
 		>
 			{ /* Gray circular background */ }
 			<SpinnerTrack

diff --git a/packages/editor/src/components/post-publish-panel/test/__snapshots__/index.js.snap b/packages/editor/src/components/post-publish-panel/test/__snapshots__/index.js.snap
@@ -665,6 +665,7 @@ exports[`PostPublishPanel should render the spinner if the post is being saved 1
     >
       <svg
         class="components-spinner emotion-0 emotion-1"
+        data-testid="components-spinner"
         focusable="false"
         height="16"
         role="presentation"