Merge branch 'feat/instantsearch.js/connectors' of github.com:algolia…

…/instantsearch.js into feat/instantsearch.js/connectors
algolia · Mar 24, 2017 · e480dce · e480dce
2 parents 75243b0 + d832e5f
commit e480dce
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 34 deletions.
diff --git a/src/components/InfiniteHits.js b/src/components/InfiniteHits.js
@@ -35,7 +35,7 @@ InfiniteHits.propTypes = {
   }),
   hits: React.PropTypes.array,
   results: React.PropTypes.object,
-  showMore: React.PropTypes.function,
+  showMore: React.PropTypes.func,
   showMoreLabel: React.PropTypes.string,
   templateProps: React.PropTypes.object.isRequired,
   isLastPage: React.PropTypes.bool.isRequired,

diff --git a/src/components/RefinementList/__tests__/RefinementList-test.js b/src/components/RefinementList/__tests__/RefinementList-test.js
@@ -5,12 +5,18 @@ import sinon from 'sinon';
 import {RawRefinementList as RefinementList} from '../RefinementList';
 import RefinementListItem from '../RefinementListItem';
 
+const defaultProps = {
+  templateProps: {},
+  toggleRefinement: () => {},
+};
+
 describe('RefinementList', () => {
   let createURL;
 
   function shallowRender(extraProps = {}) {
     createURL = sinon.spy();
     const props = {
+      ...defaultProps,
       createURL,
       facetValues: [],
       ...extraProps,
@@ -22,6 +28,7 @@ describe('RefinementList', () => {
     it('should add the `list` class to the root element', () => {
       // Given
       const props = {
+        ...defaultProps,
         cssClasses: {
           list: 'list',
         },
@@ -37,6 +44,7 @@ describe('RefinementList', () => {
     it('should set item classes to the refinements', () => {
       // Given
       const props = {
+        ...defaultProps,
         cssClasses: {
           item: 'item',
         },
@@ -55,6 +63,7 @@ describe('RefinementList', () => {
     it('should set active classes to the active refinements', () => {
       // Given
       const props = {
+        ...defaultProps,
         cssClasses: {
           active: 'active',
         },
@@ -78,6 +87,7 @@ describe('RefinementList', () => {
     it('should have the correct names', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
           {name: 'foo', isRefined: false},
           {name: 'bar', isRefined: false},
@@ -97,7 +107,8 @@ describe('RefinementList', () => {
     it('understands attributeNameKey', () => {
       // Given
       const props = {
-        facetValues: [{name: 'no', youpiName: 'hello'}],
+        ...defaultProps,
+        facetValues: [{name: 'no', youpiName: 'hello', isRefined: false}],
         attributeNameKey: 'youpiName',
       };
 
@@ -114,6 +125,7 @@ describe('RefinementList', () => {
     it('should correctly set if refined or not', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
           {name: 'foo', isRefined: false},
           {name: 'bar', isRefined: true},
@@ -135,9 +147,10 @@ describe('RefinementList', () => {
     it('should pass the count to the templateData', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
-          {name: 'foo', count: 42},
-          {name: 'bar', count: 16},
+          {name: 'foo', count: 42, isRefined: false},
+          {name: 'bar', count: 16, isRefined: false},
         ],
       };
 
@@ -156,10 +169,11 @@ describe('RefinementList', () => {
     it('displays a number of items equal to the limit when showMore: false', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
-          {name: 'foo'},
-          {name: 'bar'},
-          {name: 'baz'},
+          {name: 'foo', isRefined: false},
+          {name: 'bar', isRefined: false},
+          {name: 'baz', isRefined: false},
         ],
         showMore: false,
         limitMin: 2,
@@ -175,10 +189,11 @@ describe('RefinementList', () => {
     it('displays a number of items equal to the limit when showMore: true but not enabled', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
-          {name: 'foo'},
-          {name: 'bar'},
-          {name: 'baz'},
+          {name: 'foo', isRefined: false},
+          {name: 'bar', isRefined: false},
+          {name: 'baz', isRefined: false},
         ],
         showMore: true,
         limitMin: 2,
@@ -195,10 +210,11 @@ describe('RefinementList', () => {
     it('displays a number of items equal to the showMore limit when showMore: true and enabled', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
-          {name: 'foo'},
-          {name: 'bar'},
-          {name: 'baz'},
+          {name: 'foo', isRefined: false},
+          {name: 'bar', isRefined: false},
+          {name: 'baz', isRefined: false},
         ],
         limitMin: 2,
         limitMax: 3,
@@ -217,10 +233,11 @@ describe('RefinementList', () => {
     it('adds a showMore link when the feature is enabled', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
-          {name: 'foo'},
-          {name: 'bar'},
-          {name: 'baz'},
+          {name: 'foo', isRefined: false},
+          {name: 'bar', isRefined: false},
+          {name: 'baz', isRefined: false},
         ],
         showMore: true,
         limitMin: 2,
@@ -238,10 +255,11 @@ describe('RefinementList', () => {
     it('does not add a showMore link when the feature is disabled', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
-          {name: 'foo'},
-          {name: 'bar'},
-          {name: 'baz'},
+          {name: 'foo', isRefined: false},
+          {name: 'bar', isRefined: false},
+          {name: 'baz', isRefined: false},
         ],
         showMore: false,
         limitMin: 2,
@@ -259,10 +277,11 @@ describe('RefinementList', () => {
     it('no showMore when: state = open -> values change -> values <= limitMin ', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
-          {name: 'foo'},
-          {name: 'bar'},
-          {name: 'baz'},
+          {name: 'foo', isRefined: false},
+          {name: 'bar', isRefined: false},
+          {name: 'baz', isRefined: false},
         ],
         showMore: true,
         limitMin: 2,
@@ -281,10 +300,11 @@ describe('RefinementList', () => {
     it('does not add a showMore link when the facet values length is equal to the minLimit', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
-          {name: 'foo'},
-          {name: 'bar'},
-          {name: 'baz'},
+          {name: 'foo', isRefined: false},
+          {name: 'bar', isRefined: false},
+          {name: 'baz', isRefined: false},
         ],
         showMore: true,
         limitMin: 3,
@@ -302,10 +322,11 @@ describe('RefinementList', () => {
     it('changing the state will toggle the number of items displayed', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
-          {name: 'foo'},
-          {name: 'bar'},
-          {name: 'baz'},
+          {name: 'foo', isRefined: false},
+          {name: 'bar', isRefined: false},
+          {name: 'baz', isRefined: false},
         ],
         limitMin: 2,
         limitMax: 3,
@@ -332,13 +353,15 @@ describe('RefinementList', () => {
     it('should create a subList with the sub values', () => {
       // Given
       const props = {
+        ...defaultProps,
         facetValues: [
           {
             name: 'foo',
             data: [
-              {name: 'bar'},
-              {name: 'baz'},
+              {name: 'bar', isRefined: false},
+              {name: 'baz', isRefined: false},
             ],
+            isRefined: false,
           },
         ],
       };
@@ -358,16 +381,18 @@ describe('RefinementList', () => {
     it('should add depth class for each depth', () => {
       // Given
       const props = {
+        ...defaultProps,
         cssClasses: {
           depth: 'depth-',
         },
         facetValues: [
           {
             name: 'foo',
             data: [
-              {name: 'bar'},
-              {name: 'baz'},
+              {name: 'bar', isRefined: false},
+              {name: 'baz', isRefined: false},
             ],
+            isRefined: false,
           },
         ],
       };

diff --git a/src/components/Slider/__tests__/Slider-test.js b/src/components/Slider/__tests__/Slider-test.js
@@ -19,6 +19,7 @@ describe('Slider', () => {
     props = {
       range: {min: 0, max: 5000},
       format: {to: () => {}, from: () => {}},
+      start: [0, 0],
     };
   });
 
@@ -39,6 +40,7 @@ describe('Slider', () => {
           values: [0, 50, 100],
         }}
         range={props.range}
+        start={ props.start }
       />
     );
   });
@@ -61,6 +63,7 @@ describe('Slider', () => {
           values: [0, 50, 100],
         } }
         range={ {min: props.range.min, max: props.range.min + 0.0001} }
+        start={ props.start }
         disabled
       />
     );

diff --git a/src/connectors/infinite-hits/connectInfiniteHits.js b/src/connectors/infinite-hits/connectInfiniteHits.js
@@ -41,8 +41,8 @@ Full documentation available at https://community.algolia.com/instantsearch.js/c
 export default function connectInfiniteHits(renderFn) {
   checkRendering(renderFn, usage);
 
-  return widgetParams => {
-    const {hitsPerPage = 20} = widgetParams || {};
+  return (widgetParams = {}) => {
+    const {hitsPerPage = 20} = widgetParams;
     let hitsCache = [];
     const getShowMore = helper => () => helper.nextPage().search();