fix(router): handle undefined routes

opbeat · May 18, 2017 · 49062fc · 49062fc · aksel · Jun 2, 2017
1 parent faa2b30
commit 49062fc
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/src/router.js b/src/router.js
@@ -22,7 +22,7 @@ function combineRoutes (routes) {
 }
 
 function makeSignatureFromRoutes (routes, location) {
-  if (routes.length < 1) {
+  if (!routes || routes.length < 1) {
     return 'unknown'
   }
   var fullRoute

diff --git a/test/e2e/router/routes.js b/test/e2e/router/routes.js
@@ -10,7 +10,31 @@ function loadComponent(prom) {
   }
 }
 
-module.exports = (
+
+var plainRoutes = {
+  path:'/router',
+  component:App,
+  indexRoute:{
+    component:Index
+  },
+  childRoutes:[
+    {
+      path:'/about1',
+      getComponent:loadComponent(() => System.import('./about_component') )
+    },
+    {
+      path:'/about2',
+      getComponent:(nextState, cb) => {
+          require.ensure([], function (require) {
+          cb(null, [
+              require('./about_component').default,
+          ])
+        })}
+    }
+  ]
+}
+
+var routes =  (
  <Route path="/router" component={App}>
     <IndexRoute component={Index}/>
       <Route path="/about1" getComponent={loadComponent(() => System.import('./about_component') )} />
@@ -21,4 +45,6 @@ module.exports = (
           ])
         })}} />
   </Route>
-)
+)
+
+module.exports = routes
diff --git a/test/react/router.spec.js b/test/react/router.spec.js
@@ -56,8 +56,9 @@ describe('react-router: makeSignatureFromRoutes', function () {
     expect(makeSignatureFromRoutes(routes, pushLocation)).toBe('/something')
   })
 
-  it('should handle zero routes', function () {
+  it('should handle zero or undefined routes', function () {
     expect(makeSignatureFromRoutes([], pushLocation)).toBe('unknown')
+    expect(makeSignatureFromRoutes(undefined, pushLocation)).toBe('unknown')
   })
 
   it('should handle REPLACE routes', function () {