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

chore: fix DDC errors / warnings

Browse Source 
Closes #7195
This commit is contained in:
Misko Hevery
2016-02-19 11:49:31 -08:00
committed by Miško Hevery
parent ef9e40e82b
commit 14f0e9ada8
88 changed files with 527 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/angular2/test/router/integration/impl/sync_route_spec_impl.ts
View File

@ -430,8 +430,8 @@ function syncRoutesWithSyncChildrenWithDefaultRoutesWithoutParams() {
}
function syncRoutesWithDynamicComponents() {
var fixture;
var tcb;
var fixture: ComponentFixture;
var tcb: TestComponentBuilder;
var rtr: Router;
beforeEachProviders(() => TEST_ROUTER_PROVIDERS);

17
modules/angular2/test/router/integration/lifecycle_hook_spec.ts
View File

@ -56,17 +56,18 @@ export function main() {
var tcb: TestComponentBuilder;
var fixture: ComponentFixture;
var rtr;
var rtr: Router;
beforeEachProviders(() => TEST_ROUTER_PROVIDERS);
beforeEach(inject([TestComponentBuilder, Router], (tcBuilder, router) => {
tcb = tcBuilder;
rtr = router;
cmpInstanceCount = 0;
log = [];
eventBus = new EventEmitter();
}));
beforeEach(inject([TestComponentBuilder, Router],
(tcBuilder: TestComponentBuilder, router: Router) => {
tcb = tcBuilder;
rtr = router;
cmpInstanceCount = 0;
log = [];
eventBus = new EventEmitter();
}));
it('should call the routerOnActivate hook', inject([AsyncTestCompleter], (async) => {
compile(tcb)

22
modules/angular2/test/router/integration/router_link_spec.ts
View File

@ -49,7 +49,8 @@ export function main() {
describe('routerLink directive', function() {
var tcb: TestComponentBuilder;
var fixture: ComponentFixture;
var router, location;
var router: Router;
var location: Location;
beforeEachProviders(() => [
RouteRegistry,
@ -60,11 +61,12 @@ export function main() {
provide(TEMPLATE_TRANSFORMS, {useClass: RouterLinkTransform, multi: true})
]);
beforeEach(inject([TestComponentBuilder, Router, Location], (tcBuilder, rtr, loc) => {
tcb = tcBuilder;
router = rtr;
location = loc;
}));
beforeEach(inject([TestComponentBuilder, Router, Location],
(tcBuilder, rtr: Router, loc: Location) => {
tcb = tcBuilder;
router = rtr;
location = loc;
}));
function compile(template: string = "<router-outlet></router-outlet>") {
return tcb.overrideView(MyComp, new View({
@ -77,7 +79,7 @@ export function main() {
it('should generate absolute hrefs that include the base href',
inject([AsyncTestCompleter], (async) => {
location.setBaseHref('/my/base');
(<SpyLocation>location).setBaseHref('/my/base');
compile('<a href="hello" [routerLink]="[\'./User\']"></a>')
.then((_) => router.config(
[new Route({path: '/user', component: UserCmp, name: 'User'})]))
@ -345,7 +347,7 @@ export function main() {
// router navigation is async.
router.subscribe((_) => {
expect(location.urlChanges).toEqual(['/user']);
expect((<SpyLocation>location).urlChanges).toEqual(['/user']);
async.done();
});
});
@ -353,7 +355,7 @@ export function main() {
it('should navigate to link hrefs in presence of base href',
inject([AsyncTestCompleter], (async) => {
location.setBaseHref('/base');
(<SpyLocation>location).setBaseHref('/base');
compile('<a href="hello" [routerLink]="[\'./User\']"></a>')
.then((_) => router.config(
[new Route({path: '/user', component: UserCmp, name: 'User'})]))
@ -367,7 +369,7 @@ export function main() {
// router navigation is async.
router.subscribe((_) => {
expect(location.urlChanges).toEqual(['/base/user']);
expect((<SpyLocation>location).urlChanges).toEqual(['/base/user']);
async.done();
});
});

2
modules/angular2/test/router/route_registry_spec.ts
View File

@ -25,7 +25,7 @@ import {
export function main() {
describe('RouteRegistry', () => {
var registry;
var registry: RouteRegistry;
beforeEach(() => { registry = new RouteRegistry(RootHostCmp); });

40
modules/angular2/test/router/router_spec.ts
View File

@ -30,10 +30,12 @@ import {
import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver';
import {provide} from 'angular2/core';
import {RouterOutlet} from 'angular2/src/router/directives/router_outlet';
export function main() {
describe('Router', () => {
var router, location;
var router: Router;
var location: Location;
beforeEachProviders(() => [
RouteRegistry,
@ -44,7 +46,7 @@ export function main() {
]);
beforeEach(inject([Router, Location], (rtr, loc) => {
beforeEach(inject([Router, Location], (rtr: Router, loc: Location) => {
router = rtr;
location = loc;
}));
@ -56,8 +58,8 @@ export function main() {
router.config([new Route({path: '/', component: DummyComponent})])
.then((_) => router.registerPrimaryOutlet(outlet))
.then((_) => {
expect(outlet.spy('activate')).toHaveBeenCalled();
expect(location.urlChanges).toEqual([]);
expect((<any>outlet).spy('activate')).toHaveBeenCalled();
expect((<SpyLocation>location).urlChanges).toEqual([]);
async.done();
});
}));
@ -70,8 +72,8 @@ export function main() {
.then((_) => router.config([new Route({path: '/a', component: DummyComponent})]))
.then((_) => router.navigateByUrl('/a'))
.then((_) => {
expect(outlet.spy('activate')).toHaveBeenCalled();
expect(location.urlChanges).toEqual(['/a']);
expect((<any>outlet).spy('activate')).toHaveBeenCalled();
expect((<SpyLocation>location).urlChanges).toEqual(['/a']);
async.done();
});
}));
@ -85,8 +87,8 @@ export function main() {
[new Route({path: '/a', component: DummyComponent, name: 'A'})]))
.then((_) => router.navigate(['/A']))
.then((_) => {
expect(outlet.spy('activate')).toHaveBeenCalled();
expect(location.urlChanges).toEqual(['/a']);
expect((<any>outlet).spy('activate')).toHaveBeenCalled();
expect((<SpyLocation>location).urlChanges).toEqual(['/a']);
async.done();
});
}));
@ -99,8 +101,8 @@ export function main() {
.then((_) => router.config([new Route({path: '/b', component: DummyComponent})]))
.then((_) => router.navigateByUrl('/b', true))
.then((_) => {
expect(outlet.spy('activate')).toHaveBeenCalled();
expect(location.urlChanges).toEqual([]);
expect((<any>outlet).spy('activate')).toHaveBeenCalled();
expect((<SpyLocation>location).urlChanges).toEqual([]);
async.done();
});
}));
@ -119,11 +121,11 @@ export function main() {
]))
.then((_) => {
router.subscribe((_) => {
expect(location.urlChanges).toEqual(['hash: a', 'replace: /b']);
expect((<SpyLocation>location).urlChanges).toEqual(['hash: a', 'replace: /b']);
async.done();
});
location.simulateHashChange('a');
(<SpyLocation>location).simulateHashChange('a');
});
}));
@ -135,11 +137,11 @@ export function main() {
.then((_) => router.config([new Route({path: '/a', component: DummyComponent})]))
.then((_) => {
router.subscribe((_) => {
expect(location.urlChanges).toEqual(['hash: a']);
expect((<SpyLocation>location).urlChanges).toEqual(['hash: a']);
async.done();
});
location.simulateHashChange('a');
(<SpyLocation>location).simulateHashChange('a');
});
}));
@ -149,11 +151,11 @@ export function main() {
router.registerPrimaryOutlet(outlet)
.then((_) => router.navigateByUrl('/a'))
.then((_) => {
expect(outlet.spy('activate')).not.toHaveBeenCalled();
expect((<any>outlet).spy('activate')).not.toHaveBeenCalled();
return router.config([new Route({path: '/a', component: DummyComponent})]);
})
.then((_) => {
expect(outlet.spy('activate')).toHaveBeenCalled();
expect((<any>outlet).spy('activate')).toHaveBeenCalled();
async.done();
});
}));
@ -193,7 +195,7 @@ export function main() {
var instruction = router.generate(['/FirstCmp']);
router.navigateByInstruction(instruction)
.then((_) => {
expect(outlet.spy('activate')).toHaveBeenCalled();
expect((<any>outlet).spy('activate')).toHaveBeenCalled();
async.done();
});
}));
@ -310,13 +312,13 @@ class DummyComponent {}
class DummyParentComp {
}
function makeDummyOutlet() {
function makeDummyOutlet(): RouterOutlet {
var ref = new SpyRouterOutlet();
ref.spy('canActivate').andCallFake((_) => PromiseWrapper.resolve(true));
ref.spy('routerCanReuse').andCallFake((_) => PromiseWrapper.resolve(false));
ref.spy('routerCanDeactivate').andCallFake((_) => PromiseWrapper.resolve(true));
ref.spy('activate').andCallFake((_) => PromiseWrapper.resolve(true));
return ref;
return <any>ref;
}
class AppCmp {}