Merge branch 'redux' into universal-redux

package.json

@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "babel-eslint": "^7.0.0",
-    "babel-jest": "^16.0.0",
+    "babel-jest": "^17.0.2",
     "concurrently": "^3.1.0",
     "copyfiles": "^1.0.0",
     "cross-env": "^3.1.2",
@@ -40,7 +40,7 @@
     "eslint-plugin-promise": "^3.0.0",
     "eslint-plugin-react": "^6.3.0",
     "eslint-plugin-standard": "^2.0.1",
-    "jest-cli": "^16.0.1",
+    "jest-cli": "^17.0.3",
     "nodemon": "^1.11.0",
     "opn-cli": "^3.1.0",
     "react-addons-test-utils": "^15.3.2",
@@ -73,11 +73,11 @@
     "react-redux": "^4.4.5",
     "react-router": "^2.8.1",
     "react-router-redux": "^4.0.6",
-    "react-router-scroll": "^0.3.2",
+    "react-router-scroll": "^0.3.3",
     "redux": "^3.6.0",
     "redux-form": "^6.1.1",
     "redux-form-submit": "^0.1.2",
-    "redux-saga": "^0.12.0",
+    "redux-saga": "^0.13.0",
     "redux-thunk": "^2.1.0",
     "serialize-javascript": "^1.3.0",
     "styled-components": "^1.0.7",

src/store/post/sagas.test.js

@@ -7,7 +7,7 @@ const resolve = jest.fn()
 const reject = jest.fn()
 
 beforeEach(() => {
-  jest.clearAllMocks()
+  jest.resetAllMocks()
 })
 
 describe('createPost', () => {