fix: properly timeout on worker termination (#395)

src/WorkerHandler.js

@@ -487,7 +487,7 @@ WorkerHandler.prototype.terminate = function (force, callback) {
 WorkerHandler.prototype.terminateAndNotify = function (force, timeout) {
   var resolver = Promise.defer();
   if (timeout) {
-    resolver.promise.timeout = timeout;
+    resolver.promise.timeout(timeout);
   }
   this.terminate(force, function(err, worker) {
     if (err) {

test/WorkerHandler.test.js

@@ -485,4 +485,32 @@ describe('WorkerHandler', function () {
       });
     });
   });
+
+  describe('terminateAndNotify', function () {
+
+    it('promise should be resolved on termination', function (done) {
+      var handler = new WorkerHandler(__dirname + '/workers/async.js');
+
+      handler.terminateAndNotify(true)
+      .then(function () {
+        done();
+      }).catch(function (err) {
+        assert('Promise should not be rejected');
+      });
+    });
+
+    it('promise should be rejected if notify timeout is smaller than worker timeout', function (done) {
+      var handler = new WorkerHandler(__dirname + '/workers/async.js', {
+        workerTerminateTimeout: 100
+      });
+
+      handler.terminateAndNotify(true, 50)
+      .then(function () {
+        assert('Promise should not be resolved');
+      }).catch(function (err) {
+        assert.ok(err instanceof Promise.TimeoutError);
+        done();
+      });
+    });
+  });
 });