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

build: reformat repo to new clang@1.4.0 (#36613)

Browse Source 
PR Close #36613
This commit is contained in:
Joey Perrott
2020-04-13 16:40:21 -07:00
committed by atscott
parent 5e80e7e216
commit 698b0288be
1160 changed files with 31667 additions and 24000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/zone.js/test/rxjs/rxjs.merge.spec.ts
View File

@ -5,7 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license
*/
import {Observable, interval, merge} from 'rxjs';
import {interval, merge, Observable} from 'rxjs';
import {map, take} from 'rxjs/operators';
import {asyncTest} from '../test-util';
@ -13,21 +13,26 @@ import {asyncTest} from '../test-util';
describe('Observable.merge', () => {
let log: any[];
beforeEach(() => { log = []; });
beforeEach(() => {
log = [];
});
it('merge func callback should run in the correct zone', asyncTest((done: any) => {
const constructorZone1: Zone = Zone.current.fork({name: 'Constructor Zone1'});
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'});
const observable1: any = constructorZone1.run(
() => { return interval(8).pipe(map(v => 'observable1' + v), take(1)); });
const observable1: any = constructorZone1.run(() => {
return interval(8).pipe(map(v => 'observable1' + v), take(1));
});
const observable2: any = constructorZone2.run(
() => { return interval(10).pipe(map(v => 'observable2' + v), take(1)); });
const observable2: any = constructorZone2.run(() => {
return interval(10).pipe(map(v => 'observable2' + v), take(1));
});
const observable3: any =
constructorZone3.run(() => { return merge(observable1, observable2); });
const observable3: any = constructorZone3.run(() => {
return merge(observable1, observable2);
});
subscriptionZone.run(() => {
const subscriber = observable3.subscribe(
@ -35,7 +40,9 @@ describe('Observable.merge', () => {
log.push(result);
expect(Zone.current.name).toEqual(subscriptionZone.name);
},
() => { fail('should not call error'); },
() => {
fail('should not call error');
},
() => {
log.push('completed');
expect(Zone.current.name).toEqual(subscriptionZone.name);