@wordpress/core-data 6.2.0 → 6.3.0

package/src/hooks/test/use-entity-record.js

@@ -9,7 +9,7 @@ jest.mock( '@wordpress/api-fetch' );
 /**
  * External dependencies
  */
-import { act, render } from '@testing-library/react';
+import { act, render, waitFor } from '@testing-library/react';
 
 /**
  * Internal dependencies
@@ -21,17 +21,10 @@ describe( 'useEntityRecord', () => {
 	let registry;
 
 	beforeEach( () => {
-		jest.useFakeTimers();
-
 		registry = createRegistry();
 		registry.register( coreDataStore );
 	} );
 
-	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
-	} );
-
 	const TEST_RECORD = { id: 1, hello: 'world' };
 
 	it( 'resolves the entity record when missing from the state', async () => {
@@ -60,14 +53,12 @@ describe( 'useEntityRecord', () => {
 			status: 'IDLE',
 		} );
 
-		await act( async () => {
-			jest.advanceTimersByTime( 1 );
-		} );
-
 		// Fetch request should have been issued
-		expect( triggerFetch ).toHaveBeenCalledWith( {
-			path: '/wp/v2/widgets/1?context=edit',
-		} );
+		await waitFor( () =>
+			expect( triggerFetch ).toHaveBeenCalledWith( {
+				path: '/wp/v2/widgets/1?context=edit',
+			} )
+		);
 
 		expect( data ).toEqual( {
 			edit: expect.any( Function ),
@@ -96,27 +87,25 @@ describe( 'useEntityRecord', () => {
 			</RegistryProvider>
 		);
 
-		await act( async () => {
-			jest.advanceTimersByTime( 1 );
-		} );
-
-		expect( widget ).toEqual( {
-			edit: expect.any( Function ),
-			editedRecord: { hello: 'world', id: 1 },
-			hasEdits: false,
-			record: { hello: 'world', id: 1 },
-			save: expect.any( Function ),
-			hasResolved: true,
-			isResolving: false,
-			status: 'SUCCESS',
-		} );
+		await waitFor( () =>
+			expect( widget ).toEqual( {
+				edit: expect.any( Function ),
+				editedRecord: { hello: 'world', id: 1 },
+				hasEdits: false,
+				record: { hello: 'world', id: 1 },
+				save: expect.any( Function ),
+				hasResolved: true,
+				isResolving: false,
+				status: 'SUCCESS',
+			} )
+		);
 
 		await act( async () => {
 			widget.edit( { hello: 'foo' } );
-			jest.advanceTimersByTime( 1 );
 		} );
 
-		expect( widget.hasEdits ).toEqual( true );
+		await waitFor( () => expect( widget.hasEdits ).toEqual( true ) );
+
 		expect( widget.record ).toEqual( { hello: 'world', id: 1 } );
 		expect( widget.editedRecord ).toEqual( { hello: 'foo', id: 1 } );
 	} );

package/src/hooks/test/use-entity-records.js

@@ -9,7 +9,7 @@ jest.mock( '@wordpress/api-fetch' );
 /**
  * External dependencies
  */
-import { act, render } from '@testing-library/react';
+import { render, waitFor } from '@testing-library/react';
 
 /**
  * Internal dependencies
@@ -21,17 +21,10 @@ describe( 'useEntityRecords', () => {
 	let registry;
 
 	beforeEach( () => {
-		jest.useFakeTimers();
-
 		registry = createRegistry();
 		registry.register( coreDataStore );
 	} );
 
-	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
-	} );
-
 	const TEST_RECORDS = [
 		{ id: 1, hello: 'world1' },
 		{ id: 2, hello: 'world2' },
@@ -60,14 +53,12 @@ describe( 'useEntityRecords', () => {
 			status: 'IDLE',
 		} );
 
-		await act( async () => {
-			jest.advanceTimersByTime( 1 );
-		} );
-
 		// Fetch request should have been issued
-		expect( triggerFetch ).toHaveBeenCalledWith( {
-			path: '/wp/v2/widgets?context=edit&status=draft',
-		} );
+		await waitFor( () =>
+			expect( triggerFetch ).toHaveBeenCalledWith( {
+				path: '/wp/v2/widgets?context=edit&status=draft',
+			} )
+		);
 
 		expect( data ).toEqual( {
 			records: TEST_RECORDS,

package/src/hooks/test/use-query-select.js

@@ -10,7 +10,7 @@ import {
 /**
  * External dependencies
  */
