@ -6,7 +6,7 @@
|
||||
* found in the LICENSE file at https://angular.io/license
|
||||
*/
|
||||
|
||||
import {Observable, forkJoin, from, range} from 'rxjs';
|
||||
import {forkJoin, from, Observable, range} from 'rxjs';
|
||||
|
||||
describe('Observable.forkjoin', () => {
|
||||
let log: any[];
|
||||
@ -14,10 +14,14 @@ describe('Observable.forkjoin', () => {
|
||||
const subscriptionZone: Zone = Zone.current.fork({name: 'Subscription Zone'});
|
||||
let observable1: Observable<any>;
|
||||
|
||||
beforeEach(() => { log = []; });
|
||||
beforeEach(() => {
|
||||
log = [];
|
||||
});
|
||||
|
||||
it('forkjoin func callback should run in the correct zone', () => {
|
||||
observable1 = constructorZone1.run(() => { return forkJoin(range(1, 2), from([4, 5])); });
|
||||
observable1 = constructorZone1.run(() => {
|
||||
return forkJoin(range(1, 2), from([4, 5]));
|
||||
});
|
||||
|
||||
subscriptionZone.run(() => {
|
||||
observable1.subscribe(
|
||||
@ -25,7 +29,9 @@ describe('Observable.forkjoin', () => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
log.push(result);
|
||||
},
|
||||
() => { fail('should not call error'); },
|
||||
() => {
|
||||
fail('should not call error');
|
||||
},
|
||||
() => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
log.push('completed');
|
||||
@ -49,7 +55,9 @@ describe('Observable.forkjoin', () => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
log.push(result);
|
||||
},
|
||||
() => { fail('should not call error'); },
|
||||
() => {
|
||||
fail('should not call error');
|
||||
},
|
||||
() => {
|
||||
expect(Zone.current.name).toEqual(subscriptionZone.name);
|
||||
log.push('completed');
|
||||
|
Reference in New Issue
Block a user