refactor(pkg): Update devDependencies, more reliable tests

Some of the tests were relying on lag or holdover from previous
tests and only happened to pass incidentally. This commit
fixes some of that behavior.

Author: STRML

.npmignore

@@ -0,0 +1,3 @@
+yarn.lock
+examples/
+tests.js

package.json

@@ -5,9 +5,9 @@
   "version": "0.5.1",
   "dependencies": {},
   "devDependencies": {
-    "mocha": "1.7.0",
+    "mocha": "^3.5.0",
     "pre-commit": "^1.0.5",
-    "should": "1.2.1"
+    "should": "^12.0.0"
   },
   "maintainers": [
     "Samuel Reed <sam@tixelated.com>"

tests.js

@@ -12,11 +12,11 @@ function tightWork(duration) {
 /*global describe, it, beforeEach, afterEach */
 describe('the library', function() {
   it('should export a couple functions', function() {
-    (toobusy).should.be.a('function');
-    (toobusy.maxLag).should.be.a('function');
-    (toobusy.shutdown).should.be.a('function');
-    (toobusy.interval).should.be.a('function');
-    (toobusy.shutdown).should.be.a('function');
+    should(toobusy).be.Function();
+    (toobusy.maxLag).should.be.Function();
+    (toobusy.shutdown).should.be.Function();
+    (toobusy.interval).should.be.Function();
+    (toobusy.shutdown).should.be.Function();
     (toobusy).should.not.have.property('start');
   });
   it('should start automatically', function() {
@@ -61,9 +61,9 @@ describe('toobusy()', function() {
   // is nice for making these tests independent of each other.
   beforeEach(function() {
     toobusy.maxLag(10);
-    toobusy.interval(250);
+    toobusy.interval(50);
   });
-  afterEach(function() {
+  after(function() {
     toobusy.maxLag(70);
     toobusy.interval(500);
   });
@@ -94,75 +94,73 @@ describe('toobusy()', function() {
     it('should not emit lag events if the lag is less than the configured threshold',
         testLagEvent(100, 50, false));
     it('should emit lag events if the lag is greater than the configured threshold',
-        testLagEvent(50, 100, true));
+        testLagEvent(50, 150, true));
     it('should emit lag events if lag occurs and no threshold is specified',
         testLagEvent(undefined, 500, true));
 
     function testLagEvent(threshold, work, expectFire) {
       return function (done) {
         var calledDone = false;
+        var finish = function() {
+          if (calledDone) return;
+          calledDone = true;
+          toobusy.shutdown(); // stops onLag() from firing again
+          clearTimeout(workTimeout);
+          done.apply(null, arguments);
+        };
 
         toobusy.onLag(function (lag) {
-          if (calledDone) {
-            return;
-          }
-
           if (!expectFire) {
-            calledDone = true;
-            done(new Error('lag event fired unexpectedly'));
-            return;
+            return finish(new Error('lag event fired unexpectedly'));
           }
 
           should.exist(lag);
           lag.should.be.above(threshold || 0);
-
-          calledDone = true;
-          done();
+          finish();
         }, threshold);
 
         if (!expectFire) {
           setTimeout(function () {
-            if (!calledDone) {
-              calledDone = true;
-              done();
-            }
+            finish();
           }, work + threshold);
         }
 
-        tightWork(work);
+        // Do work 3x to work around smoothing factor
+        var count = 0;
+        var workTimeout = setTimeout(function working() {
+          tightWork(work);
+          if (++count < 3) workTimeout = setTimeout(working);
+        })
       }
     }
   });
 });
 
 describe('smoothingFactor', function() {
-  //Sometimes the default 2s timeout is hit on this suite, raise to 10s.
+  // Sometimes the default 2s timeout is hit on this suite, raise to 10s.
   this.timeout(10 * 1000);
 
   beforeEach(function() {
     toobusy.maxLag(10);
     toobusy.interval(250);
   });
-  afterEach(function() {
+  after(function() {
     toobusy.maxLag(70);
     toobusy.interval(500);
   });
-  it('should default to 1/3', function(done) {
+  it('should default to 1/3', function() {
     (toobusy.smoothingFactor()).should.equal(1/3);
-    done();
   });
-  it('should throw an exception for invalid values', function(done) {
+  it('should throw an exception for invalid values', function() {
     (function() { toobusy.smoothingFactor(0); }).should.throw;
     (function() { toobusy.smoothingFactor(2); }).should.throw;
     (function() { toobusy.smoothingFactor(-1); }).should.throw;
     (function() { toobusy.smoothingFactor(1); }).should.not.throw;
-    done();
   });
-  it('should be configurable', function(done) {
+  it('should be configurable', function() {
     (toobusy.smoothingFactor(0.9)).should.equal(0.9);
     (toobusy.smoothingFactor(0.1)).should.equal(0.1);
     (toobusy.smoothingFactor()).should.equal(0.1);
-    done();
   });
   it('should allow no dampening', function(done) {
     var cycles_to_toobusy = 0;

toobusy.js

@@ -54,7 +54,7 @@ toobusy.interval = function(newInterval) {
   newInterval = Math.round(newInterval);
   if(newInterval < 16) throw new Error("Interval should be greater than 16ms.");
 
-  toobusy.shutdown();
+  currentLag = 0;
   interval = newInterval;
   start();
   return interval;
@@ -123,7 +123,7 @@ toobusy.shutdown = function(){
 };
 
 toobusy.started = function() {
-  return Boolean(checkInterval);
+  return Boolean(checkInterval != null);
 };
 
 /**
@@ -149,6 +149,7 @@ toobusy.onLag = function (fn, threshold) {
 function start() {
   lastTime = Date.now();
 
+  clearInterval(checkInterval);
   checkInterval = setInterval(function(){
     var now = Date.now();
     var lag = now - lastTime;