fix(router): child recognizer and catchAllHandler

src/router.js

@@ -276,23 +276,21 @@ export class Router {
     let caseSensitive = config.caseSensitive === true;
     let state = this._recognizer.add({path: path, handler: config, caseSensitive: caseSensitive});
 
-    if (path) {
-      let settings = config.settings;
-      delete config.settings;
-      let withChild = JSON.parse(JSON.stringify(config));
-      config.settings = settings;
-      withChild.route = `${path}/*childRoute`;
-      withChild.hasChildRouter = true;
-      this._childRecognizer.add({
-        path: withChild.route,
-        handler: withChild,
-        caseSensitive: caseSensitive
-      });
+    let settings = config.settings;
+    delete config.settings;
+    let withChild = JSON.parse(JSON.stringify(config));
+    config.settings = settings;
+    withChild.route = `${path}/*childRoute`;
+    withChild.hasChildRouter = true;
+    this._childRecognizer.add({
+      path: withChild.route,
+      handler: withChild,
+      caseSensitive: caseSensitive
+    });
 
-      withChild.navModel = navModel;
-      withChild.settings = config.settings;
-      withChild.navigationStrategy = config.navigationStrategy;
-    }
+    withChild.navModel = navModel;
+    withChild.settings = config.settings;
+    withChild.navigationStrategy = config.navigationStrategy;
 
     config.navModel = navModel;
 
@@ -398,6 +396,13 @@ export class Router {
     let results = this._recognizer.recognize(url);
     if (!results || !results.length) {
       results = this._childRecognizer.recognize(url);
+      if (
+        results &&
+        (this.catchAllHandler || (this.parent && this._parentCatchAllHandler(this.parent)))
+      ) {
+        results = Array.prototype.filter.call(results,
+          result => result.handler.route !== '/*childRoute');
+      }
     }
 
     let instructionInit = {

test/navigation-instruction.spec.js

@@ -136,4 +136,25 @@ describe('NavigationInstruction', () => {
       });
     });
   });
+
+  it('matches child with empty parent route', (done) => {
+    router.addRoute({
+      route: '',
+      moduleId: 'child'
+    });
+    const childRouter = router.createChild();
+    childRouter.addRoute({
+      name: 'child',
+      route: 'test',
+      moduleId: 'test'
+    });
+
+    router
+      ._createNavigationInstruction('test')
+      .then(parentInstruction =>
+        childRouter._createNavigationInstruction('test', parentInstruction))
+      .then(childInstruction => expect(childInstruction.config.name).toBe('child'))
+      .catch(fail)
+      .then(done);
+  });
 });

test/router.spec.js

@@ -359,6 +359,30 @@ describe('the router', () => {
           .then(x => expect(true).toBeFalsy('should have rejected', x))
           .catch(reason => done());
       });
+
+      it('should work when route is empty', done => {
+        router
+          .configure(config => {
+            config.unknownRouteConfig = 'test';
+            config.mapRoute({route: '', moduleId: './empty'});
+          })
+          .then(() => router._createNavigationInstruction('foo/123?bar=456'))
+          .then(instruction => expect(instruction.config.moduleId).toEqual('test'))
+          .catch(fail)
+          .then(done);
+      });
+
+      it(`should work when route is '/'`, done => {
+        router
+          .configure(config => {
+            config.unknownRouteConfig = 'test';
+            config.mapRoute({route: '/', moduleId: './empty'});
+          })
+          .then(() => router._createNavigationInstruction('foo/123?bar=456'))
+          .then(instruction => expect(instruction.config.moduleId).toEqual('test'))
+          .catch(fail)
+          .then(done);
+      });
     });
   });