fixup! feat(router): add hash-based navigation option to setUpLocatio…

…nSync
angular · Feb 13, 2019 · 515ae50 · 515ae50
1 parent fa1db49
commit 515ae50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/router/upgrade/src/upgrade.ts b/packages/router/upgrade/src/upgrade.ts
@@ -75,8 +75,9 @@ export function setUpLocationSync(ngUpgrade: UpgradeModule, urlType: 'path' | 'h
         if (urlType === 'path') {
           url = resolveUrl(next);
         } else if (urlType === 'hash') {
-          // Remove the leading hash from the URL
+          // Remove the first hash from the URL
-          url = resolveUrl(next.substring(1));
+          const hashIdx = next.indexOf('#');
+          url = resolveUrl(next.substring(0, hashIdx) + next.substring(hashIdx + 1));
         } else {
           throw 'Invalid URLType passed to setUpLocationSync: ' + urlType;
         }

diff --git a/packages/router/upgrade/test/upgrade.spec.ts b/packages/router/upgrade/test/upgrade.spec.ts
@@ -97,7 +97,7 @@ describe('setUpLocationSync', () => {
     callback({}, combinedUrl, '');
 
     expect(LocationMock.normalize).toHaveBeenCalledTimes(1);
-    expect(LocationMock.normalize).toHaveBeenCalledWith(pathname + query + hash);
+    expect(LocationMock.normalize).toHaveBeenCalledWith(pathname);
 
     expect(RouterMock.navigateByUrl).toHaveBeenCalledTimes(1);
     expect(RouterMock.navigateByUrl).toHaveBeenCalledWith(normalizedPathname + query + hash);