fix(TestScheduler): explicit unsubscribe works properly with toEqual (#…

…7403) * fix(TestScheduler): explicit unsubscribe works properly with toEqual Fixes #7399 * chore: clean up tests, add expected observable test
ReactiveX · Dec 12, 2023 · ad54bd8 · ad54bd8
1 parent 480c6a2
commit ad54bd8
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 28 deletions.
diff --git a/packages/rxjs/spec/schedulers/TestScheduler-spec.ts b/packages/rxjs/spec/schedulers/TestScheduler-spec.ts
@@ -707,5 +707,32 @@ describe('TestScheduler', () => {
         });
       });
     });
+
+    it('should unsubscribe source with toBe', () => {
+      const testScheduler = new TestScheduler(assertDeepEquals);
+      let disposed = false;
+      testScheduler.run(({ expectObservable }) => {
+        expectObservable(new Observable((_) => () => (disposed = true)), '^!').toBe('');
+      });
+      expect(disposed).to.be.true;
+    });
+
+    it('should unsubscribe source with toEqual', () => {
+      const testScheduler = new TestScheduler(assertDeepEquals);
+      let disposed = false;
+      testScheduler.run(({ cold, expectObservable }) => {
+        expectObservable(new Observable((_) => () => (disposed = true)), '^!').toEqual(cold(''));
+      });
+      expect(disposed).to.be.true;
+    });
+
+    it('should unsubscribe the expected observable with toEqual', () => {
+      const testScheduler = new TestScheduler(assertDeepEquals);
+      let disposed = false;
+      testScheduler.run(({ cold, expectObservable }) => {
+        expectObservable(cold(''), '^!').toEqual(new Observable((_) => () => (disposed = true)));
+      });
+      expect(disposed).to.be.true;
+    });
   });
 });
diff --git a/packages/rxjs/src/internal/testing/TestScheduler.ts b/packages/rxjs/src/internal/testing/TestScheduler.ts
@@ -1,4 +1,4 @@
-import type { Subscription} from '../Observable.js';
+import { Subscription } from '../Observable.js';
 import { Observable, COMPLETE_NOTIFICATION, errorNotification, nextNotification } from '../Observable.js';
 import { ColdObservable } from './ColdObservable.js';
 import { HotObservable } from './HotObservable.js';
@@ -135,22 +135,24 @@ export class TestScheduler extends VirtualTimeScheduler {
     const subscriptionParsed = TestScheduler.parseMarblesAsSubscriptions(subscriptionMarbles, this.runMode);
     const subscriptionFrame = subscriptionParsed.subscribedFrame === Infinity ? 0 : subscriptionParsed.subscribedFrame;
     const unsubscriptionFrame = subscriptionParsed.unsubscribedFrame;
-    let subscription: Subscription;
+    const subscription = new Subscription();
 
     this.schedule(() => {
-      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) => {
-          actual.push({ frame: this.frame, notification: errorNotification(error) });
-        },
-        complete: () => {
-          actual.push({ frame: this.frame, notification: COMPLETE_NOTIFICATION });
-        },
-      });
+      subscription.add(
+        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) => {
+            actual.push({ frame: this.frame, notification: errorNotification(error) });
+          },
+          complete: () => {
+            actual.push({ frame: this.frame, notification: COMPLETE_NOTIFICATION });
+          },
+        })
+      );
     }, subscriptionFrame);
 
     if (unsubscriptionFrame !== Infinity) {
@@ -169,19 +171,21 @@ export class TestScheduler extends VirtualTimeScheduler {
         flushTest.ready = true;
         flushTest.expected = [];
         this.schedule(() => {
-          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) => {
-              flushTest.expected!.push({ frame: this.frame, notification: errorNotification(error) });
-            },
-            complete: () => {
-              flushTest.expected!.push({ frame: this.frame, notification: COMPLETE_NOTIFICATION });
-            },
-          });
+          subscription.add(
+            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) => {
+                flushTest.expected!.push({ frame: this.frame, notification: errorNotification(error) });
+              },
+              complete: () => {
+                flushTest.expected!.push({ frame: this.frame, notification: COMPLETE_NOTIFICATION });
+              },
+            })
+          );
         }, subscriptionFrame);
       },
     };