-import { act, render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 
 /**
  * Internal dependencies
@@ -21,8 +21,6 @@ describe( 'useQuerySelect', () => {
 	let registry;
 
 	beforeEach( () => {
-		jest.useFakeTimers();
-
 		registry = createRegistry();
 		registry.registerStore( 'testStore', {
 			reducer: () => ( { foo: 'bar' } ),
@@ -33,11 +31,6 @@ describe( 'useQuerySelect', () => {
 		} );
 	} );
 
-	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
-	} );
-
 	const getTestComponent = ( mapSelectSpy, dependencyKey ) => ( props ) => {
 		const dependencies = props[ dependencyKey ];
 		mapSelectSpy.mockImplementation( ( select ) => ( {
@@ -177,21 +170,20 @@ describe( 'useQuerySelect', () => {
 			status: 'IDLE',
 		} );
 
-		await act( async () => {
-			jest.advanceTimersToNextTimer();
-		} );
-
 		// Re-render, expect resolved data
 		render(
 			<RegistryProvider value={ registry }>
 				<TestComponent />
 			</RegistryProvider>
 		);
-		expect( querySelectData ).toEqual( {
-			data: 15,
-			isResolving: false,
-			hasResolved: true,
-			status: 'SUCCESS',
-		} );
+
+		await waitFor( () =>
+			expect( querySelectData ).toEqual( {
+				data: 15,
+				isResolving: false,
+				hasResolved: true,
+				status: 'SUCCESS',
+			} )
+		);
 	} );
 } );

package/src/hooks/test/use-resource-permissions.js

@@ -9,7 +9,7 @@ jest.mock( '@wordpress/api-fetch' );
 /**
  * External dependencies
  */
-import { act, render } from '@testing-library/react';
+import { render, waitFor } from '@testing-library/react';
 
 /**
  * Internal dependencies
@@ -20,8 +20,6 @@ import useResourcePermissions from '../use-resource-permissions';
 describe( 'useResourcePermissions', () => {
 	let registry;
 	beforeEach( () => {
-		jest.useFakeTimers();
-
 		registry = createRegistry();
 		registry.register( coreDataStore );
 
@@ -34,11 +32,6 @@ describe( 'useResourcePermissions', () => {
 		} ) );
 	} );
 
-	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
-	} );
-
 	it( 'retrieves the relevant permissions for a key-less resource', async () => {
 		let data;
 		const TestComponent = () => {
@@ -58,18 +51,15 @@ describe( 'useResourcePermissions', () => {
 			canRead: false,
 		} );
 
-		// Required to make sure no updates happen outside of act()
-		await act( async () => {
-			jest.advanceTimersByTime( 1 );
-		} );
-
-		expect( data ).toEqual( {
-			status: 'SUCCESS',
-			isResolving: false,
-			hasResolved: true,
-			canCreate: true,
-			canRead: false,
-		} );
+		await waitFor( () =>
+			expect( data ).toEqual( {
+				status: 'SUCCESS',
+				isResolving: false,
+				hasResolved: true,
+				canCreate: true,
+				canRead: false,
+			} )
+		);
 	} );
 
 	it( 'retrieves the relevant permissions for a resource with a key', async () => {
@@ -93,19 +83,16 @@ describe( 'useResourcePermissions', () => {
 			canDelete: false,
 		} );
 
-		// Required to make sure no updates happen outside of act()
-		await act( async () => {
-			jest.advanceTimersByTime( 1 );
-		} );
-
-		expect( data ).toEqual( {
-			status: 'SUCCESS',
-			isResolving: false,
-			hasResolved: true,
-			canCreate: true,
-			canRead: false,
-			canUpdate: false,
-			canDelete: false,
-		} );
+		await waitFor( () =>
+			expect( data ).toEqual( {
+				status: 'SUCCESS',
+				isResolving: false,
+				hasResolved: true,
+				canCreate: true,
+				canRead: false,
+				canUpdate: false,
+				canDelete: false,
+			} )
+		);
 	} );
 } );

package/src/queried-data/reducer.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { map, mapValues } from 'lodash';
+import { mapValues } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -230,7 +230,7 @@ const receiveQueries = compose( [
 
 	return getMergedItemIds(
 		state || [],
-		map( action.items, key ),
+		action.items.map( ( item ) => item[ key ] ),
 		page,
 		perPage
 	);

package/src/reducer.js

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import fastDeepEqual from 'fast-deep-equal/es6';
-import { map, groupBy, get } from 'lodash';
+import { groupBy, get } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -68,10 +68,7 @@ export function users( state = { byId: {}, queries: {} }, action ) {
 				},
 				queries: {
 					...state.queries,
-					[ action.queryID ]: map(
-						action.users,
-						( user ) => user.id
-					),
+					[ action.queryID ]: action.users.map( ( user ) => user.id ),
 				},
 			};
 	}

package/src/selectors.ts

@@ -2,7 +2,7 @@
  * External dependencies
  */
 import createSelector from 'rememo';
-import { set, map, get } from 'lodash';
+import { set, get } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -147,9 +147,9 @@ export function getCurrentUser( state: State ): ET.User< 'edit' > {
  */
 export const getUserQueryResults = createSelector(
 	( state: State, queryID: string ): ET.User< 'edit' >[] => {
-		const queryResults = state.users.queries[ queryID ];
+		const queryResults = state.users.queries[ queryID ] ?? [];
 
-		return map( queryResults, ( id ) => state.users.byId[ id ] );
+		return queryResults.map( ( id ) => state.users.byId[ id ] );
 	},
 	( state: State, queryID: string ) => [
 		state.users.queries[ queryID ],

package/src/test/actions.js

@@ -55,12 +55,6 @@ describe( 'editEntityRecord', () => {
 describe( 'deleteEntityRecord', () => {
 	beforeEach( async () => {
 		apiFetch.mockReset();
-		jest.useFakeTimers();
-	} );
-
-	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
 	} );
 
 	it( 'triggers a DELETE request for an existing record', async () => {
@@ -182,12 +176,6 @@ describe( 'deleteEntityRecord', () => {
 describe( 'saveEditedEntityRecord', () => {
 	beforeEach( async () => {
 		apiFetch.mockReset();
-		jest.useFakeTimers();
-	} );
-
-	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
 	} );
 
 	it( 'Uses "id" as a key when no entity key is provided', async () => {
@@ -277,7 +265,6 @@ describe( 'saveEntityRecord', () => {
 
 	beforeEach( async () => {
 		apiFetch.mockReset();
-		jest.useFakeTimers();
 		dispatch = Object.assign( jest.fn(), {
 			receiveEntityRecords: jest.fn(),
 			__unstableAcquireStoreLock: jest.fn(),
@@ -285,11 +272,6 @@ describe( 'saveEntityRecord', () => {
 		} );
 	} );
 
-	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
-	} );
-
 	it( 'triggers a POST request for a new record', async () => {
 		const post = { title: 'new post' };
 		const configs = [

package/src/test/entities.js

@@ -52,12 +52,6 @@ describe( 'getMethodName', () => {
 describe( 'getKindEntities', () => {
 	beforeEach( async () => {
 		triggerFetch.mockReset();
-		jest.useFakeTimers();
-	} );
-
-	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
 	} );
 
 	it( 'shouldn’t do anything if the entities have already been resolved', async () => {

package/src/test/resolvers.js

@@ -30,12 +30,6 @@ describe( 'getEntityRecord', () => {
 
 	beforeEach( async () => {
 		triggerFetch.mockReset();
-		jest.useFakeTimers();
-	} );
-
-	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
 	} );
 
 	it( 'yields with requested post type', async () => {
@@ -152,12 +146,6 @@ describe( 'getEntityRecords', () => {
 
 	beforeEach( async () => {
 		triggerFetch.mockReset();
-		jest.useFakeTimers();
-	} );
-
-	afterEach( () => {
-		jest.runOnlyPendingTimers();
-		jest.useRealTimers();
 	} );
 
 	it( 'dispatches the requested post type', async () => {