Merge pull request #123 from kurumpa/patch-2

Always exit out of console.group when an action throws an error.

Author: jordangarcia

src/reactor.js

@@ -248,10 +248,17 @@ class Reactor {
       // let each core handle the message
       this.__stores.forEach((store, id) => {
         var currState = state.get(id)
-        var newState = store.handle(currState, actionType, payload)
+        var newState
+        var dispatchError
 
-        if (this.debug && newState === undefined) {
-          var error = 'Store handler must return a value, did you forget a return statement'
+        try {
+          newState = store.handle(currState, actionType, payload)
+        } catch(e) {
+          dispatchError = e
+        }
+
+        if (this.debug && (newState === undefined || dispatchError)) {
+          var error = dispatchError || 'Store handler must return a value, did you forget a return statement'
           logging.dispatchError(error)
           throw new Error(error)
         }

tests/reactor-tests.js

@@ -4,6 +4,7 @@ var List = require('immutable').List
 var Reactor = require('../src/main').Reactor
 var Store = require('../src/main').Store
 var toImmutable = require('../src/immutable-helpers').toImmutable
+var logging = require('../src/logging')
 
 
 describe('Reactor', () => {
@@ -451,6 +452,40 @@ describe('Reactor', () => {
     })
   })
 
+  describe('when debug is true and a store has a handler for an action but throws', () => {
+    var reactor
+
+    beforeEach(() => {
+      spyOn(logging, 'dispatchError')
+      var throwingStore = new Store({
+        getInitialState() {
+          return 1
+        },
+        initialize() {
+          this.on('set', (_, val) => {throw new Error('Error during action handling')})
+        },
+      })
+
+      reactor = new Reactor({
+        debug: true,
+      })
+      reactor.registerStores({
+        test: throwingStore,
+      })
+    })
+
+    afterEach(() => {
+      reactor.reset()
+    })
+
+    it('should log and throw an error', function() {
+      expect(function() {
+        reactor.dispatch('set', 'foo')
+      }).toThrow()
+      expect(logging.dispatchError).toHaveBeenCalled()
+    })
+  })
+
   describe('#registerStores', () => {
     var reactor