From df7b7a77d124ad24518153597452176a59ce87f8 Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Mon, 10 Jan 2022 19:02:17 -0600 Subject: [PATCH] chore: remove deprecated subscribe use in library code --- .../observable/dom/WebSocketSubject.ts | 10 +++--- src/internal/testing/TestScheduler.ts | 36 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/internal/observable/dom/WebSocketSubject.ts b/src/internal/observable/dom/WebSocketSubject.ts index 036aca1278..3c493fe377 100644 --- a/src/internal/observable/dom/WebSocketSubject.ts +++ b/src/internal/observable/dom/WebSocketSubject.ts @@ -234,8 +234,8 @@ export class WebSocketSubject extends AnonymousSubject { observer.error(err); } - const subscription = self.subscribe( - (x) => { + const subscription = self.subscribe({ + next: (x) => { try { if (messageFilter(x)) { observer.next(x); @@ -244,9 +244,9 @@ export class WebSocketSubject extends AnonymousSubject { observer.error(err); } }, - (err) => observer.error(err), - () => observer.complete() - ); + error: (err) => observer.error(err), + complete: () => observer.complete(), + }); return () => { try { diff --git a/src/internal/testing/TestScheduler.ts b/src/internal/testing/TestScheduler.ts index debb40b4cf..e08fd180b6 100644 --- a/src/internal/testing/TestScheduler.ts +++ b/src/internal/testing/TestScheduler.ts @@ -116,17 +116,17 @@ export class TestScheduler extends VirtualTimeScheduler { private materializeInnerObservable(observable: Observable, outerFrame: number): TestMessage[] { const messages: TestMessage[] = []; - observable.subscribe( - (value) => { + observable.subscribe({ + next: (value) => { messages.push({ frame: this.frame - outerFrame, notification: nextNotification(value) }); }, - (error) => { + error: (error) => { messages.push({ frame: this.frame - outerFrame, notification: errorNotification(error) }); }, - () => { + complete: () => { messages.push({ frame: this.frame - outerFrame, notification: COMPLETE_NOTIFICATION }); - } - ); + }, + }); return messages; } @@ -139,19 +139,19 @@ export class TestScheduler extends VirtualTimeScheduler { let subscription: Subscription; this.schedule(() => { - subscription = observable.subscribe( - (x) => { + subscription = observable.subscribe({ + next: (x) => { // Support Observable-of-Observables const value = x instanceof Observable ? this.materializeInnerObservable(x, this.frame) : x; actual.push({ frame: this.frame, notification: nextNotification(value) }); }, - (error) => { + error: (error) => { actual.push({ frame: this.frame, notification: errorNotification(error) }); }, - () => { + complete: () => { actual.push({ frame: this.frame, notification: COMPLETE_NOTIFICATION }); - } - ); + }, + }); }, subscriptionFrame); if (unsubscriptionFrame !== Infinity) { @@ -170,19 +170,19 @@ export class TestScheduler extends VirtualTimeScheduler { flushTest.ready = true; flushTest.expected = []; this.schedule(() => { - subscription = other.subscribe( - (x) => { + subscription = other.subscribe({ + next: (x) => { // Support Observable-of-Observables const value = x instanceof Observable ? this.materializeInnerObservable(x, this.frame) : x; flushTest.expected!.push({ frame: this.frame, notification: nextNotification(value) }); }, - (error) => { + error: (error) => { flushTest.expected!.push({ frame: this.frame, notification: errorNotification(error) }); }, - () => { + complete: () => { flushTest.expected!.push({ frame: this.frame, notification: COMPLETE_NOTIFICATION }); - } - ); + }, + }); }, subscriptionFrame); }, };