@wordpress/data 6.5.0 → 6.7.0

package/src/components/use-select/test/index.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import TestRenderer, { act } from 'react-test-renderer';
+import { act, render } from '@testing-library/react';
 
 /**
  * WordPress dependencies
@@ -11,10 +11,15 @@ import { useState, useReducer } from '@wordpress/element';
 /**
  * Internal dependencies
  */
-import { createRegistry } from '../../../registry';
-import { createRegistrySelector } from '../../../factory';
-import { RegistryProvider } from '../../registry-provider';
-import useSelect from '../index';
+import {
+	createRegistry,
+	createRegistrySelector,
+	RegistryProvider,
+	AsyncModeProvider,
+} from '../../..';
+import useSelect from '..';
+
+jest.useRealTimers();
 
 describe( 'useSelect', () => {
 	let registry;
@@ -22,15 +27,6 @@ describe( 'useSelect', () => {
 		registry = createRegistry();
 	} );
 
-	const getTestComponent = ( mapSelectSpy, dependencyKey ) => ( props ) => {
-		const dependencies = props[ dependencyKey ];
-		mapSelectSpy.mockImplementation( ( select ) => ( {
-			results: select( 'testStore' ).testSelector( props.keyName ),
-		} ) );
-		const data = useSelect( mapSelectSpy, [ dependencies ] );
-		return <div>{ data.results }</div>;
-	};
-
 	it( 'passes the relevant data to the component', () => {
 		registry.registerStore( 'testStore', {
 			reducer: () => ( { foo: 'bar' } ),
@@ -38,19 +34,22 @@ describe( 'useSelect', () => {
 				testSelector: ( state, key ) => state[ key ],
 			},
 		} );
+
 		const selectSpy = jest.fn();
-		const TestComponent = jest
-			.fn()
-			.mockImplementation( getTestComponent( selectSpy, 'keyName' ) );
-		let renderer;
-		act( () => {
-			renderer = TestRenderer.create(
-				<RegistryProvider value={ registry }>
-					<TestComponent keyName="foo" />
-				</RegistryProvider>
-			);
+		const TestComponent = jest.fn( ( props ) => {
+			selectSpy.mockImplementation( ( select ) => ( {
+				results: select( 'testStore' ).testSelector( props.keyName ),
+			} ) );
+			const data = useSelect( selectSpy, [ props.keyName ] );
+			return <div role="status">{ data.results }</div>;
 		} );
-		const testInstance = renderer.root;
+
+		const rendered = render(
+			<RegistryProvider value={ registry }>
+				<TestComponent keyName="foo" />
+			</RegistryProvider>
+		);
+
 		// 2 times expected
 		// - 1 for initial mount
 		// - 1 for after mount before subscription set.
@@ -58,9 +57,7 @@ describe( 'useSelect', () => {
 		expect( TestComponent ).toHaveBeenCalledTimes( 1 );
 
 		// Ensure expected state was rendered.
-		expect( testInstance.findByType( 'div' ).props ).toEqual( {
-			children: 'bar',
-		} );
+		expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 'bar' );
 	} );
 
 	it( 'uses memoized selector if dependencies do not change', () => {
@@ -71,73 +68,62 @@ describe( 'useSelect', () => {
 			},
 		} );
 
-		const selectSpyFoo = jest.fn().mockImplementation( () => 'foo' );
-		const selectSpyBar = jest.fn().mockImplementation( () => 'bar' );
-		const TestComponent = jest.fn().mockImplementation( ( props ) => {
+		const selectSpyFoo = jest.fn( () => 'foo' );
+		const selectSpyBar = jest.fn( () => 'bar' );
+		const TestComponent = jest.fn( ( props ) => {
 			const mapSelect = props.change ? selectSpyFoo : selectSpyBar;
 			const data = useSelect( mapSelect, [ props.keyName ] );
-			return <div>{ data }</div>;
-		} );
-		let renderer;
-		act( () => {
-			renderer = TestRenderer.create(
-				<RegistryProvider value={ registry }>
-					<TestComponent keyName="foo" change={ true } />
-				</RegistryProvider>
-			);
+			return <div role="status">{ data }</div>;
 		} );
-		const testInstance = renderer.root;
+
+		const rendered = render(
+			<RegistryProvider value={ registry }>
+				<TestComponent keyName="foo" change={ true } />
+			</RegistryProvider>
+		);
 
 		expect( selectSpyFoo ).toHaveBeenCalledTimes( 2 );
 		expect( selectSpyBar ).toHaveBeenCalledTimes( 0 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 1 );
 
 		// Ensure expected state was rendered.
-		expect( testInstance.findByType( 'div' ).props ).toEqual( {
-			children: 'foo',
-		} );
+		expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 'foo' );
 
 		// Rerender with non dependency changed.
-		act( () => {
-			renderer.update(
-				<RegistryProvider value={ registry }>
-					<TestComponent keyName="foo" change={ false } />
-				</RegistryProvider>
-			);
-		} );
+		rendered.rerender(
+			<RegistryProvider value={ registry }>
+				<TestComponent keyName="foo" change={ false } />
+			</RegistryProvider>
+		);
 
 		expect( selectSpyFoo ).toHaveBeenCalledTimes( 2 );
 		expect( selectSpyBar ).toHaveBeenCalledTimes( 0 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 2 );
 
 		// Ensure expected state was rendered.
-		expect( testInstance.findByType( 'div' ).props ).toEqual( {
-			children: 'foo',
-		} );
+		expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 'foo' );
 
 		// Rerender with dependency changed.
-		act( () => {
-			renderer.update(
-				<RegistryProvider value={ registry }>
-					<TestComponent keyName="bar" change={ false } />
-				</RegistryProvider>
-			);
-		} );
+		rendered.rerender(
+			<RegistryProvider value={ registry }>
+				<TestComponent keyName="bar" change={ false } />
+			</RegistryProvider>
+		);
 
 		expect( selectSpyFoo ).toHaveBeenCalledTimes( 2 );
 		expect( selectSpyBar ).toHaveBeenCalledTimes( 2 );
 		expect( TestComponent ).toHaveBeenCalledTimes( 3 );
 
 		// Ensure expected state was rendered.
-		expect( testInstance.findByType( 'div' ).props ).toEqual( {
-			children: 'bar',
-		} );
+		expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 'bar' );
 	} );
+
 	describe( 'rerenders as expected with various mapSelect return types', () => {
 		const getComponent = ( mapSelectSpy ) => () => {
 			const data = useSelect( mapSelectSpy, [] );
-			return <div data={ data } />;
+			return <div role="status" data-d={ JSON.stringify( data ) } />;
 		};
+
 		let TestComponent;
 		const mapSelectSpy = jest.fn( ( select ) =>
 			select( 'testStore' ).testSelector()
@@ -156,6 +142,7 @@ describe( 'useSelect', () => {
 			} );
 			TestComponent = getComponent( mapSelectSpy );
 		} );
+
 		afterEach( () => {
 			selectorSpy.mockClear();
 			mapSelectSpy.mockClear();
@@ -180,18 +167,14 @@ describe( 'useSelect', () => {
 			( type, testValues ) => {
 				const [ valueA, valueB ] = testValues;
 				selectorSpy.mockReturnValue( valueA );
-				let renderer;
-				act( () => {
-					renderer = TestRenderer.create(
-						<RegistryProvider value={ registry }>
-							<TestComponent />
-						</RegistryProvider>
-					);
-				} );
-				const testInstance = renderer.root;
+				const rendered = render(
+					<RegistryProvider value={ registry }>
+						<TestComponent />
+					</RegistryProvider>
+				);
 				// Ensure expected state was rendered.
-				expect( testInstance.findByType( 'div' ).props.data ).toEqual(
-					valueA
+				expect( rendered.getByRole( 'status' ).dataset.d ).toBe(
+					JSON.stringify( valueA )
 				);
 
 				// Update the returned value from the selector and trigger the
@@ -200,15 +183,15 @@ describe( 'useSelect', () => {
 					selectorSpy.mockReturnValue( valueB );
 					registry.dispatch( 'testStore' ).forceUpdate();
 				} );
-				expect( testInstance.findByType( 'div' ).props.data ).toEqual(
-					valueB
+				expect( rendered.getByRole( 'status' ).dataset.d ).toBe(
+					JSON.stringify( valueB )
 				);
 				expect( mapSelectSpy ).toHaveBeenCalledTimes( 3 );
 			}
 		);
 	} );
 
-	describe( 're-calls the selector as minimal times as possible', () => {
+	describe( 're-calls the selector as few times as possible', () => {
 		const counterStore = {
 			actions: {
 				increment: () => ( { type: 'INCREMENT' } ),
@@ -231,8 +214,6 @@ describe( 'useSelect', () => {
 			registry.registerStore( 'store-1', counterStore );
 			registry.registerStore( 'store-2', counterStore );
 
-			let renderer;
-
 			const selectCount1 = jest.fn();
 			const selectCount2 = jest.fn();
 
@@ -248,23 +229,19 @@ describe( 'useSelect', () => {
 					[]
 				);
 
-				return <div data={ count1 } />;
+				return <div role="status">{ count1 }</div>;
 			} );
 
-			act( () => {
-				renderer = TestRenderer.create(
-					<RegistryProvider value={ registry }>
-						<TestComponent />
-					</RegistryProvider>
-				);
-			} );
-
-			const testInstance = renderer.root;
+			const rendered = render(
+				<RegistryProvider value={ registry }>
+					<TestComponent />
+				</RegistryProvider>
+			);
 
 			expect( selectCount1 ).toHaveBeenCalledTimes( 2 );
 			expect( selectCount2 ).toHaveBeenCalledTimes( 2 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 1 );
-			expect( testInstance.findByType( 'div' ).props.data ).toBe( 0 );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
 
 			act( () => {
 				registry.dispatch( 'store-2' ).increment();
@@ -273,7 +250,7 @@ describe( 'useSelect', () => {
 			expect( selectCount1 ).toHaveBeenCalledTimes( 2 );
 			expect( selectCount2 ).toHaveBeenCalledTimes( 3 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 2 );
-			expect( testInstance.findByType( 'div' ).props.data ).toBe( 0 );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
 
 			act( () => {
 				registry.dispatch( 'store-1' ).increment();
@@ -282,10 +259,10 @@ describe( 'useSelect', () => {
 			expect( selectCount1 ).toHaveBeenCalledTimes( 3 );
 			expect( selectCount2 ).toHaveBeenCalledTimes( 3 );
 			expect( TestComponent ).toHaveBeenCalledTimes( 3 );
-			expect( testInstance.findByType( 'div' ).props.data ).toBe( 1 );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 1 );
 
 			// Test if the unsubscribers get called correctly.
-			renderer.unmount();
+			rendered.unmount();
 		} );
 
 		it( 'can subscribe to multiple stores at once', () => {
@@ -293,8 +270,6 @@ describe( 'useSelect', () => {
 			registry.registerStore( 'store-2', counterStore );
 			registry.registerStore( 'store-3', counterStore );
 
-			let renderer;
-
 			const selectCount1And2 = jest.fn();
 
 			const TestComponent = jest.fn( () => {
@@ -307,44 +282,35 @@ describe( 'useSelect', () => {
 					[]
 				);
 
-				return <div data={ { count1, count2 } } />;
-			} );
-
-			act( () => {
-				renderer = TestRenderer.create(
-					<RegistryProvider value={ registry }>
-						<TestComponent />
-					</RegistryProvider>
+				return (
+					<div role="status">
+						{ count1 },{ count2 }
+					</div>
 				);
 			} );
 
-			const testInstance = renderer.root;
+			const rendered = render(
+				<RegistryProvider value={ registry }>
+					<TestComponent />
+				</RegistryProvider>
+			);
 
 			expect( selectCount1And2 ).toHaveBeenCalledTimes( 2 );
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				count1: 0,
-				count2: 0,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( '0,0' );
 
 			act( () => {
 				registry.dispatch( 'store-2' ).increment();
 			} );
 
 			expect( selectCount1And2 ).toHaveBeenCalledTimes( 3 );
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				count1: 0,
-				count2: 1,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( '0,1' );
 
 			act( () => {
 				registry.dispatch( 'store-3' ).increment();
 			} );
 
 			expect( selectCount1And2 ).toHaveBeenCalledTimes( 3 );
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				count1: 0,
-				count2: 1,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( '0,1' );
 		} );
 
 		it( 're-calls the selector when deps changed', () => {
@@ -352,7 +318,7 @@ describe( 'useSelect', () => {
 			registry.registerStore( 'store-2', counterStore );
 			registry.registerStore( 'store-3', counterStore );
 
-			let renderer, dep, setDep;
+			let dep, setDep;
 			const selectCount1AndDep = jest.fn();
 
 			const TestComponent = jest.fn( () => {
@@ -366,44 +332,41 @@ describe( 'useSelect', () => {
 					[ dep ]
 				);
 
-				return <div data={ state } />;
-			} );
-
-			act( () => {
-				renderer = TestRenderer.create(
-					<RegistryProvider value={ registry }>
-						<TestComponent />
-					</RegistryProvider>
+				return (
+					<div role="status">
+						count:{ state.count1 },dep:{ state.dep }
+					</div>
 				);
 			} );
 
-			const testInstance = renderer.root;
+			const rendered = render(
+				<RegistryProvider value={ registry }>
+					<TestComponent />
+				</RegistryProvider>
+			);
 
 			expect( selectCount1AndDep ).toHaveBeenCalledTimes( 2 );
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				count1: 0,
-				dep: 0,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'count:0,dep:0'
+			);
 
 			act( () => {
 				setDep( 1 );
 			} );
 
 			expect( selectCount1AndDep ).toHaveBeenCalledTimes( 4 );
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				count1: 0,
-				dep: 1,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'count:0,dep:1'
+			);
 
 			act( () => {
 				registry.dispatch( 'store-1' ).increment();
 			} );
 
 			expect( selectCount1AndDep ).toHaveBeenCalledTimes( 5 );
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				count1: 1,
-				dep: 1,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'count:1,dep:1'
+			);
 		} );
 
 		it( 'handles registry selectors', () => {
@@ -423,7 +386,6 @@ describe( 'useSelect', () => {
 			} );
 			registry.registerStore( 'store-2', counterStore );
 
-			let renderer;
 			const selectCount1And2 = jest.fn();
 
 			const TestComponent = jest.fn( () => {
@@ -434,46 +396,43 @@ describe( 'useSelect', () => {
 					[]
 				);
 
-				return <div data={ state } />;
-			} );
-
-			act( () => {
-				renderer = TestRenderer.create(
-					<RegistryProvider value={ registry }>
-						<TestComponent />
-					</RegistryProvider>
+				return (
+					<div role="status">
+						count1:{ state.count1 },count2:{ state.count2 }
+					</div>
 				);
 			} );
 
-			const testInstance = renderer.root;
+			const rendered = render(
+				<RegistryProvider value={ registry }>
+					<TestComponent />
+				</RegistryProvider>
+			);
 
 			expect( selectCount1And2 ).toHaveBeenCalledTimes( 2 );
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				count1: 0,
-				count2: 0,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'count1:0,count2:0'
+			);
 
 			act( () => {
 				registry.dispatch( 'store-2' ).increment();
 			} );
 
 			expect( selectCount1And2 ).toHaveBeenCalledTimes( 3 );
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				count1: 0,
-				count2: 1,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'count1:0,count2:1'
+			);
 		} );
 
 		it( 'handles conditional statements in selectors', () => {
 			registry.registerStore( 'store-1', counterStore );
 			registry.registerStore( 'store-2', counterStore );
 
-			let renderer, shouldSelectCount1, toggle;
 			const selectCount1 = jest.fn();
 			const selectCount2 = jest.fn();
 
 			const TestComponent = jest.fn( () => {
-				[ shouldSelectCount1, toggle ] = useReducer(
+				const [ shouldSelectCount1, toggle ] = useReducer(
 					( should ) => ! should,
 					false
 				);
@@ -492,32 +451,31 @@ describe( 'useSelect', () => {
 					[ shouldSelectCount1 ]
 				);
 
-				return <div data={ state } />;
-			} );
-
-			act( () => {
-				renderer = TestRenderer.create(
-					<RegistryProvider value={ registry }>
-						<TestComponent />
-					</RegistryProvider>
+				return (
+					<>
+						<div role="status">{ state }</div>
+						<button onClick={ toggle }>Toggle</button>
+					</>
 				);
 			} );
 
-			const testInstance = renderer.root;
+			const rendered = render(
+				<RegistryProvider value={ registry }>
+					<TestComponent />
+				</RegistryProvider>
+			);
 
 			expect( selectCount1 ).toHaveBeenCalledTimes( 0 );
 			expect( selectCount2 ).toHaveBeenCalledTimes( 2 );
-			expect( testInstance.findByType( 'div' ).props.data ).toBe(
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
 				'count2'
 			);
 
-			act( () => {
-				toggle();
-			} );
+			rendered.getByText( 'Toggle' ).click();
 
 			expect( selectCount1 ).toHaveBeenCalledTimes( 2 );
 			expect( selectCount2 ).toHaveBeenCalledTimes( 2 );
-			expect( testInstance.findByType( 'div' ).props.data ).toBe(
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
 				'count1'
 			);
 		} );
@@ -528,8 +486,6 @@ describe( 'useSelect', () => {
 			const subRegistry = createRegistry( {}, registry );
 			subRegistry.registerStore( 'child-store', counterStore );
 
-			let renderer;
-
 			const TestComponent = jest.fn( () => {
 				const state = useSelect(
 					( select ) => ( {
@@ -539,106 +495,95 @@ describe( 'useSelect', () => {
 					[]
 				);
 
-				return <div data={ state } />;
-			} );
-
-			act( () => {
-				renderer = TestRenderer.create(
-					<RegistryProvider value={ registry }>
-						<RegistryProvider value={ subRegistry }>
-							<TestComponent />
-						</RegistryProvider>
-					</RegistryProvider>
+				return (
+					<div role="status">
+						parent:{ state.parentCount },child:{ state.childCount }
+					</div>
 				);
 			} );
 
-			const testInstance = renderer.root;
+			const rendered = render(
+				<RegistryProvider value={ registry }>
+					<RegistryProvider value={ subRegistry }>
+						<TestComponent />
+					</RegistryProvider>
+				</RegistryProvider>
+			);
 
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				parentCount: 0,
-				childCount: 0,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'parent:0,child:0'
+			);
 
 			act( () => {
 				registry.dispatch( 'parent-store' ).increment();
 			} );
 
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				parentCount: 1,
-				childCount: 0,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'parent:1,child:0'
+			);
 		} );
 
 		it( 'handles non-existing stores', () => {
 			registry.registerStore( 'store-1', counterStore );
 
-			let renderer;
-
 			const TestComponent = jest.fn( () => {
 				const state = useSelect(
 					( select ) => ( {
 						count1: select( 'store-1' ).getCounter(),
-						blank: select( 'non-existing-store' )?.getCounter(),
+						count2: select( 'store-2' )?.getCounter() ?? 'blank',
 					} ),
 					[]
 				);
 
-				return <div data={ state } />;
-			} );
-
-			act( () => {
-				renderer = TestRenderer.create(
-					<RegistryProvider value={ registry }>
-						<TestComponent />
-					</RegistryProvider>
+				return (
+					<div role="status">
+						count1:{ state.count1 },count2:{ state.count2 }
+					</div>
 				);
 			} );
 
-			const testInstance = renderer.root;
+			const rendered = render(
+				<RegistryProvider value={ registry }>
+					<TestComponent />
+				</RegistryProvider>
+			);
 
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				count1: 0,
-				blank: undefined,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'count1:0,count2:blank'
+			);
 
 			act( () => {
 				registry.dispatch( 'store-1' ).increment();
 			} );
 
-			expect( testInstance.findByType( 'div' ).props.data ).toEqual( {
-				count1: 1,
-				blank: undefined,
-			} );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'count1:1,count2:blank'
+			);
 
 			// Test if the unsubscribers get called correctly.
-			renderer.unmount();
+			rendered.unmount();
 		} );
 
 		it( 'handles registration of a non-existing store during rendering', () => {
-			let renderer;
-
 			const TestComponent = jest.fn( () => {
 				const state = useSelect(
 					( select ) =>
-						select( 'not-yet-registered-store' )?.getCounter(),
+						select( 'not-yet-registered-store' )?.getCounter() ??
+						'blank',
 					[]
 				);
 
-				return <div data={ state } />;
+				return <div role="status">{ state }</div>;
 			} );
 
-			act( () => {
-				renderer = TestRenderer.create(
-					<RegistryProvider value={ registry }>
-						<TestComponent />
-					</RegistryProvider>
-				);
-			} );
-
-			const testInstance = renderer.root;
+			const rendered = render(
+				<RegistryProvider value={ registry }>
+					<TestComponent />
+				</RegistryProvider>
+			);
 
-			expect( testInstance.findByType( 'div' ).props.data ).toBe(
-				undefined
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'blank'
 			);
 
 			act( () => {
@@ -649,23 +594,21 @@ describe( 'useSelect', () => {
 			} );
 
 			// This is not ideal, but is the way it's working before and we want to prevent breaking changes.
-			expect( testInstance.findByType( 'div' ).props.data ).toBe(
-				undefined
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'blank'
 			);
 
 			act( () => {
 				registry.dispatch( 'not-yet-registered-store' ).increment();
 			} );
 
-			expect( testInstance.findByType( 'div' ).props.data ).toBe( 1 );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 1 );
 
 			// Test if the unsubscribers get called correctly.
-			renderer.unmount();
+			rendered.unmount();
 		} );
 
 		it( 'handles registration of a non-existing store of sub-registry during rendering', () => {
-			let renderer;
-
 			const subRegistry = createRegistry( {}, registry );
 
 			const TestComponent = jest.fn( () => {
@@ -673,27 +616,23 @@ describe( 'useSelect', () => {
 					( select ) =>
 						select(
 							'not-yet-registered-child-store'
-						)?.getCounter(),
+						)?.getCounter() ?? 'blank',
 					[]
 				);
 
-				return <div data={ state } />;
+				return <div role="status">{ state }</div>;
 			} );
 
-			act( () => {
-				renderer = TestRenderer.create(
-					<RegistryProvider value={ registry }>
-						<RegistryProvider value={ subRegistry }>
-							<TestComponent />
-						</RegistryProvider>
+			const rendered = render(
+				<RegistryProvider value={ registry }>
+					<RegistryProvider value={ subRegistry }>
+						<TestComponent />
 					</RegistryProvider>
-				);
-			} );
-
-			const testInstance = renderer.root;
+				</RegistryProvider>
+			);
 
-			expect( testInstance.findByType( 'div' ).props.data ).toBe(
-				undefined
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'blank'
 			);
 
 			act( () => {
@@ -704,8 +643,8 @@ describe( 'useSelect', () => {
 			} );
 
 			// This is not ideal, but is the way it's working before and we want to prevent breaking changes.
-			expect( testInstance.findByType( 'div' ).props.data ).toBe(
-				undefined
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent(
+				'blank'
 			);
 
 			act( () => {
@@ -714,15 +653,13 @@ describe( 'useSelect', () => {
 					.increment();
 			} );
 
-			expect( testInstance.findByType( 'div' ).props.data ).toBe( 1 );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( '1' );
 
 			// Test if the unsubscribers get called correctly.
-			renderer.unmount();
+			rendered.unmount();
 		} );
 
 		it( 'handles custom generic stores without a unsubscribe function', () => {
-			let renderer;
-
 			const customStore = {
 				name: 'generic-store',
 				instantiate() {
@@ -762,28 +699,265 @@ describe( 'useSelect', () => {
 					[]
 				);
 
-				return <div data={ state } />;
+				return <div role="status">{ state }</div>;
 			} );
 
+			const rendered = render(
+				<RegistryProvider value={ registry }>
+					<TestComponent />
+				</RegistryProvider>
+			);
+
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
+
 			act( () => {
-				renderer = TestRenderer.create(
+				registry.dispatch( customStore ).increment();
+			} );
+
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 1 );
+
+			expect( () => rendered.unmount() ).not.toThrow();
+		} );
+	} );
+
+	describe( 'async mode', () => {
+		function registerCounterStore( reg, initialCount = 0 ) {
+			reg.registerStore( 'counter', {
+				reducer: ( state = initialCount, action ) => {
+					if ( action.type === 'INCREMENT' ) {
+						return state + 1;
+					}
+					return state;
+				},
+				actions: {
+					inc: () => ( { type: 'INCREMENT' } ),
+				},
+				selectors: {
+					get: ( state ) => state,
+				},
+			} );
+		}
+
+		beforeEach( () => {
+			registerCounterStore( registry );
+		} );
+
+		it( 'renders with async mode', async () => {
+			const selectSpy = jest.fn( ( select ) =>
+				select( 'counter' ).get()
+			);
+
+			const TestComponent = jest.fn( () => {
+				const count = useSelect( selectSpy, [] );
+				return <div role="status">{ count }</div>;
+			} );
+
+			const rendered = render(
+				<AsyncModeProvider value={ true }>
 					<RegistryProvider value={ registry }>
 						<TestComponent />
 					</RegistryProvider>
-				);
+				</AsyncModeProvider>
+			);
+
+			// initial render + missed update catcher in subscribing effect
+			expect( selectSpy ).toHaveBeenCalledTimes( 2 );
+			expect( TestComponent ).toHaveBeenCalledTimes( 1 );
+
+			// Ensure expected state was rendered.
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
+
+			act( () => {
+				registry.dispatch( 'counter' ).inc();
 			} );
 
-			const testInstance = renderer.root;
+			// still not called right after increment
+			expect( selectSpy ).toHaveBeenCalledTimes( 2 );
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
 
-			expect( testInstance.findByType( 'div' ).props.data ).toBe( 0 );
+			expect( await rendered.findByText( 1 ) ).toBeInTheDocument();
 
+			expect( selectSpy ).toHaveBeenCalledTimes( 3 );
+			expect( TestComponent ).toHaveBeenCalledTimes( 2 );
+		} );
+
+		// Tests render queue fixes done in https://github.com/WordPress/gutenberg/pull/19286
+		it( 'catches updates while switching from async to sync', () => {
+			const selectSpy = jest.fn( ( select ) =>
+				select( 'counter' ).get()
+			);
+
+			const TestComponent = jest.fn( () => {
+				const count = useSelect( selectSpy, [] );
+				return <div role="status">{ count }</div>;
+			} );
+
+			const App = ( { async } ) => (
+				<AsyncModeProvider value={ async }>
+					<RegistryProvider value={ registry }>
+						<TestComponent />
+					</RegistryProvider>
+				</AsyncModeProvider>
+			);
+
+			const rendered = render( <App async={ true } /> );
+
+			// Ensure expected state was rendered.
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
+
+			// Schedules an async update of the component.
 			act( () => {
-				registry.dispatch( customStore ).increment();
+				registry.dispatch( 'counter' ).inc();
 			} );
 
-			expect( testInstance.findByType( 'div' ).props.data ).toBe( 1 );
+			// Ensure the async update wasn't processed yet.
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
 
-			expect( () => renderer.unmount() ).not.toThrow();
+			// Switch from async mode to sync.
+			rendered.rerender( <App async={ false } /> );
+
+			// Ensure the async update was flushed during the rerender.
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 1 );
+
+			// initial render + subscription check + flushed store update
+			expect( selectSpy ).toHaveBeenCalledTimes( 3 );
+			// initial render + rerender with isAsync=false + store state update
+			expect( TestComponent ).toHaveBeenCalledTimes( 3 );
+		} );
+
+		it( 'cancels scheduled updates when mapSelect function changes', async () => {
+			const selectA = jest.fn(
+				( select ) => 'a:' + select( 'counter' ).get()
+			);
+			const selectB = jest.fn(
+				( select ) => 'b:' + select( 'counter' ).get()
+			);
+
+			const TestComponent = jest.fn( ( { variant } ) => {
+				const count = useSelect( variant === 'a' ? selectA : selectB, [
+					variant,
+				] );
+				return <div role="status">{ count }</div>;
+			} );
+
+			const App = ( { variant } ) => (
+				<AsyncModeProvider value={ true }>
+					<RegistryProvider value={ registry }>
+						<TestComponent variant={ variant } />
+					</RegistryProvider>
+				</AsyncModeProvider>
+			);
+
+			const rendered = render( <App variant="a" /> );
+
+			// Ensure expected state was rendered.
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 'a:0' );
+
+			// Schedules an async update of the component.
+			act( () => {
+				registry.dispatch( 'counter' ).inc();
+			} );
+
+			// Ensure the async update wasn't processed yet.
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 'a:0' );
+
+			// Rerender with a prop change that causes dependency change.
+			rendered.rerender( <App variant="b" /> );
+
+			// Ensure the async update was flushed (cancelled) during the rerender.
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 'b:1' );
+
+			// Give the async update time to run in case it wasn't cancelled
+			await new Promise( setImmediate );
+
+			expect( selectA ).toHaveBeenCalledTimes( 2 );
+			expect( selectB ).toHaveBeenCalledTimes( 2 );
+			expect( TestComponent ).toHaveBeenCalledTimes( 2 );
+		} );
+
+		it( 'cancels scheduled updates when unmounting', async () => {
+			const selectSpy = jest.fn( ( select ) =>
+				select( 'counter' ).get()
+			);
+
+			const TestComponent = jest.fn( () => {
+				const count = useSelect( selectSpy, [] );
+				return <div role="status">{ count }</div>;
+			} );
+
+			const App = () => (
+				<AsyncModeProvider value={ true }>
+					<RegistryProvider value={ registry }>
+						<TestComponent />
+					</RegistryProvider>
+				</AsyncModeProvider>
+			);
+
+			const rendered = render( <App /> );
+
+			// Ensure expected state was rendered.
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
+
+			// Schedules an async update of the component.
+			act( () => {
+				registry.dispatch( 'counter' ).inc();
+			} );
+
+			// Ensure the async update wasn't processed yet.
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
+
+			// Unmount
+			rendered.unmount();
+
+			// Give the async update time to run in case it wasn't cancelled
+			await new Promise( setImmediate );
+
+			// only the initial render, no state updates
+			expect( selectSpy ).toHaveBeenCalledTimes( 2 );
+			expect( TestComponent ).toHaveBeenCalledTimes( 1 );
+		} );
+
+		it( 'cancels scheduled updates when registry changes', async () => {
+			const registry2 = createRegistry();
+			registerCounterStore( registry2, 100 );
+
+			const selectSpy = jest.fn( ( select ) =>
+				select( 'counter' ).get()
+			);
+
+			const TestComponent = jest.fn( () => {
+				const count = useSelect( selectSpy, [] );
+				return <div role="status">{ count }</div>;
+			} );
+
+			const App = ( { reg } ) => (
+				<AsyncModeProvider value={ true }>
+					<RegistryProvider value={ reg }>
+						<TestComponent />
+					</RegistryProvider>
+				</AsyncModeProvider>
+			);
+
+			const rendered = render( <App reg={ registry } /> );
+
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
+
+			act( () => {
+				registry.dispatch( 'counter' ).inc();
+			} );
+
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 0 );
+
+			rendered.rerender( <App reg={ registry2 } /> );
+
+			expect( rendered.getByRole( 'status' ) ).toHaveTextContent( 100 );
+
+			// Give the async update time to run in case it wasn't cancelled
+			await new Promise( setImmediate );
+
+			// initial render + registry change rerender, no state updates
+			expect( selectSpy ).toHaveBeenCalledTimes( 4 );
+			expect( TestComponent ).toHaveBeenCalledTimes( 2 );
 		} );
 	} );
 } );