fixed a case where runAll was called and there are no timers (#70)

sinonjs · Jun 15, 2016 · f464603 · f464603
1 parent 9ac6a76
commit f464603
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/lolex-src.js b/src/lolex-src.js
@@ -542,6 +542,10 @@
         clock.runAll = function runAll() {
             var numTimers, i;
             for (i = 0; i < clock.loopLimit; i++) {
+                if (!clock.timers) {
+                    return clock.now;
+                }
+
                 numTimers = Object.keys(clock.timers).length;
                 if (numTimers === 0) {
                     return clock.now;

diff --git a/test/lolex-test.js b/test/lolex-test.js
@@ -803,6 +803,11 @@ describe("lolex", function () {
 
     describe('runAll', function() {
 
+        it('if there are no timers just return', function() {
+            this.clock = lolex.createClock();
+            this.clock.runAll();
+        });
+
         it('runs all timers', function() {
             this.clock = lolex.createClock();
             var spies = [sinon.spy(), sinon.spy()];