Fix unit tests

WordPress · Oct 10, 2023 · 6881750 · 6881750
1 parent 1084739
commit 6881750
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 25 deletions.
diff --git a/packages/core-data/src/hooks/test/use-entity-records.js b/packages/core-data/src/hooks/test/use-entity-records.js
@@ -51,6 +51,8 @@ describe( 'useEntityRecords', () => {
 			hasResolved: false,
 			isResolving: false,
 			status: 'IDLE',
+			totalItems: null,
+			totalPages: null,
 		} );
 
 		// Fetch request should have been issued
@@ -65,6 +67,8 @@ describe( 'useEntityRecords', () => {
 			hasResolved: true,
 			isResolving: false,
 			status: 'SUCCESS',
+			totalItems: null,
+			totalPages: null,
 		} );
 	} );
 } );
diff --git a/packages/core-data/src/queried-data/reducer.js b/packages/core-data/src/queried-data/reducer.js
@@ -266,9 +266,13 @@ const queries = ( state = {}, action ) => {
 							Object.entries( contextQueries ).map(
 								( [ query, queryItems ] ) => [
 									query,
-									queryItems.filter(
-										( queryId ) => ! removedItems[ queryId ]
-									),
+									{
+										...queryItems,
+										itemIds: queryItems.itemIds.filter(
+											( queryId ) =>
+												! removedItems[ queryId ]
+										),
+									},
 								]
 							)
 						),

diff --git a/packages/core-data/src/queried-data/test/reducer.js b/packages/core-data/src/queried-data/test/reducer.js
@@ -159,7 +159,7 @@ describe( 'reducer', () => {
 				default: { 1: true },
 			},
 			queries: {
-				default: { 's=a': [ 1 ] },
+				default: { 's=a': { itemIds: [ 1 ] } },
 			},
 		} );
 	} );
@@ -200,8 +200,8 @@ describe( 'reducer', () => {
 			},
 			queries: {
 				default: {
-					'': [ 1, 2, 3, 4 ],
-					's=a': [ 1, 3 ],
+					'': { itemIds: [ 1, 2, 3, 4 ] },
+					's=a': { itemIds: [ 1, 3 ] },
 				},
 			},
 		} );
@@ -218,8 +218,8 @@ describe( 'reducer', () => {
 			},
 			queries: {
 				default: {
-					'': [ 1, 2, 4 ],
-					's=a': [ 1 ],
+					'': { itemIds: [ 1, 2, 4 ] },
+					's=a': { itemIds: [ 1 ] },
 				},
 			},
 		} );
@@ -238,8 +238,8 @@ describe( 'reducer', () => {
 			},
 			queries: {
 				default: {
-					'': [ 'foo//bar1', 'foo//bar2', 'foo//bar3' ],
-					's=2': [ 'foo//bar2' ],
+					'': { itemIds: [ 'foo//bar1', 'foo//bar2', 'foo//bar3' ] },
+					's=2': { itemIds: [ 'foo//bar2' ] },
 				},
 			},
 		} );
@@ -258,8 +258,8 @@ describe( 'reducer', () => {
 			},
 			queries: {
 				default: {
-					'': [ 'foo//bar1', 'foo//bar3' ],
-					's=2': [],
+					'': { itemIds: [ 'foo//bar1', 'foo//bar3' ] },
+					's=2': { itemIds: [] },
 				},
 			},
 		} );

diff --git a/packages/core-data/src/queried-data/test/selectors.js b/packages/core-data/src/queried-data/test/selectors.js
@@ -32,7 +32,7 @@ describe( 'getQueriedItems', () => {
 			},
 			queries: {
 				default: {
-					'': [ 1, 2 ],
+					'': { itemIds: [ 1, 2 ] },
 				},
 			},
 		};
@@ -56,7 +56,7 @@ describe( 'getQueriedItems', () => {
 					2: true,
 				},
 			},
-			queries: [ 1, 2 ],
+			queries: { itemIds: [ 1, 2 ] },
 		};
 
 		const resultA = getQueriedItems( state, {} );
@@ -81,8 +81,8 @@ describe( 'getQueriedItems', () => {
 			},
 			queries: {
 				default: {
-					'': [ 1, 2 ],
-					'include=1': [ 1 ],
+					'': { itemIds: [ 1, 2 ] },
+					'include=1': { itemIds: [ 1 ] },
 				},
 			},
 		};
@@ -116,7 +116,7 @@ describe( 'getQueriedItems', () => {
 			},
 			queries: {
 				default: {
-					'_fields=content': [ 1, 2 ],
+					'_fields=content': { itemIds: [ 1, 2 ] },
 				},
 			},
 		};
@@ -161,7 +161,7 @@ describe( 'getQueriedItems', () => {
 			},
 			queries: {
 				default: {
-					'_fields=content%2Cmeta.template': [ 1, 2 ],
+					'_fields=content%2Cmeta.template': { itemIds: [ 1, 2 ] },
 				},
 			},
 		};
@@ -198,7 +198,7 @@ describe( 'getQueriedItems', () => {
 			},
 			queries: {
 				default: {
-					'': [ 1, 2 ],
+					'': { itemIds: [ 1, 2 ] },
 				},
 			},
 		};
@@ -230,7 +230,7 @@ describe( 'getQueriedItems', () => {
 			},
 			queries: {
 				default: {
-					'': [ 1, 2 ],
+					'': { itemIds: [ 1, 2 ] },
 				},
 			},
 		};

diff --git a/packages/core-data/src/resolvers.js b/packages/core-data/src/resolvers.js
@@ -242,7 +242,6 @@ export const getEntityRecords =
 				};
 			} else {
 				records = Object.values( await apiFetch( { path } ) );
-				meta = {};
 			}
 
 			// If we request fields but the result doesn't contain the fields,

diff --git a/packages/core-data/src/test/resolvers.js b/packages/core-data/src/test/resolvers.js
@@ -172,7 +172,10 @@ describe( 'getEntityRecords', () => {
 			'root',
 			'postType',
 			Object.values( POST_TYPES ),
-			{}
+			{},
+			false,
+			undefined,
+			undefined
 		);
 	} );
 

diff --git a/packages/core-data/src/test/selectors.js b/packages/core-data/src/test/selectors.js
@@ -226,7 +226,7 @@ describe( 'hasEntityRecords', () => {
 								},
 								queries: {
 									default: {
-										'': [ 'post', 'page' ],
+										'': { itemIds: [ 'post', 'page' ] },
 									},
 								},
 							},
@@ -361,7 +361,7 @@ describe( 'getEntityRecords', () => {
 								},
 								queries: {
 									default: {
-										'': [ 'post', 'page' ],
+										'': { itemIds: [ 'post', 'page' ] },
 									},
 								},
 							},
@@ -399,7 +399,9 @@ describe( 'getEntityRecords', () => {
 								},
 								queries: {
 									default: {
-										'_fields=id%2Ccontent': [ 1 ],
+										'_fields=id%2Ccontent': {
+											itemIds: [ 1 ],
+										},
 									},
 								},
 							},