fix(TestScheduler): restore run changes upon error

ReactiveX · May 17, 2018 · 27cb9b6 · 27cb9b6
1 parent 4b68933
commit 27cb9b6
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/internal/testing/TestScheduler.ts b/src/internal/testing/TestScheduler.ts
@@ -378,14 +378,15 @@ export class TestScheduler extends VirtualTimeScheduler {
       expectObservable: this.expectObservable.bind(this),
       expectSubscriptions: this.expectSubscriptions.bind(this),
     };
-    const ret = callback(helpers);
-    this.flush();
-
-    TestScheduler.frameTimeFactor = prevFrameTimeFactor;
-    this.maxFrames = prevMaxFrames;
-    this.runMode = false;
-    AsyncScheduler.delegate = undefined;
-
-    return ret;
+    try {
+      const ret = callback(helpers);
+      this.flush();
+      return ret;
+    } finally {
+      TestScheduler.frameTimeFactor = prevFrameTimeFactor;
+      this.maxFrames = prevMaxFrames;
+      this.runMode = false;
+      AsyncScheduler.delegate = undefined;
+    }
   }
 }