angular
diff --git a/Collapse file
‎packages/router/src/create_url_tree.ts‎
Copy file name to clipboardExpand all lines: packages/router/src/create_url_tree.ts
+9-9Lines changed: 9 additions & 9 deletions b/Collapse file
‎packages/router/src/create_url_tree.ts‎
Copy file name to clipboardExpand all lines: packages/router/src/create_url_tree.ts
+9-9Lines changed: 9 additions & 9 deletions
diff --git a/Collapse file
‎packages/router/test/create_url_tree.spec.ts‎
Copy file name to clipboardExpand all lines: packages/router/test/create_url_tree.spec.ts
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file
‎packages/router/test/create_url_tree.spec.ts‎
Copy file name to clipboardExpand all lines: packages/router/test/create_url_tree.spec.ts
+2-2Lines changed: 2 additions & 2 deletions
@@ -186,13 +186,6 @@ function createPositionApplyingDoubleDots(
   return new Position(g, false, ci - dd);
 }
 
-function getPath(command: any): any {
-  if (isCommandWithOutlets(command)) {
-    return command.outlets[PRIMARY_OUTLET];
-  }
-  return `${command}`;
-}
-
 function getOutlets(commands: any[]): {[k: string]: any[]} {
   if (isCommandWithOutlets(commands[0])) {
     return commands[0].outlets;
@@ -259,7 +252,14 @@ function prefixedWith(segmentGroup: UrlSegmentGroup, startIndex: number, command
   while (currentPathIndex < segmentGroup.segments.length) {
     if (currentCommandIndex >= commands.length) return noMatch;
     const path = segmentGroup.segments[currentPathIndex];
-    const curr = getPath(commands[currentCommandIndex]);
+    const command = commands[currentCommandIndex];
+    // Do not try to consume command as part of the prefixing if it has outlets because it can
+    // contain outlets other than the one being processed. Consuming the outlets command would
+    // result in other outlets being ignored.
+    if (isCommandWithOutlets(command)) {
+      break;
+    }
+    const curr = `${command}`;
     const next =
         currentCommandIndex < commands.length - 1 ? commands[currentCommandIndex + 1] : null;
 
@@ -298,7 +298,7 @@ function createNewSegmentGroup(
       continue;
     }
 
-    const curr = getPath(command);
+    const curr = isCommandWithOutlets(command) ? command.outlets[PRIMARY_OUTLET] : `${command}`;
     const next = (i < commands.length - 1) ? commands[i + 1] : null;
     if (curr && next && isMatrixParams(next)) {
       paths.push(new UrlSegment(curr, stringify(next)));
 
@@ -150,13 +150,13 @@ describe('createUrlTree', () => {
       expect(serializer.serialize(t)).toEqual('/parent/child');
     });
 
-    xit('should support updating secondary and primary outlets with prefix', () => {
+    it('should support updating secondary and primary outlets with prefix', () => {
       const p = serializer.parse('/parent/child');
       const t = createRoot(p, ['parent', {outlets: {primary: 'child', secondary: 'popup'}}]);
       expect(serializer.serialize(t)).toEqual('/parent/(child//secondary:popup)');
     });
 
-    xit('should support updating two outlets at the same time relative to non-root segment', () => {
+    it('should support updating two outlets at the same time relative to non-root segment', () => {
       const p = serializer.parse('/parent/child');
       const t = create(
           p.root.children[PRIMARY_OUTLET], 0 /* relativeTo: 'parent' */, p,