Commit6f9ac00

committed

Reducer: Throw when subscription handler returns undefined. Provide tests.

1 parent688791f commit6f9ac00Copy full SHA for 6f9ac00

File tree

+23

-5

lines changed

+23

-5

lines changed

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,13 +38,20 @@ export default class Reducer {`
`38`	`38`	`return(state,action)=>{`
`39`	`39`	`this.subscriptions.forEach((subscription)=>{`
`40`	`40`	`const{action:subscribedAction}=subscription;`
	`41`	`+const{type:dispatchedType}=action;`
`41`	`42`
`42`	`43`	`constshouldResolve=(subscribedActioninstanceofRegExp)`
`43`		`- ?subscribedAction.test(action.type)`
`44`		`- :(subscribedAction===action.type);`
	`44`	`+ ?subscribedAction.test(dispatchedType)`
	`45`	`+ :(subscribedAction===dispatchedType);`
`45`	`46`
`46`	`47`	`if(shouldResolve){`
`47`		`-this.state=subscription.resolver(this.state,fromJS(action),this.context);`
	`48`	`+constnextState=subscription.resolver(this.state,fromJS(action),this.context);`
	`49`	`+`
	`50`	`+if(!nextState){`
	`51`	+thrownewError(`Expected reducer to return the next state, but got:${nextState}. Check the return statement for the "${dispatchedType}" subscription.`);
	`52`	`+}`
	`53`	`+`
	`54`	`+this.state=nextState;`
`48`	`55`	`}`
`49`	`56`	`});`
`50`	`57`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,13 @@ reducer.subscribe('ADD_COMMENT', (state, action, context) => {`
`15`	`15`	`/* Create a new Redux store */`
`16`	`16`	`conststore=createStore(reducer.toFunction());`
`17`	`17`
`18`		`-describe('Reducer',()=>{`
	`18`	`+describe('General',()=>{`
`19`	`19`	`it('Library exports are fine',()=>{`
`20`	`20`	`returnexpect(Reducer).to.not.be.undefined;`
`21`	`21`	`});`
	`22`	`+});`
`22`	`23`
	`24`	`+describe('Reducer',()=>{`
`23`	`25`	`/**`
`24`	`26`	`* Initial state passed to the method should propagate to Redux state.`
`25`	`27`	`*/`
`@@ -59,6 +61,15 @@ describe('Reducer', () => {`
`59`	`61`	`expect(state.get('comments').get(1)).to.equal('abc');`
`60`	`62`	`});`
`61`	`63`
	`64`	`+it('Throw on subscription not returning the next state',()=>{`
	`65`	`+constreducer=newReducer({prop:true});`
	`66`	`+reducer.subscribe('ACTION_ONE',()=>{});`
	`67`	`+`
	`68`	`+conststore=createStore(reducer.toFunction());`
	`69`	`+`
	`70`	`+expect(store.dispatch.bind(this,{type:'ACTION_ONE'})).to.throw;`
	`71`	`+});`
	`72`	`+`
`62`	`73`	`it('Context is shared between different subscriptions',()=>{`
`63`	`74`	`constreducer=newReducer({someProp:true});`
`64`	`75`
`@@ -77,7 +88,7 @@ describe('Reducer', () => {`
`77`	`88`	`reducer.subscribe('ACTION_THREE',(state,action,context)=>{`
`78`	`89`	`expect(context).to.not.have.property('firstProp');`
`79`	`90`	`expect(context).to.have.property('secondProp','poo');`
`80`		`-returnstate;`
	`91`	`+//return state;`
`81`	`92`	`});`
`82`	`93`
`83`	`94`	`conststore=createStore(reducer.toFunction());`

Comments

(0)