From 8ced321bb65087c83ef5e3aed00ef4ab569514db Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Tue, 7 May 2019 17:02:32 -0700 Subject: [PATCH] Revert "fix(router): fix a problem with router not responding to back button (#30160)" (#30320) This reverts commit 3327bd8eab0cf5bfb9a6a21d6ee4a8e081aab630. PR Close #30320 --- packages/router/src/router.ts | 1 - packages/router/test/integration.spec.ts | 27 ------------------------ 2 files changed, 28 deletions(-) diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts index 4381892218..ea7436666d 100644 --- a/packages/router/src/router.ts +++ b/packages/router/src/router.ts @@ -556,7 +556,6 @@ export class Router { * way the next navigation will be coming from the current URL in the browser. */ this.rawUrlTree = t.rawUrl; - this.browserUrlTree = t.urlAfterRedirects; t.resolve(null); return EMPTY; } diff --git a/packages/router/test/integration.spec.ts b/packages/router/test/integration.spec.ts index 6cc703a182..e5e85e84e1 100644 --- a/packages/router/test/integration.spec.ts +++ b/packages/router/test/integration.spec.ts @@ -662,33 +662,6 @@ describe('Integration', () => { expect(location.path()).toEqual('/login'); }))); - it('should set browserUrlTree with urlUpdateStrategy="eagar" and false `shouldProcessUrl`', - fakeAsync(inject([Router, Location], (router: Router, location: Location) => { - const fixture = TestBed.createComponent(RootCmp); - advance(fixture); - - router.urlUpdateStrategy = 'eager'; - - router.resetConfig([ - {path: 'team/:id', component: SimpleCmp}, - {path: 'login', component: AbsoluteSimpleLinkCmp} - ]); - - router.navigateByUrl('/team/22'); - advance(fixture, 1); - - expect((router as any).browserUrlTree.toString()).toBe('/team/22'); - - // Force to not process URL changes - router.urlHandlingStrategy.shouldProcessUrl = (url: UrlTree) => false; - - router.navigateByUrl('/login'); - advance(fixture, 1); - - // Because we now can't process any URL, we will end up back at the root. - expect((router as any).browserUrlTree.toString()).toBe('/'); - }))); - it('should eagerly update URL after redirects are applied with urlUpdateStrategy="eagar"', fakeAsync(inject([Router, Location], (router: Router, location: Location) => { const fixture = TestBed.createComponent(RootCmp);