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

build(package): bump rxjs to 5.0.0-beta.2

Browse Source 
Closes #7001
This commit is contained in:
Jeff Cross
2016-02-17 14:05:47 -08:00
parent d736c31fea
commit 46d9c87ddc
5 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/angular2/src/facade/async.ts
View File

@ -6,7 +6,7 @@ import {Subject} from 'rxjs/Subject';
import {Subscription} from 'rxjs/Subscription';
import {Operator} from 'rxjs/Operator';
import {PromiseObservable} from 'rxjs/observable/fromPromise';
import {PromiseObservable} from 'rxjs/observable/PromiseObservable';
import {toPromise} from 'rxjs/operator/toPromise';
export {Observable} from 'rxjs/Observable';

62
modules/angular2/test/core/zone/ng_zone_spec.ts
View File

@ -249,42 +249,42 @@ function commonTests() {
}, resultTimer);
}), testTimeout);
it('should run subscriber listeners in the subscription zone (outside)',
inject([AsyncTestCompleter], (async) => {
// Each subscriber fires a microtask outside the Angular zone. The test
// then verifies that those microtasks do not cause additional digests.
xit('should run subscriber listeners in the subscription zone (outside)',
inject([AsyncTestCompleter], (async) => {
// Each subscriber fires a microtask outside the Angular zone. The test
// then verifies that those microtasks do not cause additional digests.
var turnStart = false;
ObservableWrapper.subscribe(_zone.onTurnStart, (_) => {
if (turnStart) throw 'Should not call this more than once';
_log.add('onTurnStart');
microTask(() => {});
turnStart = true;
});
var turnStart = false;
ObservableWrapper.subscribe(_zone.onTurnStart, (_) => {
if (turnStart) throw 'Should not call this more than once';
_log.add('onTurnStart');
microTask(() => {});
turnStart = true;
});
var turnDone = false;
ObservableWrapper.subscribe(_zone.onTurnDone, (_) => {
if (turnDone) throw 'Should not call this more than once';
_log.add('onTurnDone');
microTask(() => {});
turnDone = true;
});
var turnDone = false;
ObservableWrapper.subscribe(_zone.onTurnDone, (_) => {
if (turnDone) throw 'Should not call this more than once';
_log.add('onTurnDone');
microTask(() => {});
turnDone = true;
});
var eventDone = false;
ObservableWrapper.subscribe(_zone.onEventDone, (_) => {
if (eventDone) throw 'Should not call this more than once';
_log.add('onEventDone');
microTask(() => {});
eventDone = true;
});
var eventDone = false;
ObservableWrapper.subscribe(_zone.onEventDone, (_) => {
if (eventDone) throw 'Should not call this more than once';
_log.add('onEventDone');
microTask(() => {});
eventDone = true;
});
macroTask(() => { _zone.run(_log.fn('run')); });
macroTask(() => { _zone.run(_log.fn('run')); });
macroTask(() => {
expect(_log.result()).toEqual('onTurnStart; run; onTurnDone; onEventDone');
async.done();
}, resultTimer);
}), testTimeout);
macroTask(() => {
expect(_log.result()).toEqual('onTurnStart; run; onTurnDone; onEventDone');
async.done();
}, resultTimer);
}), testTimeout);
it('should run subscriber listeners in the subscription zone (inside)',
inject([AsyncTestCompleter], (async) => {