honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(router): subscribe should return subscription 

Closes #3491

Closes #3695
This commit is contained in:
Brian Ford 2015-08-18 11:30:32 -07:00
parent f2d3bdb801
commit 5c95b376b5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/angular2/src/router/router.ts
View File

@ -242,8 +242,8 @@ export class Router {
/** /**
* Subscribe to URL updates from the router * Subscribe to URL updates from the router
*/ */
subscribe(onNext: (value: any) => void): void { subscribe(onNext: (value: any) => void): Object {
ObservableWrapper.subscribe(this._subject, onNext); return ObservableWrapper.subscribe(this._subject, onNext);
} }

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

@ -12,7 +12,7 @@ import {
SpyObject SpyObject
} from 'angular2/test_lib'; } from 'angular2/test_lib';
import {IMPLEMENTS, Type} from 'angular2/src/facade/lang'; import {IMPLEMENTS, Type} from 'angular2/src/facade/lang';
import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {Promise, PromiseWrapper, ObservableWrapper} from 'angular2/src/facade/async';
import {ListWrapper} from 'angular2/src/facade/collection'; import {ListWrapper} from 'angular2/src/facade/collection';
import {Router, RootRouter} from 'angular2/src/router/router'; import {Router, RootRouter} from 'angular2/src/router/router';
@ -122,6 +122,12 @@ export function main() {
.toThrowError(`Link "${ListWrapper.toJSON(['/'])}" must include a route name.`); .toThrowError(`Link "${ListWrapper.toJSON(['/'])}" must include a route name.`);
}); });
it('should, when subscribed to, return a disposable subscription', () => {
expect(() => {
var subscription = router.subscribe((_) => {});
ObservableWrapper.dispose(subscription);
}).not.toThrow();
});
it('should generate URLs from the root component when the path starts with /', () => { it('should generate URLs from the root component when the path starts with /', () => {
router.config([new Route({path: '/first/...', component: DummyParentComp, as: 'firstCmp'})]); router.config([new Route({path: '/first/...', component: DummyParentComp, as: 'firstCmp'})]);