From 069ede4a304f1260dfdb1ba479798d248d579a85 Mon Sep 17 00:00:00 2001
From: Ben Lesh <blesh@netflix.com>
Date: Mon, 14 Sep 2015 21:34:39 -0700
Subject: [PATCH] fix(TestScheduler): properly schedule actions added
 dynamically

---
 src/schedulers/TestScheduler.ts        |  5 +++--
 src/schedulers/VirtualTimeScheduler.ts | 26 +++++++++++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/schedulers/TestScheduler.ts b/src/schedulers/TestScheduler.ts
index 1db584b184..cf4ac6b82b 100644
--- a/src/schedulers/TestScheduler.ts
+++ b/src/schedulers/TestScheduler.ts
@@ -15,9 +15,9 @@ export default class TestScheduler extends VirtualTimeScheduler {
     let messages = TestScheduler.parseMarbles(marbles, values, error);
     return Observable.create(subscriber => {
       messages.forEach(({ notification, frame }) => {
-        this.schedule(() => {
+        subscriber.add(this.schedule(() => {
           notification.observe(subscriber);
-        }, frame);
+        }, frame));
       }, this);
     });
   }
@@ -67,6 +67,7 @@ export default class TestScheduler extends VirtualTimeScheduler {
     const flushTests = this.flushTests.filter(test => test.ready);
     while (flushTests.length > 0) {
       var test = flushTests.shift();
+      test.actual.sort((a, b) => a.frame === b.frame ? 0 : (a.frame > b.frame ? 1 : -1));
       this.assertDeepEqual(test.actual, test.expected);
     }
   }
diff --git a/src/schedulers/VirtualTimeScheduler.ts b/src/schedulers/VirtualTimeScheduler.ts
index 153182b98f..bdc2ad37cd 100644
--- a/src/schedulers/VirtualTimeScheduler.ts
+++ b/src/schedulers/VirtualTimeScheduler.ts
@@ -14,17 +14,7 @@ export default class VirtualTimeScheduler implements Scheduler {
     return 0;
   }
   
-  sortActions() {
-    if (!this.sorted) {
-      (<VirtualAction<any>[]>this.actions).sort((a, b) => {
-        return a.delay === b.delay ? (a.index > b.index ? 1 : -1) : (a.delay > b.delay ? 1 : -1);
-      });
-      this.sorted = true;
-    }  
-  }
-  
   flush() {
-    this.sortActions();
     const actions = this.actions;
     while (actions.length > 0) {
       let action = actions.shift();
@@ -33,6 +23,20 @@ export default class VirtualTimeScheduler implements Scheduler {
     }
     this.frame = 0;
   }
+  
+  addAction<T>(action: Action) {
+    const findDelay = action.delay;
+    const actions = this.actions;
+    const len = actions.length;
+    const vaction = <VirtualAction<T>>action;
+    
+    
+    actions.push(action);
+    
+    actions.sort((a:VirtualAction<T>, b:VirtualAction<T>) => {
+      return (a.delay === b.delay) ? (a.index === b.index ? 0 : (a.index > b.index ? 1 : -1)) : (a.delay > b.delay ? 1 : -1);
+    });
+  }
 
   schedule<T>(work: (x?: any) => Subscription<T> | void, delay: number = 0, state?: any): Subscription<T> {
     this.sorted = false;
@@ -59,7 +63,7 @@ class VirtualAction<T> extends Subscription<T> implements Action {
       new VirtualAction(scheduler, this.work, scheduler.index += 1);
     action.state = state;
     action.delay = scheduler.frame + delay;
-    scheduler.actions.push(action);
+    scheduler.addAction(action);
     return this;
   }