Skip to content

Commit 151fff7

Browse files
committed
replace mocha and nyc with native node test runner and c8
1 parent 1fe49ae commit 151fff7

File tree

5 files changed

+37
-19
lines changed

5 files changed

+37
-19
lines changed

package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222
"url": "https://opencollective.com/express"
2323
},
2424
"devDependencies": {
25+
"c8": "^10.1.3",
2526
"eslint": "7.32.0",
26-
"eslint-plugin-markdown": "2.2.1",
27-
"mocha": "^11.7.0",
28-
"nyc": "^17.1.0"
27+
"eslint-plugin-markdown": "2.2.1"
2928
},
3029
"files": [
3130
"lib/",
@@ -39,9 +38,8 @@
3938
},
4039
"scripts": {
4140
"lint": "eslint .",
42-
"test": "mocha --reporter spec --check-leaks test/",
43-
"test:debug": "mocha --reporter spec --check-leaks --inspect --inspect-brk test/",
44-
"test-ci": "nyc --reporter=lcovonly --reporter=text npm test",
45-
"test-cov": "nyc --reporter=html --reporter=text npm test"
41+
"test": "node --test --test-reporter spec",
42+
"test-ci": "c8 --reporter=lcovonly --reporter=text npm test",
43+
"test-cov": "c8 --reporter=html --reporter=text npm test"
4644
}
4745
}

test/charset.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
1+
var nodeTest = require('node:test')
2+
var describe = nodeTest.describe
3+
var it = nodeTest.it
4+
var before = nodeTest.before
25
var assert = require('assert')
36
var Negotiator = require('..')
47

@@ -326,10 +329,12 @@ function whenAcceptCharset(acceptCharset, func) {
326329
: 'when Accept-Charset: ' + acceptCharset
327330

328331
describe(description, function () {
332+
var thisArg = {}
333+
329334
before(function () {
330-
this.negotiator = new Negotiator(createRequest({'Accept-Charset': acceptCharset}))
335+
thisArg.negotiator = new Negotiator(createRequest({'Accept-Charset': acceptCharset}))
331336
})
332337

333-
func()
338+
func.bind(thisArg)
334339
})
335340
}

test/encoding.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
1+
var nodeTest = require('node:test')
2+
var describe = nodeTest.describe
3+
var it = nodeTest.it
4+
var before = nodeTest.before
25
var assert = require('assert')
36
var Negotiator = require('..')
47

@@ -467,10 +470,12 @@ function whenAcceptEncoding(acceptEncoding, func) {
467470
: 'when Accept-Encoding: ' + acceptEncoding
468471

469472
describe(description, function () {
473+
var thisArg = {}
474+
470475
before(function () {
471-
this.negotiator = new Negotiator(createRequest({'Accept-Encoding': acceptEncoding}))
476+
thisArg.negotiator = new Negotiator(createRequest({'Accept-Encoding': acceptEncoding}))
472477
})
473478

474-
func()
479+
func.bind(thisArg)
475480
})
476481
}

test/language.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
1+
var nodeTest = require('node:test')
2+
var describe = nodeTest.describe
3+
var it = nodeTest.it
4+
var before = nodeTest.before
25
var assert = require('assert')
36
var Negotiator = require('..')
47

@@ -422,10 +425,12 @@ function whenAcceptLanguage(acceptLanguage, func) {
422425
: 'when Accept-Language: ' + acceptLanguage
423426

424427
describe(description, function () {
428+
var thisArg = {}
429+
425430
before(function () {
426-
this.negotiator = new Negotiator(createRequest({'Accept-Language': acceptLanguage}))
431+
thisArg.negotiator = new Negotiator(createRequest({'Accept-Language': acceptLanguage}))
427432
})
428433

429-
func()
434+
func.bind(thisArg)
430435
})
431436
}

test/mediaType.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
1+
var nodeTest = require('node:test')
2+
var describe = nodeTest.describe
3+
var it = nodeTest.it
4+
var before = nodeTest.before
25
var assert = require('assert')
36
var Negotiator = require('..')
47

@@ -490,10 +493,12 @@ function whenAccept(accept, func) {
490493
: 'when Accept: ' + accept
491494

492495
describe(description, function () {
496+
var thisArg = {}
497+
493498
before(function () {
494-
this.negotiator = Negotiator(createRequest({'Accept': accept}))
499+
thisArg.negotiator = Negotiator(createRequest({ 'Accept': accept }))
495500
})
496501

497-
func()
502+
func.bind(thisArg)
498503
})
499504
}

0 commit comments

Comments
 (0)