Make testing more robust

Author: sderrow

.github/workflows/ci.yaml

@@ -12,7 +12,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  test:
+    name: Test all
     runs-on: ubuntu-latest
 
     steps:
@@ -24,8 +25,8 @@ jobs:
         with:
           node-version-file: ".nvmrc"
 
-      - name: Redis Server in GitHub Actions
-        uses: supercharge/redis-github-action@1.8.0
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Use yarn cache
         uses: actions/cache@v4.2.3
@@ -35,11 +36,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-
 
-      - name: Enable corepack
-        run: corepack enable
-
       - name: Install dependencies
         run: yarn
 
+      - name: Run linter
+        run: yarn lint
+
+      - name: Check types
+        run: yarn check-types
+
+      - name: Redis Server in GitHub Actions
+        uses: supercharge/redis-github-action@1.8.0
+
       - name: Run tests
         run: yarn test-all

package.json

@@ -8,6 +8,7 @@
     "test": "mocha test",
     "test-all": "./scripts/test_all.sh",
     "check-types": "tsc --noEmit --strict --lib es2023,dom,dom.iterable test.ts",
+    "lint": "eslint . --max-warnings 0",
     "build": "./scripts/build.sh"
   },
   "repository": "github:sderrow/bottleneck",

test/DLList.js

@@ -1,5 +1,4 @@
 var DLList = require("../src/DLList");
-var assert = require("assert");
 var c = require("./context")({ datastore: "local" });
 const { describe, it } = require("mocha");
 
@@ -54,11 +53,11 @@ describe("DLList", function () {
     var queues = new fakeQueues();
     var list = new DLList(...queues.fns);
     c.mustEqual(list.length, 0);
-    assert(list.shift() === undefined);
+    c.mustEqual(list.shift(), undefined);
     var arr = list.getArray();
     c.mustEqual(arr.length, 0);
     c.mustEqual(list.length, 0);
-    assert(list.shift() === undefined);
+    c.mustEqual(list.shift(), undefined);
     arr = list.getArray();
     c.mustEqual(arr.length, 0);
     c.mustEqual(list.length, 0);
@@ -121,8 +120,8 @@ describe("DLList", function () {
   it("Should return the first value without shifting", function () {
     var queues = new fakeQueues();
     var list = new DLList(...queues.fns);
-    assert(list.first() === undefined);
-    assert(list.first() === undefined);
+    c.mustEqual(list.first(), undefined);
+    c.mustEqual(list.first(), undefined);
 
     list.push(1);
     c.mustEqual(list.first(), 1);
@@ -137,11 +136,11 @@ describe("DLList", function () {
     c.mustEqual(list.first(), 2);
 
     c.mustEqual(list.shift(), 2);
-    assert(list.first() === undefined);
-    assert(list.first() === undefined);
+    c.mustEqual(list.first(), undefined);
+    c.mustEqual(list.first(), undefined);
 
-    assert(list.first() === undefined);
-    assert(list.shift() === undefined);
-    assert(list.first() === undefined);
+    c.mustEqual(list.first(), undefined);
+    c.mustEqual(list.shift(), undefined);
+    c.mustEqual(list.first(), undefined);
   });
 });

test/batcher.js

@@ -18,8 +18,8 @@ describe("Batcher", function () {
     var t0 = Date.now();
     var batches = [];
 
-    batcher.on("batch", function (batcher) {
-      batches.push(batcher);
+    batcher.on("batch", function (groups) {
+      batches.push(groups);
     });
 
     return Promise.all([
@@ -60,8 +60,8 @@ describe("Batcher", function () {
     var t0 = Date.now();
     var batches = [];
 
-    batcher.on("batch", function (batcher) {
-      batches.push(batcher);
+    batcher.on("batch", function (groups) {
+      batches.push(groups);
     });
 
     return Promise.all([
@@ -109,8 +109,8 @@ describe("Batcher", function () {
     });
     var batches = [];
 
-    batcher.on("batch", function (batcher) {
-      batches.push(batcher);
+    batcher.on("batch", function (groups) {
+      batches.push(groups);
     });
 
     return Promise.all([
@@ -133,63 +133,55 @@ describe("Batcher", function () {
       });
   });
 
-  it("Should stagger flushes", function () {
+  it("Should stagger flushes", async function () {
     c = makeTest();
-    var batcher = new Bottleneck.Batcher({
+    const batcher = new Bottleneck.Batcher({
       maxTime: 50,
       maxSize: 3,
     });
-    var t0 = Date.now();
-    var batches = [];
+    const t0 = Date.now();
+    const batches = [];
 
-    batcher.on("batch", function (batcher) {
-      batches.push(batcher);
+    batcher.on("batch", function (groups) {
+      batches.push(groups);
     });
 
-    return Promise.all([
-      batcher.add(1).then((_x) => c.limiter.schedule(c.promise, null, Date.now() - t0, 1)),
-      batcher.add(2).then((_x) => c.limiter.schedule(c.promise, null, Date.now() - t0, 2)),
-    ])
-      .then(function (data) {
-        c.mustEqual(
-          data.map(([t, x]) => [Math.floor(t / 50), x]),
-          [
-            [1, 1],
-            [1, 2],
-          ],
-        );
+    const [first, second] = await Promise.all([
+      batcher.add(1).then(() => c.limiter.schedule(c.promise, null, Date.now() - t0, 1)),
+      batcher.add(2).then(() => c.limiter.schedule(c.promise, null, Date.now() - t0, 2)),
+    ]);
 
-        var promises = [];
-        promises.push(
-          batcher.add(3).then((_x) => c.limiter.schedule(c.promise, null, Date.now() - t0, 3)),
-        );
+    c.mustGte(first[0], 50);
+    c.mustEqual(first[1], 1);
 
-        return c.wait(10).then(function () {
-          promises.push(
-            batcher.add(4).then((_x) => c.limiter.schedule(c.promise, null, Date.now() - t0, 4)),
-          );
+    c.mustGte(second[0], 50);
+    c.mustEqual(second[1], 2);
 
-          return Promise.all(promises);
-        });
-      })
-      .then(function (data) {
-        c.mustEqual(
-          data.map(([t, x]) => [Math.floor(t / 50), x]),
-          [
-            [2, 3],
-            [2, 4],
-          ],
-        );
+    const promises = [
+      batcher.add(3).then(() => c.limiter.schedule(c.promise, null, Date.now() - t0, 3)),
+    ];
 
-        return c.last();
-      })
-      .then(function (_results) {
-        c.checkDuration(120, 20);
-        c.mustEqual(batches, [
-          [1, 2],
-          [3, 4],
-        ]);
-      });
+    await c.wait(10);
+
+    promises.push(
+      batcher.add(4).then(() => c.limiter.schedule(c.promise, null, Date.now() - t0, 4)),
+    );
+
+    const [third, fourth] = await Promise.all(promises);
+
+    c.mustGte(third[0], 100);
+    c.mustEqual(third[1], 3);
+
+    c.mustGte(fourth[0], 100);
+    c.mustEqual(fourth[1], 4);
+
+    await c.last();
+
+    c.checkDuration(120, 20);
+    c.mustEqual(batches, [
+      [1, 2],
+      [3, 4],
+    ]);
   });
 
   it("Should force then stagger flushes", function () {
@@ -201,8 +193,8 @@ describe("Batcher", function () {
     var t0 = Date.now();
     var batches = [];
 
-    batcher.on("batch", function (batcher) {
-      batches.push(batcher);
+    batcher.on("batch", function (groups) {
+      batches.push(groups);
     });
 
     var promises = [];