Merge pull request #208 from SimenB/run-to-last-loop

fix: runToLast should respect current time
sinonjs · Sep 18, 2018 · cbaa8ba · cbaa8ba
2 parents f1f80da + a6c0308
commit cbaa8ba
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/lolex-src.js b/src/lolex-src.js
@@ -720,7 +720,7 @@ function withGlobal(_global) {
                 return clock.now;
             }
 
-            return clock.tick(timer.callAt);
+            return clock.tick(timer.callAt - clock.now);
         };
 
         clock.reset = function reset() {

diff --git a/test/lolex-test.js b/test/lolex-test.js
@@ -1222,6 +1222,21 @@ describe("lolex", function () {
             assert.isTrue(spy.called);
         });
 
+        it("should support clocks with start time", function () {
+            this.clock = lolex.createClock(200);
+            var that = this;
+            var invocations = 0;
+
+            this.clock.setTimeout(function cb() {
+                invocations++;
+                that.clock.setTimeout(cb, 50);
+            }, 50);
+
+            this.clock.runToLast();
+
+            assert.equals(invocations, 1);
+        });
+
     });
 
     describe("clearTimeout", function () {