Merge pull request #1 from JorgenEvens/bug/model-state-unaffected

Fix state after returning new state object from reduce

.travis.yml

@@ -3,4 +3,5 @@ language: node_js
 script: npm run lint && npm run coverage
 after_script: cat ./coverage/lcov.info | coveralls
 node_js:
+  - "5.11"
   - "stable"

package.json

@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "alt-search-docs": "1.0.6",
-    "babel-cli": "6.6.5",
+    "babel-cli": "6.7.7",
     "babel-core": "6.7.4",
     "babel-eslint": "5.0.0",
     "babel-loader": "6.2.4",

src/store/AltStore.js

@@ -72,7 +72,7 @@ class AltStore {
       if (model.reduce) {
         handleDispatch(() => {
           const value = model.reduce(this.state, payload)
-          if (value !== undefined) this.state = value
+          if (value !== undefined) this.state = model.state = value
         }, payload)
         if (!this.preventDefault) this.emitChange()
       }

test/functional-test.js

@@ -171,5 +171,24 @@ export default {
       assert(store.reduce(store.state).x === 0)
       assert(store2.reduce(store2.state).x === 1)
     },
+
+    'state returned from reduce is set correctly'() {
+      const alt = new Alt()
+      const actions = alt.generateActions('test');
+
+      const store = alt.createStore({
+        displayName: 'store',
+
+        state: { x: 0 },
+
+        reduce(state) {
+          assert(state === this.state, 'state matches this.state');
+          return { ...state };
+        }
+      })
+
+      actions.test();
+      actions.test();
+    },
   }
 }