BREAKING CHANGE: awaitable queues (#1641)

* BREAKING CHANGE: awaitable queues

* fix priorityQueue tests

* fix tests in firefox

* make the upgrade a bit more user-friendly

* clarify docs

1 files changed, 20 insertions, 24 deletions

diff --git a/test/cargoQueue.js b/test/cargoQueue.js
index 517422c..46801c7 100644
--- a/test/cargoQueue.js
+++ b/test/cargoQueue.js
@@ -61,7 +61,7 @@ describe('cargoQueue', () => {
 
         expect(c.length()).to.equal(2);
 
-        c.drain = function () {
+        c.drain(() => {
             expect(call_order).to.eql([
                 'process 1 2', 'callback 1', 'callback 2',
                 'process 3', 'callback 3',
@@ -69,7 +69,7 @@ describe('cargoQueue', () => {
             ]);
             expect(c.length()).to.equal(0);
             done();
-        };
+        });
     });
 
     it('without callback', (done) => {
@@ -83,7 +83,7 @@ describe('cargoQueue', () => {
                 c.push(4);
                 setImmediate(() => {
                     c.push(5);
-                    c.drain = function complete () {
+                    c.drain(() => {
                         expect(call_order).to.eql([
                             'process 1',
                             'process 2',
@@ -91,7 +91,7 @@ describe('cargoQueue', () => {
                             'process 5'
                         ]);
                         done();
-                    }
+                    })
                 })
             })
         })
@@ -135,9 +135,9 @@ describe('cargoQueue', () => {
         }, 3, 2);
 
         var drainCounter = 0;
-        c.drain = function () {
+        c.drain(() => {
             drainCounter++;
-        };
+        });
 
         for(var i = 0; i < 10; i++){
             c.push(i);
@@ -162,7 +162,7 @@ describe('cargoQueue', () => {
         }
 
         var drainCounter = 0;
-        c.drain = function () {
+        c.drain(() => {
             drainCounter++;
 
             if (drainCounter === 1) {
@@ -171,7 +171,7 @@ describe('cargoQueue', () => {
                 expect(drainCounter).to.equal(2);
                 done();
             }
-        };
+        });
 
         loadCargo();
     });
@@ -184,15 +184,15 @@ describe('cargoQueue', () => {
             async.setImmediate(cb);
         }, 3, 1);
 
-        q.saturated = function() {
+        q.saturated(() => {
             assert(q.running() == 3, 'cargoQueue should be saturated now');
             calls.push('saturated');
-        };
-        q.empty = function() {
+        });
+        q.empty(() => {
             assert(q.length() === 0, 'cargoQueue should be empty now');
             calls.push('empty');
-        };
-        q.drain = function() {
+        });
+        q.drain(() => {
             assert(
                 q.length() === 0 && q.running() === 0,
                 'cargoQueue should be empty now and no more workers should be running'
@@ -216,7 +216,7 @@ describe('cargoQueue', () => {
                 'drain'
             ]);
             done();
-        };
+        });
         q.push('foo', () => {calls.push('foo cb');});
         q.push('bar', () => {calls.push('bar cb');});
         q.push('zoo', () => {calls.push('zoo cb');});
@@ -238,9 +238,7 @@ describe('cargoQueue', () => {
             setTimeout(cb, 25);
         }, 1, 1);
 
-        cargo.drain = function () {
-            done();
-        };
+        cargo.drain(done);
 
         expect(cargo.payload).to.equal(1);
 
@@ -264,9 +262,7 @@ describe('cargoQueue', () => {
             setTimeout(cb, 25);
         }, 1, 1);
 
-        cargo.drain = function () {
-            done();
-        };
+        cargo.drain(done);
 
         expect(cargo.concurrency).to.equal(1);
 
@@ -301,11 +297,11 @@ describe('cargoQueue', () => {
             });
         }, 1, 2);
 
-        cargo.drain = function() {
+        cargo.drain(() => {
             expect(cargo.workersList()).to.eql([]);
             expect(cargo.running()).to.equal(0);
             done();
-        };
+        });
 
         cargo.push('foo');
         cargo.push('bar');
@@ -321,10 +317,10 @@ describe('cargoQueue', () => {
             });
         }, 1, 1);
 
-        cargo.drain = function() {
+        cargo.drain(() => {
             expect(cargo.running()).to.equal(0);
             done();
-        };
+        });
 
         cargo.push(['foo', 'bar', 'baz', 'boo']);
     })