fix non-working initial enhanced routes, add regression test

cellog · May 4, 2017 · 05ebd2c · 05ebd2c
1 parent 6160757
commit 05ebd2c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ion-router",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "elegant powerful routing based on the simplicity of storing url as state",
   "main": "lib/index.js",
   "homepage": "https://cellog.github.io/ion-router",

diff --git a/src/index.js b/src/index.js
@@ -28,6 +28,6 @@ export default function makeRouter(connect, store, routeDefinitions,
   connectToggle(connect, storeKey)
   store.routerOptions.isServer = isServer // eslint-disable-line
   if (routeDefinitions) {
-    store.dispatch(synchronousMakeRoutes(routeDefinitions, store.routerOptions.enhancedRoutes))
+    store.dispatch(synchronousMakeRoutes(routeDefinitions, store.routerOptions))
   }
 }
diff --git a/test/index.test.js b/test/index.test.js
@@ -86,6 +86,25 @@ describe('ion-router', () => {
       ]
       index.default(() => () => null, store, routes)
       expect(log).eqls([actions.batchRoutes(routes)])
+      expect(store.routerOptions).eqls({
+        enhancedRoutes: {
+          hi: {
+            ...enhancers.enhanceRoute({
+              name: 'hi',
+              path: '/hi',
+              parent: undefined,
+            })
+          },
+          there: {
+            ...enhancers.enhanceRoute({
+              name: 'there',
+              path: '/there',
+              parent: undefined,
+            })
+          }
+        },
+        isServer: false
+      })
     })
   })
 })