fix(router): fix lazy loaded module with wildcard route (angular#13649)

Closes angular#12955
quyentv88 · Dec 27, 2016 · 0eca960 · 0eca960
1 parent eed8344
commit 0eca960
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/modules/@angular/router/src/apply_redirects.ts b/modules/@angular/router/src/apply_redirects.ts
@@ -235,7 +235,7 @@ class ApplyRedirects {
       if (route.loadChildren) {
         return map.call(this.configLoader.load(injector, route.loadChildren), (r: any) => {
           (<any>route)._loadedConfig = r;
-          return of (new UrlSegmentGroup(segments, {}));
+          return new UrlSegmentGroup(segments, {});
         });
       } else {
         return of (new UrlSegmentGroup(segments, {}));
@@ -503,4 +503,4 @@ function emptyPathRedirect(
 
 function getOutlet(route: Route): string {
   return route.outlet ? route.outlet : PRIMARY_OUTLET;
-}
+}
diff --git a/modules/@angular/router/test/integration.spec.ts b/modules/@angular/router/test/integration.spec.ts
@@ -2378,6 +2378,32 @@ describe('Integration', () => {
              expect(location.path()).toEqual('/lazy/loaded');
            })));
 
+    it('should work with wildcard route',
+       fakeAsync(inject(
+           [Router, Location, NgModuleFactoryLoader],
+           (router: Router, location: Location, loader: SpyNgModuleFactoryLoader) => {
+             @Component({selector: 'lazy', template: 'lazy-loaded'})
+             class LazyLoadedComponent {
+             }
+
+             @NgModule({
+               declarations: [LazyLoadedComponent],
+               imports: [RouterModule.forChild([{path: '', component: LazyLoadedComponent}])],
+             })
+             class LoadedModule {
+             }
+
+             loader.stubbedModules = {lazy: LoadedModule};
+             const fixture = createRoot(router, RootCmp);
+
+             router.resetConfig([{path: '**', loadChildren: 'lazy'}]);
+
+             router.navigateByUrl('/lazy');
+             advance(fixture);
+
+             expect(location.path()).toEqual('/lazy');
+           })));
+
     describe('preloading', () => {
       beforeEach(() => {
         TestBed.configureTestingModule(