Skip to content

Commit af88c7e

Browse files
committed
adjust rxjs depracated code
1 parent 1f20bad commit af88c7e

File tree

1 file changed

+51
-37
lines changed

1 file changed

+51
-37
lines changed

spec/retryBackoff-spec.ts

+51-37
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1-
import { Observable, Observer, of, Subject, throwError } from 'rxjs';
2-
import { concat, map, mergeMap, multicast, refCount } from 'rxjs/operators';
1+
import {
2+
Observable,
3+
Observer,
4+
of,
5+
Subject,
6+
throwError,
7+
concat,
8+
map,
9+
mergeMap,
10+
share,
11+
from,
12+
concatWith,
13+
} from 'rxjs';
314
import { TestScheduler } from 'rxjs/testing';
415
import { retryBackoff } from '../src';
516

@@ -38,7 +49,7 @@ describe('retryBackoff operator', () => {
3849
it('should retry a number of times, without error, then complete', done => {
3950
let errors = 0;
4051
const retries = 2;
41-
Observable.create((observer: Observer<number>) => {
52+
new Observable((observer: Observer<number>) => {
4253
observer.next(42);
4354
observer.complete();
4455
})
@@ -52,21 +63,21 @@ describe('retryBackoff operator', () => {
5263
}),
5364
retryBackoff({ initialInterval: 1, maxRetries: retries })
5465
)
55-
.subscribe(
56-
(x: number) => {
66+
.subscribe({
67+
next: (x: number) => {
5768
expect(x).toEqual(42);
5869
},
59-
() => {
70+
error: () => {
6071
expect('this was called').toBeTruthy();
6172
},
62-
done
63-
);
73+
complete: done
74+
});
6475
});
6576

6677
it('should retry a number of times, then call error handler', done => {
6778
let errors = 0;
6879
const retries = 2;
69-
Observable.create((observer: Observer<number>) => {
80+
new Observable((observer: Observer<number>) => {
7081
observer.next(42);
7182
observer.complete();
7283
})
@@ -77,24 +88,24 @@ describe('retryBackoff operator', () => {
7788
}),
7889
retryBackoff({ initialInterval: 1, maxRetries: retries - 1 })
7990
)
80-
.subscribe(
81-
(x: number) => {
91+
.subscribe({
92+
next: (x: number) => {
8293
expect(x).toEqual(42);
8394
},
84-
() => {
95+
error: () => {
8596
expect(errors).toEqual(2);
8697
done();
8798
},
88-
() => {
99+
complete: () => {
89100
expect('this was called').toBeTruthy();
90101
}
91-
);
102+
});
92103
});
93104

94105
it('should retry until successful completion', done => {
95106
let errors = 0;
96107
const retries = 10;
97-
Observable.create((observer: Observer<number>) => {
108+
new Observable((observer: Observer<number>) => {
98109
observer.next(42);
99110
observer.complete();
100111
})
@@ -108,15 +119,15 @@ describe('retryBackoff operator', () => {
108119
}),
109120
retryBackoff({ initialInterval: 1 })
110121
)
111-
.subscribe(
112-
(x: number) => {
122+
.subscribe({
123+
next: (x: number) => {
113124
expect(x).toEqual(42);
114125
},
115-
() => {
126+
error: () => {
116127
expect('this was called').toBeTruthy();
117128
},
118-
done
119-
);
129+
complete:done
130+
});
120131
});
121132

122133
it('should handle an empty source', () => {
@@ -246,29 +257,32 @@ describe('retryBackoff operator', () => {
246257
});
247258
});
248259

249-
it('should retry a synchronous source (multicasted and refCounted) multiple times', done => {
260+
it('should retry a synchronous source (multicasted) multiple times', done => {
250261
const expected = [1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3, 1, 2, 3];
251262

252-
of(1, 2, 3)
263+
const ERR = new Error('bad!');
264+
265+
from([1, 2, 3])
253266
.pipe(
254-
concat(throwError('bad!')),
255-
multicast(() => new Subject<number>()),
256-
refCount(),
267+
concatWith(throwError(() => ERR)),
268+
share({
269+
connector: () => new Subject(),
270+
}),
257271
retryBackoff({ initialInterval: 1, maxRetries: 4 })
258272
)
259-
.subscribe(
260-
(x: number) => {
273+
.subscribe({
274+
next: (x: number) => {
261275
expect(x).toEqual(expected.shift());
262276
},
263-
(err: any) => {
264-
expect(err).toEqual('bad!');
277+
error: (err: unknown) => {
278+
expect(err).toEqual(ERR);
265279
expect(expected.length).toEqual(0);
266280
done();
267281
},
268-
() => {
282+
complete: () => {
269283
done(new Error('should not be called'));
270-
}
271-
);
284+
},
285+
});
272286
});
273287

274288
it('should increase the intervals exponentially up to maxInterval', () => {
@@ -300,7 +314,7 @@ describe('retryBackoff operator', () => {
300314
it('should retry until shouldRetry is true', done => {
301315
let errors = 0;
302316
const isNotSoBad = (error: any) => error === 'not so bad';
303-
Observable.create((observer: Observer<number>) => {
317+
new Observable((observer: Observer<number>) => {
304318
observer.next(42);
305319
observer.complete();
306320
})
@@ -311,14 +325,14 @@ describe('retryBackoff operator', () => {
311325
}),
312326
retryBackoff({ initialInterval: 1, shouldRetry: isNotSoBad })
313327
)
314-
.subscribe(
315-
() => {},
316-
(err: any) => {
328+
.subscribe({
329+
next:() => {},
330+
error:(err: unknown) => {
317331
expect(errors).toEqual(2);
318332
expect(err).toEqual('really bad');
319333
done();
320334
}
321-
);
335+
});
322336
});
323337

324338
it('should increase the intervals calculated by backoffDelay function', () => {

0 commit comments

Comments
 (0)