Skip to content

Commit 293f613

Browse files
andrewshellandrewshell
committed
refactor: migrate tests from expect.js to Node's built-in assert
1 parent 7646486 commit 293f613

File tree

6 files changed

+140
-149
lines changed

6 files changed

+140
-149
lines changed

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"@commitlint/cli": "^20.2.0",
5151
"@commitlint/config-conventional": "^20.2.0",
5252
"@types/node": "^25.0.0",
53-
"expect.js": "^0.3.1",
5453
"husky": "^9.1.7",
5554
"mocha": "^11.7.5",
5655
"mockdate": "^3.0.5",

‎pnpm-lock.yaml‎

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/filesystem.cjs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const expect = require('expect.js');
1+
const assert = require('assert');
22
const mockdate = require('mockdate');
33

44
const fs = require('fs');
@@ -27,7 +27,7 @@ describe('filesystem', function() {
2727
});
2828

2929
it('should export as a function', function() {
30-
expect(cache.go).to.be.a('function');
30+
assert.strictEqual(typeof cache.go, 'function');
3131
});
3232

3333
describe('when status=onlyFresh', async function () {
@@ -42,7 +42,7 @@ describe('filesystem', function() {
4242
helpers.expectCacheHit(c, false, 'live');
4343
helpers.expectCacheNoErrors(c);
4444

45-
expect(await cache.store.isset('-internal/cache')).to.be(true);
45+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
4646
const d = await cache.store.get('-internal/cache');
4747

4848
helpers.expectDataHit(d, 'live', c.etag);
@@ -59,10 +59,10 @@ describe('filesystem', function() {
5959
helpers.expectCacheMiss(c, false, null);
6060
helpers.expectCacheErrors(c, 'Error: cache error', e);
6161

62-
expect(await cache.store.isset('-internal/cache')).to.be(true);
62+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
6363
d = await cache.store.get('-internal/cache');
6464

65-
helpers.expectDataMiss(d, null);
65+
helpers.expectDataMiss(d, null, null);
6666
helpers.expectDataErrors(d, 'Error: cache error', e);
6767
}
6868
});
@@ -87,7 +87,7 @@ describe('filesystem', function() {
8787
helpers.expectCacheHit(c, false, 'live');
8888
helpers.expectCacheNoErrors(c);
8989

90-
expect(await cache.store.isset('-internal/cache')).to.be(true);
90+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
9191
const d = await cache.store.get('-internal/cache');
9292

9393
helpers.expectDataHit(d, 'live', c.etag);
@@ -112,10 +112,10 @@ describe('filesystem', function() {
112112
helpers.expectCacheMiss(c, false, null);
113113
helpers.expectCacheErrors(c, 'Error: cache error', e);
114114

115-
expect(await cache.store.isset('-internal/cache')).to.be(true);
115+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
116116
d = await cache.store.get('-internal/cache');
117117

118-
helpers.expectDataMiss(d, null);
118+
helpers.expectDataMiss(d, null, null);
119119
helpers.expectDataErrors(d, 'Error: cache error', e);
120120
}
121121
});
@@ -136,7 +136,7 @@ describe('filesystem', function() {
136136
helpers.expectCacheHit(c, false, 'live');
137137
helpers.expectCacheNoErrors(c);
138138

139-
expect(await cache.store.isset('-internal/cache')).to.be(true);
139+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
140140
const d = await cache.store.get('-internal/cache');
141141

142142
helpers.expectDataHit(d, 'live', c.etag);
@@ -153,7 +153,7 @@ describe('filesystem', function() {
153153
helpers.expectCacheMiss(c, false, null);
154154
helpers.expectCacheErrors(c, 'Error: cache error', e);
155155

156-
expect(await cache.store.isset('-internal/cache')).to.be(true);
156+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
157157
d = await cache.store.get('-internal/cache');
158158

159159
helpers.expectDataMiss(d, null, c.etag);
@@ -181,7 +181,7 @@ describe('filesystem', function() {
181181
helpers.expectCacheHit(c, false, 'live');
182182
helpers.expectCacheNoErrors(c);
183183

184-
expect(await cache.store.isset('-internal/cache')).to.be(true);
184+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
185185
const d = await cache.store.get('-internal/cache');
186186

187187
helpers.expectDataHit(d, 'live', c.etag);
@@ -206,7 +206,7 @@ describe('filesystem', function() {
206206
helpers.expectCacheHit(c, true, 'cached');
207207
helpers.expectCacheErrors(c, 'Error: cache error', e);
208208

209-
expect(await cache.store.isset('-internal/cache')).to.be(true);
209+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
210210
d = await cache.store.get('-internal/cache');
211211

212212
helpers.expectDataHit(d, 'cached', c.etag);
@@ -230,7 +230,7 @@ describe('filesystem', function() {
230230
helpers.expectCacheHit(c, false, 'live');
231231
helpers.expectCacheNoErrors(c);
232232

233-
expect(await cache.store.isset('-internal/cache')).to.be(true);
233+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
234234
const d = await cache.store.get('-internal/cache');
235235

236236
helpers.expectDataHit(d, 'live', c.etag);
@@ -247,7 +247,7 @@ describe('filesystem', function() {
247247
helpers.expectCacheMiss(c, false, null);
248248
helpers.expectCacheErrors(c, 'Error: cache error', e);
249249

250-
expect(await cache.store.isset('-internal/cache')).to.be(true);
250+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
251251
d = await cache.store.get('-internal/cache');
252252

253253
helpers.expectDataMiss(d, null, c.etag);
@@ -275,7 +275,7 @@ describe('filesystem', function() {
275275
helpers.expectCacheHit(c, true, 'cached');
276276
helpers.expectCacheNoErrors(c);
277277

278-
expect(await cache.store.isset('-internal/cache')).to.be(true);
278+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
279279
const d = await cache.store.get('-internal/cache');
280280

281281
helpers.expectDataHit(d, 'cached', c.etag);
@@ -300,7 +300,7 @@ describe('filesystem', function() {
300300
helpers.expectCacheHit(c, true, 'cached');
301301
helpers.expectCacheNoErrors(c);
302302

303-
expect(await cache.store.isset('-internal/cache')).to.be(true);
303+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
304304
d = await cache.store.get('-internal/cache');
305305

306306
helpers.expectDataHit(d, 'cached', c.etag);
@@ -324,7 +324,7 @@ describe('filesystem', function() {
324324
helpers.expectCacheMiss(c, false, null);
325325
helpers.expectCacheErrors(c, 'Error: Missing cache', 1);
326326

327-
expect(await cache.store.isset('-internal/cache')).to.be(true);
327+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
328328
const d = await cache.store.get('-internal/cache');
329329

330330
helpers.expectDataMiss(d, null, null);
@@ -341,7 +341,7 @@ describe('filesystem', function() {
341341
helpers.expectCacheMiss(c, false, null);
342342
helpers.expectCacheErrors(c, 'Error: Missing cache', e);
343343

344-
expect(await cache.store.isset('-internal/cache')).to.be(true);
344+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
345345
d = await cache.store.get('-internal/cache');
346346

347347
helpers.expectDataMiss(d, null, null);
@@ -369,7 +369,7 @@ describe('filesystem', function() {
369369
helpers.expectCacheHit(c, true, 'cached');
370370
helpers.expectCacheNoErrors(c);
371371

372-
expect(await cache.store.isset('-internal/cache')).to.be(true);
372+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
373373
const d = await cache.store.get('-internal/cache');
374374

375375
helpers.expectDataHit(d, 'cached', c.etag);
@@ -392,7 +392,7 @@ describe('filesystem', function() {
392392
helpers.expectCacheHit(c, true, 'cached');
393393
helpers.expectCacheNoErrors(c);
394394

395-
expect(await cache.store.isset('-internal/cache')).to.be(true);
395+
assert.strictEqual(await cache.store.isset('-internal/cache'), true);
396396
const d = await cache.store.get('-internal/cache');
397397

398398
helpers.expectDataHit(d, 'cached', c.etag);

‎test/helpers.cjs‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
1-
const expect = require('expect.js');
1+
const assert = require('assert');
22
const mockdate = require('mockdate');
33

44
const { Cacheism } = require('../dist/index.cjs');
55

66
function expectCacheHit(c, cached, data) {
7-
expect(c).to.be.a(Cacheism.Hit);
8-
expect(c).to.have.property('version', 3);
9-
expect(c).to.have.property('cacheName', '-internal/cache');
10-
expect(c).to.have.property('cached', cached);
11-
expect(c).to.have.property('created');
12-
expect(c.created).to.be.a(Date);
13-
expect(c).to.have.property('data', data);
14-
expect(c).to.have.property('etag');
7+
assert.ok(c instanceof Cacheism.Hit);
8+
assert.strictEqual(c.version, 3);
9+
assert.strictEqual(c.cacheName, '-internal/cache');
10+
assert.strictEqual(c.cached, cached);
11+
assert.ok('created' in c);
12+
assert.ok(c.created instanceof Date);
13+
assert.strictEqual(c.data, data);
14+
assert.ok('etag' in c);
1515
}
1616

1717
function expectCacheMiss(c, cached, data) {
18-
expect(c).to.be.a(Cacheism.Miss);
19-
expect(c).to.have.property('version', 3);
20-
expect(c).to.have.property('cacheName', '-internal/cache');
21-
expect(c).to.have.property('cached', cached);
22-
expect(c).to.have.property('created');
23-
expect(c.created).to.be.a(Date);
24-
expect(c).to.have.property('data', data);
25-
expect(c).to.have.property('etag', null);
18+
assert.ok(c instanceof Cacheism.Miss);
19+
assert.strictEqual(c.version, 3);
20+
assert.strictEqual(c.cacheName, '-internal/cache');
21+
assert.strictEqual(c.cached, cached);
22+
assert.ok('created' in c);
23+
assert.ok(c.created instanceof Date);
24+
assert.strictEqual(c.data, data);
25+
assert.strictEqual(c.etag, null);
2626
}
2727

2828
function expectCacheNoErrors(c) {
29-
expect(c).to.have.property('error', null);
30-
expect(c).to.have.property('errorTime', null);
31-
expect(c).to.have.property('consecutiveErrors', 0);
29+
assert.strictEqual(c.error, null);
30+
assert.strictEqual(c.errorTime, null);
31+
assert.strictEqual(c.consecutiveErrors, 0);
3232
}
3333

3434
function expectCacheErrors(c, error, errors) {
35-
expect(c).to.have.property('error', error);
36-
expect(c).to.have.property('errorTime');
37-
expect(c.errorTime).to.be.a(Date);
38-
expect(c).to.have.property('consecutiveErrors', errors);
35+
assert.strictEqual(c.error, error);
36+
assert.ok('errorTime' in c);
37+
assert.ok(c.errorTime instanceof Date);
38+
assert.strictEqual(c.consecutiveErrors, errors);
3939
}
4040

4141
function expectDataHit(d, data, etag) {
42-
expect(d).to.be.a(Cacheism.Data);
43-
expect(d).to.have.property('version', 3);
44-
expect(d).to.have.property('type', Cacheism.Type.hit);
45-
expect(d).to.have.property('created');
46-
expect(d.created).to.be.a(Date);
47-
expect(d).to.have.property('data', data);
48-
expect(d).to.have.property('etag', etag);
42+
assert.ok(d instanceof Cacheism.Data);
43+
assert.strictEqual(d.version, 3);
44+
assert.strictEqual(d.type, Cacheism.Type.hit);
45+
assert.ok('created' in d);
46+
assert.ok(d.created instanceof Date);
47+
assert.strictEqual(d.data, data);
48+
assert.strictEqual(d.etag, etag);
4949
}
5050

5151
function expectDataMiss(d, data, etag) {
52-
expect(d).to.be.a(Cacheism.Data);
53-
expect(d).to.have.property('version', 3);
54-
expect(d).to.have.property('type', Cacheism.Type.miss);
55-
expect(d).to.have.property('created');
56-
expect(d.created).to.be.a(Date);
57-
expect(d).to.have.property('data', data);
58-
expect(d).to.have.property('etag', etag);
52+
assert.ok(d instanceof Cacheism.Data);
53+
assert.strictEqual(d.version, 3);
54+
assert.strictEqual(d.type, Cacheism.Type.miss);
55+
assert.ok('created' in d);
56+
assert.ok(d.created instanceof Date);
57+
assert.strictEqual(d.data, data);
58+
assert.strictEqual(d.etag, etag);
5959
}
6060

6161
function expectDataNoErrors(d) {
62-
expect(d).to.have.property('error', null);
63-
expect(d).to.have.property('errorTime', null);
64-
expect(d).to.have.property('consecutiveErrors', 0);
62+
assert.strictEqual(d.error, null);
63+
assert.strictEqual(d.errorTime, null);
64+
assert.strictEqual(d.consecutiveErrors, 0);
6565
}
6666

6767

6868
function expectDataErrors(d, error, errors) {
69-
expect(d).to.have.property('error', error);
70-
expect(d).to.have.property('errorTime');
71-
expect(d.errorTime).to.be.a(Date);
72-
expect(d).to.have.property('consecutiveErrors', errors);
69+
assert.strictEqual(d.error, error);
70+
assert.ok('errorTime' in d);
71+
assert.ok(d.errorTime instanceof Date);
72+
assert.strictEqual(d.consecutiveErrors, errors);
7373
}
7474

7575
module.exports = {

0 commit comments

Comments
 (0)