Merge branch 'develop' into feat/2.8

huanyifan · May 29, 2018 · d1f99fb · d1f99fb
2 parents 3de8c2b + bbf9f8f
commit d1f99fb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/widgets/infinite-hits/__tests__/infinite-hits-test.js b/src/widgets/infinite-hits/__tests__/infinite-hits-test.js
@@ -76,9 +76,17 @@ describe('infiniteHits()', () => {
     expect(ReactDOM.render.secondCall.args[1]).toEqual(container);
   });
 
-  it('does not accept both item and allItems templates', () => {
-    expect(
-      infiniteHits.bind({ container, templates: { item: '', allItems: '' } })
+  it('does not accept allItems templates', () => {
+    expect(() =>
+      infiniteHits({ container, templates: { allItems: '' } })
+    ).toThrow();
+
+    expect(() =>
+      infiniteHits({ container, templates: { allItems: 'not empty' } })
+    ).toThrow();
+
+    expect(() =>
+      infiniteHits({ container, templates: { allItems: () => 'template' } })
     ).toThrow();
   });
 

diff --git a/src/widgets/infinite-hits/infinite-hits.js b/src/widgets/infinite-hits/infinite-hits.js
@@ -124,6 +124,14 @@ export default function infiniteHits({
     throw new Error(`Must provide a container.${usage}`);
   }
 
+  // We have this specific check because unlike the hits, infiniteHits does not support this template.
+  // This can be misleading as they are very similar.
+  if (templates.allItems !== undefined) {
+    throw new Error(
+      'allItems is not a valid template for the infiniteHits widget'
+    );
+  }
+
   const containerNode = getContainerNode(container);
   const cssClasses = {
     root: cx(bem(null), userCssClasses.root),