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

chore(facade): remove most facade/async functions

Browse Source
This commit is contained in:
Jason Choi
2016-08-02 15:53:34 -07:00
committed by Alex Rickabaugh
parent 6baf3baedd
commit 99989f5d3f
184 changed files with 1609 additions and 1698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/@angular/router-deprecated/test/integration/auxiliary_route_spec.ts
View File

@ -6,11 +6,10 @@
* found in the LICENSE file at https://angular.io/license
*/
import {TEST_ROUTER_PROVIDERS, ddescribeRouter, describeRouter, describeWith, describeWithAndWithout, describeWithout, itShouldRoute} from './util';
import {beforeEachProviders, describe,} from '@angular/core/testing/testing_internal';
import {beforeEachProviders, describe} from '@angular/core/testing/testing_internal';
import {registerSpecs} from './impl/aux_route_spec_impl';
import {TEST_ROUTER_PROVIDERS, ddescribeRouter, describeRouter, describeWith, describeWithAndWithout, describeWithout, itShouldRoute} from './util';
export function main() {
describe('auxiliary route spec', () => {

4
modules/@angular/router-deprecated/test/integration/bootstrap_spec.ts
View File

@ -19,8 +19,6 @@ import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
import {DOCUMENT} from '@angular/platform-browser/src/dom/dom_tokens';
import {expect} from '@angular/platform-browser/testing/matchers';
import {ROUTER_DIRECTIVES, ROUTER_PRIMARY_COMPONENT, ROUTER_PROVIDERS, RouteParams, Router} from '@angular/router-deprecated';
import {PromiseWrapper} from '../../src/facade/async';
import {BaseException} from '../../src/facade/exceptions';
import {AuxRoute, Route, RouteConfig} from '../../src/route_config/route_config_decorator';
@ -74,7 +72,7 @@ export function main() {
(async: AsyncTestCompleter, tcb: TestComponentBuilder) => {
tcb.createAsync(AppCmp).then((fixture) => {
var router = fixture.debugElement.componentInstance.router;
PromiseWrapper.catchError(router.navigateByUrl('/cause-error'), (error) => {
router.navigateByUrl('/cause-error').catch((error: any) => {
expect(error).toContainError('oops!');
async.done();
});

16
modules/@angular/router-deprecated/test/integration/impl/async_route_spec_impl.ts
View File

@ -6,18 +6,16 @@
* found in the LICENSE file at https://angular.io/license
*/
import {AsyncTestCompleter, beforeEach, beforeEachProviders, iit, inject, it, xit,} from '@angular/core/testing/testing_internal';
import {expect} from '@angular/platform-browser/testing/matchers';
import {ComponentFixture, TestComponentBuilder} from '@angular/core/testing';
import {Location} from '@angular/common';
import {ComponentFixture, TestComponentBuilder} from '@angular/core/testing';
import {AsyncTestCompleter, beforeEach, beforeEachProviders, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {expect} from '@angular/platform-browser/testing/matchers';
import {AsyncRoute, Route, Router} from '@angular/router-deprecated';
import {specs, compile, TEST_ROUTER_PROVIDERS, clickOnElement, getHref} from '../util';
import {Router, AsyncRoute, Route} from '@angular/router-deprecated';
import {HelloCmp, helloCmpLoader, UserCmp, userCmpLoader, TeamCmp, asyncTeamLoader, ParentCmp, parentCmpLoader, asyncParentCmpLoader, asyncDefaultParentCmpLoader, ParentWithDefaultCmp, parentWithDefaultCmpLoader, asyncRouteDataCmp} from './fixture_components';
import {By} from '../../../../platform-browser/src/dom/debug/by';
import {TEST_ROUTER_PROVIDERS, clickOnElement, compile, getHref, specs} from '../util';
import {HelloCmp, ParentCmp, ParentWithDefaultCmp, TeamCmp, UserCmp, asyncDefaultParentCmpLoader, asyncParentCmpLoader, asyncRouteDataCmp, asyncTeamLoader, helloCmpLoader, parentCmpLoader, parentWithDefaultCmpLoader, userCmpLoader} from './fixture_components';
function getLinkElement(rtc: ComponentFixture<any>) {
return rtc.debugElement.query(By.css('a')).nativeElement;

18
modules/@angular/router-deprecated/test/integration/impl/fixture_components.ts
View File

@ -9,8 +9,6 @@
import {Component, ComponentRef, ViewChild, ViewContainerRef} from '@angular/core';
import {DynamicComponentLoader} from '@angular/core/src/linker/dynamic_component_loader';
import {AsyncRoute, ROUTER_DIRECTIVES, Redirect, Route, RouteConfig, RouteData, RouteParams} from '@angular/router-deprecated';
import {PromiseWrapper} from '../../../src/facade/async';
import {isPresent} from '../../../src/facade/lang';
@Component({selector: 'goodbye-cmp', template: `{{farewell}}`})
@ -26,7 +24,7 @@ export class HelloCmp {
}
export function helloCmpLoader() {
return PromiseWrapper.resolve(HelloCmp);
return Promise.resolve(HelloCmp);
}
@ -37,7 +35,7 @@ export class UserCmp {
}
export function userCmpLoader() {
return PromiseWrapper.resolve(UserCmp);
return Promise.resolve(UserCmp);
}
@ -51,7 +49,7 @@ export class ParentCmp {
}
export function parentCmpLoader() {
return PromiseWrapper.resolve(ParentCmp);
return Promise.resolve(ParentCmp);
}
@ -65,7 +63,7 @@ export class AsyncParentCmp {
}
export function asyncParentCmpLoader() {
return PromiseWrapper.resolve(AsyncParentCmp);
return Promise.resolve(AsyncParentCmp);
}
@Component({
@ -79,7 +77,7 @@ export class AsyncDefaultParentCmp {
}
export function asyncDefaultParentCmpLoader() {
return PromiseWrapper.resolve(AsyncDefaultParentCmp);
return Promise.resolve(AsyncDefaultParentCmp);
}
@ -93,7 +91,7 @@ export class ParentWithDefaultCmp {
}
export function parentWithDefaultCmpLoader() {
return PromiseWrapper.resolve(ParentWithDefaultCmp);
return Promise.resolve(ParentWithDefaultCmp);
}
@ -120,7 +118,7 @@ export class AsyncTeamCmp {
}
export function asyncTeamLoader() {
return PromiseWrapper.resolve(AsyncTeamCmp);
return Promise.resolve(AsyncTeamCmp);
}
@ -131,7 +129,7 @@ export class RouteDataCmp {
}
export function asyncRouteDataCmp() {
return PromiseWrapper.resolve(RouteDataCmp);
return Promise.resolve(RouteDataCmp);
}
@Component({selector: 'redirect-to-parent-cmp', template: 'redirect-to-parent'})

17
modules/@angular/router-deprecated/test/integration/impl/sync_route_spec_impl.ts
View File

@ -6,16 +6,15 @@
* found in the LICENSE file at https://angular.io/license
*/
import {AsyncTestCompleter, beforeEach, beforeEachProviders, iit, inject, it, xit,} from '@angular/core/testing/testing_internal';
import {expect} from '@angular/platform-browser/testing/matchers';
import {ComponentFixture, TestComponentBuilder} from '@angular/core/testing';
import {specs, compile, TEST_ROUTER_PROVIDERS, clickOnElement, getHref} from '../util';
import {Location} from '@angular/common';
import {Router, Route} from '@angular/router-deprecated';
import {HelloCmp, UserCmp, TeamCmp, ParentCmp, ParentWithDefaultCmp, DynamicLoaderCmp} from './fixture_components';
import {PromiseWrapper} from '../../../src/facade/async';
import {ComponentFixture, TestComponentBuilder} from '@angular/core/testing';
import {AsyncTestCompleter, beforeEach, beforeEachProviders, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {By} from '@angular/platform-browser/src/dom/debug/by';
import {expect} from '@angular/platform-browser/testing/matchers';
import {Route, Router} from '@angular/router-deprecated';
import {TEST_ROUTER_PROVIDERS, clickOnElement, compile, getHref, specs} from '../util';
import {DynamicLoaderCmp, HelloCmp, ParentCmp, ParentWithDefaultCmp, TeamCmp, UserCmp} from './fixture_components';
function getLinkElement(rtc: ComponentFixture<any>) {
@ -497,7 +496,7 @@ function syncRoutesWithDynamicComponents() {
// something
// similar basically the assertion needs to run when the world is
// stable and we don't know when that is, only zones know.
PromiseWrapper.resolve(null).then((_) => {
Promise.resolve(null).then((_) => {
fixture.detectChanges();
expect(fixture.debugElement.nativeElement).toHaveText('[ hello ]');
async.done();

114
modules/@angular/router-deprecated/test/integration/lifecycle_hook_spec.ts
View File

@ -6,13 +6,13 @@
* found in the LICENSE file at https://angular.io/license
*/
import {Component,} from '@angular/core';
import {Component} from '@angular/core';
import {ComponentFixture, TestComponentBuilder} from '@angular/core/testing';
import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
import {expect} from '@angular/platform-browser/testing/matchers';
import {RouteParams, Router, RouterLink, RouterOutlet} from '@angular/router-deprecated';
import {EventEmitter, ObservableWrapper, PromiseCompleter, PromiseWrapper} from '../../src/facade/async';
import {EventEmitter} from '../../src/facade/async';
import {isPresent} from '../../src/facade/lang';
import {ComponentInstruction} from '../../src/instruction';
import {CanDeactivate, CanReuse, OnActivate, OnDeactivate, OnReuse} from '../../src/interfaces';
@ -24,7 +24,9 @@ import {TEST_ROUTER_PROVIDERS, compile} from './util';
var cmpInstanceCount: any /** TODO #9100 */;
var log: string[];
var eventBus: EventEmitter<any>;
var completer: PromiseCompleter<any>;
var resolve: (result: any) => void;
var reject: (error: any) => void;
var promise: Promise<any>;
export function main() {
describe('Router lifecycle hooks', () => {
@ -64,9 +66,11 @@ export function main() {
.then((rtc) => { fixture = rtc; })
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
.then((_) => {
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
if (ev.startsWith('parent activate')) {
completer.resolve(true);
eventBus.subscribe({
next: (ev: any) => {
if (ev.startsWith('parent activate')) {
resolve(true);
}
}
});
rtr.navigateByUrl('/parent-activate/child-activate').then((_) => {
@ -102,11 +106,14 @@ export function main() {
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
.then((_) => rtr.navigateByUrl('/parent-deactivate/child-deactivate'))
.then((_) => {
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
if (ev.startsWith('deactivate')) {
completer.resolve(true);
fixture.detectChanges();
expect(fixture.debugElement.nativeElement).toHaveText('parent [deactivate cmp]');
eventBus.subscribe({
next: (ev: any) => {
if (ev.startsWith('deactivate')) {
resolve(true);
fixture.detectChanges();
expect(fixture.debugElement.nativeElement)
.toHaveText('parent [deactivate cmp]');
}
}
});
rtr.navigateByUrl('/a').then((_) => {
@ -173,9 +180,11 @@ export function main() {
.then((rtc) => { fixture = rtc; })
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
.then((_) => {
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
if (ev.startsWith('routerCanActivate')) {
completer.resolve(true);
eventBus.subscribe({
next: (ev: any) => {
if (ev.startsWith('routerCanActivate')) {
resolve(true);
}
}
});
rtr.navigateByUrl('/can-activate/a').then((_) => {
@ -193,9 +202,11 @@ export function main() {
.then((rtc) => { fixture = rtc; })
.then((_) => rtr.config([new Route({path: '/...', component: LifecycleCmp})]))
.then((_) => {
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
if (ev.startsWith('routerCanActivate')) {
completer.resolve(false);
eventBus.subscribe({
next: (ev: any) => {
if (ev.startsWith('routerCanActivate')) {
resolve(false);
}
}
});
rtr.navigateByUrl('/can-activate/a').then((_) => {
@ -218,9 +229,11 @@ export function main() {
expect(fixture.debugElement.nativeElement).toHaveText('routerCanDeactivate [A]');
expect(log).toEqual([]);
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
if (ev.startsWith('routerCanDeactivate')) {
completer.resolve(true);
eventBus.subscribe({
next: (ev: any) => {
if (ev.startsWith('routerCanDeactivate')) {
resolve(true);
}
}
});
@ -244,9 +257,11 @@ export function main() {
expect(fixture.debugElement.nativeElement).toHaveText('routerCanDeactivate [A]');
expect(log).toEqual([]);
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
if (ev.startsWith('routerCanDeactivate')) {
completer.resolve(false);
eventBus.subscribe({
next: (ev: any) => {
if (ev.startsWith('routerCanDeactivate')) {
resolve(false);
}
}
});
@ -300,9 +315,11 @@ export function main() {
'routerOnActivate: null -> /reuse-hooks/1'
]);
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
if (ev.startsWith('routerCanReuse')) {
completer.resolve(true);
eventBus.subscribe({
next: (ev: any) => {
if (ev.startsWith('routerCanReuse')) {
resolve(true);
}
}
});
@ -330,9 +347,11 @@ export function main() {
'routerOnActivate: null -> /reuse-hooks/1'
]);
ObservableWrapper.subscribe<string>(eventBus, (ev) => {
if (ev.startsWith('routerCanReuse')) {
completer.resolve(false);
eventBus.subscribe({
next: (ev: any) => {
if (ev.startsWith('routerCanReuse')) {
resolve(false);
}
}
});
@ -368,7 +387,7 @@ function logHook(name: string, next: ComponentInstruction, prev: ComponentInstru
var message = name + ': ' + (isPresent(prev) ? ('/' + prev.urlPath) : 'null') + ' -> ' +
(isPresent(next) ? ('/' + next.urlPath) : 'null');
log.push(message);
ObservableWrapper.callEmit(eventBus, message);
eventBus.emit(message);
}
@Component({selector: 'activate-cmp', template: 'activate cmp'})
@ -386,9 +405,12 @@ class ActivateCmp implements OnActivate {
@RouteConfig([new Route({path: '/child-activate', component: ActivateCmp})])
class ParentActivateCmp implements OnActivate {
routerOnActivate(next: ComponentInstruction, prev: ComponentInstruction): Promise<any> {
completer = PromiseWrapper.completer();
promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
logHook('parent activate', next, prev);
return completer.promise;
return promise;
}
}
@ -402,9 +424,12 @@ class DeactivateCmp implements OnDeactivate {
@Component({selector: 'deactivate-cmp', template: 'deactivate cmp'})
class WaitDeactivateCmp implements OnDeactivate {
routerOnDeactivate(next: ComponentInstruction, prev: ComponentInstruction): Promise<any> {
completer = PromiseWrapper.completer();
promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
logHook('deactivate', next, prev);
return completer.promise;
return promise;
}
}
@ -460,9 +485,12 @@ class NeverReuseCmp implements OnReuse,
class CanActivateCmp {
static routerCanActivate(next: ComponentInstruction, prev: ComponentInstruction):
Promise<boolean> {
completer = PromiseWrapper.completer();
promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
logHook('routerCanActivate', next, prev);
return completer.promise;
return promise;
}
}
@ -474,9 +502,12 @@ class CanActivateCmp {
@RouteConfig([new Route({path: '/a', component: A}), new Route({path: '/b', component: B})])
class CanDeactivateCmp implements CanDeactivate {
routerCanDeactivate(next: ComponentInstruction, prev: ComponentInstruction): Promise<boolean> {
completer = PromiseWrapper.completer();
promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
logHook('routerCanDeactivate', next, prev);
return completer.promise;
return promise;
}
}
@ -534,9 +565,12 @@ class AllHooksParentCmp implements CanDeactivate,
@CanActivate(ReuseHooksCmp.routerCanActivate)
class ReuseHooksCmp implements OnActivate, OnReuse, OnDeactivate, CanReuse, CanDeactivate {
routerCanReuse(next: ComponentInstruction, prev: ComponentInstruction): Promise<any> {
completer = PromiseWrapper.completer();
promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
logHook('routerCanReuse', next, prev);
return completer.promise;
return promise;
}
routerOnReuse(next: ComponentInstruction, prev: ComponentInstruction) {

9
modules/@angular/router-deprecated/test/integration/navigation_spec.ts
View File

@ -13,7 +13,6 @@ import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe
import {expect} from '@angular/platform-browser/testing/matchers';
import {RouteData, RouteParams, Router, RouterLink, RouterOutlet} from '@angular/router-deprecated';
import {PromiseWrapper, TimerWrapper} from '../../src/facade/async';
import {AsyncRoute, AuxRoute, Redirect, Route, RouteConfig} from '../../src/route_config/route_config_decorator';
import {RootCmp, TEST_ROUTER_PROVIDERS, compile} from './util';
@ -238,9 +237,7 @@ export function main() {
.then((_) => rtr.navigateByUrl('/test'))
.then((_) => {
// Note: need a timeout so that all promises are flushed
var completer = PromiseWrapper.completer();
TimerWrapper.setTimeout(() => { completer.resolve(null); }, 0);
return completer.promise;
return new Promise(resolve => { setTimeout(() => { resolve(null); }, 0); });
})
.then((_) => {
expect(fixture.componentInstance.activatedCmp).toBeAnInstanceOf(HelloCmp);
@ -259,7 +256,7 @@ class HelloCmp {
function asyncRouteDataCmp() {
return PromiseWrapper.resolve(RouteDataCmp);
return Promise.resolve(RouteDataCmp);
}
@Component({selector: 'data-cmp', template: `{{myData}}`})
@ -279,7 +276,7 @@ class UserCmp {
function parentLoader() {
return PromiseWrapper.resolve(ParentCmp);
return Promise.resolve(ParentCmp);
}
@Component({

23
modules/@angular/router-deprecated/test/integration/router_link_spec.ts
View File

@ -6,19 +6,18 @@
* found in the LICENSE file at https://angular.io/license
*/
import {AsyncTestCompleter, beforeEach, ddescribe, xdescribe, describe, iit, inject, beforeEachProviders, it, xit,} from '@angular/core/testing/testing_internal';
import {expect} from '@angular/platform-browser/testing/matchers';
import {ComponentFixture, TestComponentBuilder} from '@angular/core/testing';
import {Location} from '@angular/common';
import {NumberWrapper, escapeRegExp} from '../../src/facade/lang';
import {PromiseWrapper} from '../../src/facade/async';
import {ListWrapper} from '../../src/facade/collection';
import {Component} from '@angular/core';
import {Router, RouteRegistry, RouterLink, AsyncRoute, AuxRoute, Route, RouteParams, RouteConfig, ROUTER_DIRECTIVES, ROUTER_PRIMARY_COMPONENT} from '@angular/router-deprecated';
import {RootRouter} from '@angular/router-deprecated/src/router';
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
import {By} from '@angular/platform-browser/src/dom/debug/by';
import {SpyLocation} from '@angular/common/testing';
import {Component} from '@angular/core';
import {ComponentFixture, TestComponentBuilder} from '@angular/core/testing';
import {AsyncTestCompleter, beforeEach, beforeEachProviders, ddescribe, describe, iit, inject, it, xdescribe, xit} from '@angular/core/testing/testing_internal';
import {By} from '@angular/platform-browser/src/dom/debug/by';
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
import {expect} from '@angular/platform-browser/testing/matchers';
import {AsyncRoute, AuxRoute, ROUTER_DIRECTIVES, ROUTER_PRIMARY_COMPONENT, Route, RouteConfig, RouteParams, RouteRegistry, Router, RouterLink} from '@angular/router-deprecated';
import {RootRouter} from '@angular/router-deprecated/src/router';
import {ListWrapper} from '../../src/facade/collection';
import {NumberWrapper, escapeRegExp} from '../../src/facade/lang';
export function main() {
describe('routerLink directive', function() {
@ -435,7 +434,7 @@ class Hello2Cmp {
}
function parentCmpLoader() {
return PromiseWrapper.resolve(ParentCmp);
return Promise.resolve(ParentCmp);
}
@Component({