@ -6,7 +6,7 @@
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
import {Observable, asapScheduler, concat, of , range} from 'rxjs';
|
||||
import {asapScheduler, concat, Observable, of, range} from 'rxjs';
|
||||
import {concatAll, concatMap, concatMapTo, map} from 'rxjs/operators';
|
||||
|
||||
import {asyncTest} from '../test-util';
|
||||
@ -22,7 +22,9 @@ describe('Observable instance method concat', () => {
|
||||
|
||||
let concatObservable: any;
|
||||
|
||||
beforeEach(() => { log = []; });
|
||||
beforeEach(() => {
|
||||
log = [];
|
||||
});
|
||||
|
||||
it('concat func callback should run in the correct zone', () => {
|
||||
observable1 = constructorZone1.run(() => {
|
||||
@ -34,9 +36,13 @@ describe('Observable instance method concat', () => {
|
||||
});
|
||||
});
|
||||
|
||||
observable2 = constructorZone2.run(() => { return range(3, 4); });
|
||||
observable2 = constructorZone2.run(() => {
|
||||
return range(3, 4);
|
||||
});
|
||||
|
||||
constructorZone3.run(() => { concatObservable = concat(observable1, observable2); });
|
||||
constructorZone3.run(() => {
|
||||
concatObservable = concat(observable1, observable2);
|
||||
});
|
||||
|
||||
subscriptionZone.run(() => {
|
||||
concatObservable.subscribe((concat: any) => {
|
||||
@ -54,12 +60,17 @@ describe('Observable instance method concat', () => {
|
||||
const constructorZone2: Zone = Zone.current.fork({name: 'Constructor Zone2'});
|
||||
const constructorZone3: Zone = Zone.current.fork({name: 'Constructor Zone3'});
|
||||
const subscriptionZone: Zone = Zone.current.fork({name: 'Subscription Zone'});
|
||||
observable1 = constructorZone1.run(() => { return of (1, 2); });
|
||||
observable1 = constructorZone1.run(() => {
|
||||
return of(1, 2);
|
||||
});
|
||||
|
||||
observable2 = constructorZone2.run(() => { return range(3, 4); });
|
||||
observable2 = constructorZone2.run(() => {
|
||||
return range(3, 4);
|
||||
});
|
||||
|
||||
constructorZone3.run(
|
||||
() => { concatObservable = concat(observable1, observable2, asapScheduler); });
|
||||
constructorZone3.run(() => {
|
||||
concatObservable = concat(observable1, observable2, asapScheduler);
|
||||
});
|
||||
|
||||
subscriptionZone.run(() => {
|
||||
concatObservable.subscribe(
|
||||
@ -67,7 +78,9 @@ describe('Observable instance method concat', () => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
log.push(concat);
|
||||
},
|
||||
(error: any) => { fail('subscribe failed' + error); },
|
||||
(error: any) => {
|
||||
fail('subscribe failed' + error);
|
||||
},
|
||||
() => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
expect(log).toEqual([1, 2, 3, 4, 5, 6]);
|
||||
@ -82,12 +95,14 @@ describe('Observable instance method concat', () => {
|
||||
const constructorZone1: Zone = Zone.current.fork({name: 'Constructor Zone1'});
|
||||
const constructorZone2: Zone = Zone.current.fork({name: 'Constructor Zone2'});
|
||||
const subscriptionZone: Zone = Zone.current.fork({name: 'Subscription Zone'});
|
||||
observable1 = constructorZone1.run(() => { return of (0, 1, 2); });
|
||||
observable1 = constructorZone1.run(() => {
|
||||
return of(0, 1, 2);
|
||||
});
|
||||
|
||||
constructorZone2.run(() => {
|
||||
const highOrder = observable1.pipe(map((v: any) => {
|
||||
expect(Zone.current.name).toEqual(constructorZone2.name);
|
||||
return of (v + 1);
|
||||
return of(v + 1);
|
||||
}));
|
||||
concatObservable = highOrder.pipe(concatAll());
|
||||
});
|
||||
@ -98,7 +113,9 @@ describe('Observable instance method concat', () => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
log.push(concat);
|
||||
},
|
||||
(error: any) => { fail('subscribe failed' + error); },
|
||||
(error: any) => {
|
||||
fail('subscribe failed' + error);
|
||||
},
|
||||
() => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
expect(log).toEqual([1, 2, 3]);
|
||||
@ -125,7 +142,7 @@ describe('Observable instance method concat', () => {
|
||||
constructorZone2.run(() => {
|
||||
concatObservable = observable1.pipe(concatMap((v: any) => {
|
||||
expect(Zone.current.name).toEqual(constructorZone2.name);
|
||||
return of (0, 1);
|
||||
return of(0, 1);
|
||||
}));
|
||||
});
|
||||
|
||||
@ -135,7 +152,9 @@ describe('Observable instance method concat', () => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
log.push(concat);
|
||||
},
|
||||
(error: any) => { fail('subscribe failed' + error); },
|
||||
(error: any) => {
|
||||
fail('subscribe failed' + error);
|
||||
},
|
||||
() => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
expect(log).toEqual([0, 1, 0, 1, 0, 1, 0, 1]);
|
||||
@ -159,7 +178,9 @@ describe('Observable instance method concat', () => {
|
||||
});
|
||||
});
|
||||
|
||||
constructorZone2.run(() => { concatObservable = observable1.pipe(concatMapTo(of (0, 1))); });
|
||||
constructorZone2.run(() => {
|
||||
concatObservable = observable1.pipe(concatMapTo(of(0, 1)));
|
||||
});
|
||||
|
||||
subscriptionZone.run(() => {
|
||||
concatObservable.subscribe(
|
||||
@ -167,7 +188,9 @@ describe('Observable instance method concat', () => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
log.push(concat);
|
||||
},
|
||||
(error: any) => { fail('subscribe failed' + error); },
|
||||
(error: any) => {
|
||||
fail('subscribe failed' + error);
|
||||
},
|
||||
() => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
expect(log).toEqual([0, 1, 0, 1, 0, 1, 0, 1]);
|
||||
|
Reference in New Issue
Block a user