Merge pull request #208 from SimenB/patch-1

Make UPDATE_LOCATION follow FSA
reactjs · Jan 17, 2016 · 37e95e7 · 37e95e7
2 parents 8691686 + 2e00f61
commit 37e95e7
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 24 deletions.
diff --git a/src/index.js b/src/index.js
@@ -8,7 +8,7 @@ const SELECT_STATE = state => state.routing
 function transition(method) {
   return arg => ({
     type: TRANSITION,
-    method, arg
+    payload: { method, arg }
   })
 }
 
@@ -23,7 +23,7 @@ export const routeActions = {
 function updateLocation(location) {
   return {
     type: UPDATE_LOCATION,
-    location
+    payload: location
   }
 }
 
@@ -33,7 +33,7 @@ const initialState = {
   location: undefined
 }
 
-export function routeReducer(state = initialState, { type, location }) {
+export function routeReducer(state = initialState, { type, payload: location }) {
   if (type !== UPDATE_LOCATION) {
     return state
   }
@@ -65,7 +65,7 @@ export function syncHistory(history) {
         return next(action)
       }
 
-      const { method, arg } = action
+      const { payload: { method, arg } } = action
       history[method](arg)
     }
   }

diff --git a/test/createTests.js b/test/createTests.js
@@ -55,16 +55,20 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
         it('creates actions', () => {
           expect(push('/foo')).toEqual({
             type: TRANSITION,
-            method: 'push',
-            arg: '/foo'
+            payload: {
+              method: 'push',
+              arg: '/foo'
+            }
           })
 
           expect(push({ pathname: '/foo', state: { the: 'state' } })).toEqual({
             type: TRANSITION,
-            method: 'push',
-            arg: {
-              pathname: '/foo',
-              state: { the: 'state' }
+            payload: {
+              method: 'push',
+              arg: {
+                pathname: '/foo',
+                state: { the: 'state' }
+              }
             }
           })
         })
@@ -74,16 +78,20 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
         it('creates actions', () => {
           expect(replace('/foo')).toEqual({
             type: TRANSITION,
-            method: 'replace',
-            arg: '/foo'
+            payload: {
+              method: 'replace',
+              arg: '/foo'
+            }
           })
 
           expect(replace({ pathname: '/foo', state: { the: 'state' } })).toEqual({
             type: TRANSITION,
-            method: 'replace',
-            arg: {
-              pathname: '/foo',
-              state: { the: 'state' }
+            payload: {
+              method: 'replace',
+              arg: {
+                pathname: '/foo',
+                state: { the: 'state' }
+              }
             }
           })
         })
@@ -93,8 +101,10 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
         it('creates actions', () => {
           expect(go(1)).toEqual({
             type: TRANSITION,
-            method: 'go',
-            arg: 1
+            payload: {
+              method: 'go',
+              arg: 1
+            }
           })
         })
       })
@@ -103,8 +113,10 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
         it('creates actions', () => {
           expect(goBack()).toEqual({
             type: TRANSITION,
-            method: 'goBack',
-            arg: undefined
+            payload: {
+              method: 'goBack',
+              arg: undefined
+            }
           })
         })
       })
@@ -113,8 +125,10 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
         it('creates actions', () => {
           expect(goForward()).toEqual({
             type: TRANSITION,
-            method: 'goForward',
-            arg: undefined
+            payload: {
+              method: 'goForward',
+              arg: undefined
+            }
           })
         })
       })
@@ -132,7 +146,7 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
       it('updates the path', () => {
         expect(routeReducer(state, {
           type: UPDATE_LOCATION,
-          location: {
+          payload: {
             path: '/bar',
             action: 'PUSH'
           }
@@ -147,7 +161,7 @@ module.exports = function createTests(createHistory, name, reset = defaultReset)
       it('respects replace', () => {
         expect(routeReducer(state, {
           type: UPDATE_LOCATION,
-          location: {
+          payload: {
             path: '/bar',
             action: 'REPLACE'
           }