Skip to content

Commit 5e2de63

Browse files
authored
refactor(zipAll): replace deprecated apis (#6121)
1 parent 3952eb9 commit 5e2de63

File tree

1 file changed

+23
-26
lines changed

1 file changed

+23
-26
lines changed

spec/operators/zipAll-spec.ts

+23-26
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
/** @prettier */
12
import { expect } from 'chai';
23
import { zipAll, mergeMap } from 'rxjs/operators';
3-
import { queueScheduler, of, zip } from 'rxjs';
4+
import { queueScheduler, of, zip, scheduled } from 'rxjs';
45
import { TestScheduler } from 'rxjs/testing';
56
import { observableMatcher } from '../helpers/observableMatcher';
67

@@ -45,13 +46,12 @@ describe('zipAll operator', () => {
4546
let i = 0;
4647
of(of('a', 'b', 'c'), of(1, 2, 3))
4748
.pipe(zipAll((a: string, b: number) => a + b))
48-
.subscribe(
49-
(x) => {
49+
.subscribe({
50+
next(x) {
5051
expect(x).to.equal(expected[i++]);
5152
},
52-
null,
53-
done
54-
);
53+
complete: done,
54+
});
5555
});
5656

5757
it('should end once one observable completes and its buffer is empty', () => {
@@ -384,13 +384,12 @@ describe('zipAll operator', () => {
384384
let i = 0;
385385
of(of('a', 'b', 'c'), of(1, 2))
386386
.pipe(zipAll((a: string, b: number) => a + b))
387-
.subscribe(
388-
(x) => {
387+
.subscribe({
388+
next: (x) => {
389389
expect(x).to.equal(expected[i++]);
390390
},
391-
null,
392-
done
393-
);
391+
complete: done,
392+
});
394393
});
395394

396395
it('should handle a hot observable of observables', () => {
@@ -731,29 +730,28 @@ describe('zipAll operator', () => {
731730

732731
it('should combine two immediately-scheduled observables', (done) => {
733732
rxTestScheduler.run(() => {
734-
const a = of(1, 2, 3, queueScheduler);
735-
const b = of(4, 5, 6, 7, 8, queueScheduler);
733+
const a = scheduled([1, 2, 3], queueScheduler);
734+
const b = scheduled([4, 5, 6, 7, 8], queueScheduler);
736735
const r = [
737736
[1, 4],
738737
[2, 5],
739738
[3, 6],
740739
];
741740
let i = 0;
742741

743-
const result = of(a, b, queueScheduler).pipe(zipAll());
742+
const result = scheduled([a, b], queueScheduler).pipe(zipAll());
744743

745-
result.subscribe(
746-
(vals) => {
744+
result.subscribe({
745+
next(vals) {
747746
expect(vals).to.deep.equal(r[i++]);
748747
},
749-
null,
750-
done
751-
);
748+
complete: done,
749+
});
752750
});
753751
});
754752

755753
it('should combine a source with an immediately-scheduled source', (done) => {
756-
const a = of(1, 2, 3, queueScheduler);
754+
const a = scheduled([1, 2, 3], queueScheduler);
757755
const b = of(4, 5, 6, 7, 8);
758756
const r = [
759757
[1, 4],
@@ -762,15 +760,14 @@ describe('zipAll operator', () => {
762760
];
763761
let i = 0;
764762

765-
const result = of(a, b, queueScheduler).pipe(zipAll());
763+
const result = scheduled([a, b], queueScheduler).pipe(zipAll());
766764

767-
result.subscribe(
768-
(vals) => {
765+
result.subscribe({
766+
next(vals) {
769767
expect(vals).to.deep.equal(r[i++]);
770768
},
771-
null,
772-
done
773-
);
769+
complete: done,
770+
});
774771
});
775772

776773
it('should not break unsubscription chain when unsubscribed explicitly', () => {

0 commit comments

Comments
 (0)