cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat(router): add an option to rerun guards and resolvers when query changes"

Browse Source 
This reverts commit c2e0f71a78.
This commit is contained in:
Victor Berchet
2017-02-20 19:48:43 -08:00
parent 670f2eca00
commit c2d5f203a5
6 changed files with 9 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
modules/@angular/router/test/integration.spec.ts
View File

@ -16,7 +16,7 @@ import {map} from 'rxjs/operator/map';
import {ActivatedRoute, ActivatedRouteSnapshot, CanActivate, CanDeactivate, DetachedRouteHandle, Event, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, PRIMARY_OUTLET, Params, PreloadAllModules, PreloadingStrategy, Resolve, RouteConfigLoadEnd, RouteConfigLoadStart, RouteReuseStrategy, Router, RouterModule, RouterStateSnapshot, RoutesRecognized, UrlHandlingStrategy, UrlSegmentGroup, UrlTree} from '../index';
import {RouterPreloader} from '../src/router_preloader';
import {forEach, shallowEqual} from '../src/utils/collection';
import {forEach} from '../src/utils/collection';
import {RouterTestingModule, SpyNgModuleFactoryLoader} from '../testing';
describe('Integration', () => {
@ -1527,125 +1527,6 @@ describe('Integration', () => {
expect(fixture.nativeElement).toHaveText('simple');
})));
});
describe('runGuardsAndResolvers', () => {
let count = 0;
beforeEach(() => {
count = 0;
TestBed.configureTestingModule({
providers: [{
provide: 'loggingCanActivate',
useValue: (a: any, b: any) => {
count++;
return true;
}
}]
});
});
it('should rerun guards when params change',
fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
const fixture = createRoot(router, RootCmpWithTwoOutlets);
router.resetConfig([
{
path: 'a',
runGuardsAndResolvers: 'paramsChange',
component: SimpleCmp,
canActivate: ['loggingCanActivate']
},
{path: 'b', component: SimpleCmp, outlet: 'right'}
]);
router.navigateByUrl('/a');
advance(fixture);
expect(count).toEqual(1);
router.navigateByUrl('/a;p=1');
advance(fixture);
expect(count).toEqual(2);
router.navigateByUrl('/a;p=2');
advance(fixture);
expect(count).toEqual(3);
router.navigateByUrl('/a;p=2?q=1');
advance(fixture);
expect(count).toEqual(3);
})));
it('should rerun guards when query params change',
fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
const fixture = createRoot(router, RootCmpWithTwoOutlets);
router.resetConfig([
{
path: 'a',
runGuardsAndResolvers: 'paramsOrQueryParamsChange',
component: SimpleCmp,
canActivate: ['loggingCanActivate']
},
{path: 'b', component: SimpleCmp, outlet: 'right'}
]);
router.navigateByUrl('/a');
advance(fixture);
expect(count).toEqual(1);
router.navigateByUrl('/a;p=1');
advance(fixture);
expect(count).toEqual(2);
router.navigateByUrl('/a;p=2');
advance(fixture);
expect(count).toEqual(3);
router.navigateByUrl('/a;p=2?q=1');
advance(fixture);
expect(count).toEqual(4);
router.navigateByUrl('/a;p=2(right:b)?q=1');
advance(fixture);
expect(count).toEqual(4);
})));
it('should always rerun guards',
fakeAsync(inject([Router, Location], (router: Router, location: Location) => {
const fixture = createRoot(router, RootCmpWithTwoOutlets);
router.resetConfig([
{
path: 'a',
runGuardsAndResolvers: 'always',
component: SimpleCmp,
canActivate: ['loggingCanActivate']
},
{path: 'b', component: SimpleCmp, outlet: 'right'}
]);
router.navigateByUrl('/a');
advance(fixture);
expect(count).toEqual(1);
router.navigateByUrl('/a;p=1');
advance(fixture);
expect(count).toEqual(2);
router.navigateByUrl('/a;p=2');
advance(fixture);
expect(count).toEqual(3);
router.navigateByUrl('/a;p=2?q=1');
advance(fixture);
expect(count).toEqual(4);
router.navigateByUrl('/a;p=2(right:b)?q=1');
advance(fixture);
expect(count).toEqual(5);
})));
});
});
describe('CanDeactivate', () => {