account for custom stores that may not have resolvers defined in the …

…store config
WordPress · May 16, 2019 · c0f6553 · c0f6553
1 parent 3136c9e
commit c0f6553
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 16 deletions.
diff --git a/packages/data/src/namespace-store/index.js b/packages/data/src/namespace-store/index.js
@@ -155,9 +155,11 @@ function createReduxStore( key, options, registry ) {
  */
 function mapSelectors( selectors, store, registry ) {
 	const createStateSelector = ( registeredSelector ) => {
-		const selector = registeredSelector.isRegistrySelector ? registeredSelector( registry.select ) : registeredSelector;
+		const registrySelector = registeredSelector.isRegistrySelector ?
+			registeredSelector( registry.select ) :
+			registeredSelector;
 
-		return function runSelector() {
+		const selector = function runSelector() {
 			// This function is an optimized implementation of:
 			//
 			//   selector( store.getState(), ...arguments )
@@ -172,8 +174,10 @@ function mapSelectors( selectors, store, registry ) {
 				args[ i + 1 ] = arguments[ i ];
 			}
 
-			return selector( ...args );
+			return registrySelector( ...args );
 		};
+		selector.hasResolver = false;
+		return selector;
 	};
 
 	return mapValues( selectors, createStateSelector );

diff --git a/packages/data/src/namespace-store/test/index.js b/packages/data/src/namespace-store/test/index.js
@@ -80,21 +80,32 @@ describe( 'controls', () => {
 
 		registry.select( 'store' ).getItems();
 	} );
-	it( 'selectors have expected value for the `hasResolver` property', () => {
-		registry.registerStore( 'store', {
-			reducer: jest.fn(),
-			selectors: {
-				getItems: ( state ) => state,
-				getItem: ( state ) => state,
-			},
-			resolvers: {
-				* getItems() {
-					yield 'foo';
+	describe( 'selectors have expected value for the `hasResolver` property', () => {
+		it( 'when custom store has resolvers defined', () => {
+			registry.registerStore( 'store', {
+				reducer: jest.fn(),
+				selectors: {
+					getItems: ( state ) => state,
+					getItem: ( state ) => state,
 				},
-			},
+				resolvers: {
+					* getItems() {
+						yield 'foo';
+					},
+				},
+			} );
+			expect( registry.select( 'store' ).getItems.hasResolver ).toBe( true );
+			expect( registry.select( 'store' ).getItem.hasResolver ).toBe( false );
+		} );
+		it( 'when custom store does not have resolvers defined', () => {
+			registry.registerStore( 'store', {
+				reducer: jest.fn(),
+				selectors: {
+					getItems: ( state ) => state,
+				},
+			} );
+			expect( registry.select( 'store' ).getItems.hasResolver ).toBe( false );
 		} );
-		expect( registry.select( 'store' ).getItems.hasResolver ).toBe( true );
-		expect( registry.select( 'store' ).getItem.hasResolver ).toBe( false );
 	} );
 	describe( 'various action types have expected response and resolve as ' +
 		'expected with controls middleware', () => {