Skip to content

Commit e49f275

Browse files
authored
Chore/test runner (#772)
1 parent 7d1de11 commit e49f275

File tree

6 files changed

+55
-59
lines changed

6 files changed

+55
-59
lines changed

test/args.test.js

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict'
22

3-
const t = require('tap')
4-
const test = t.test
3+
const { test } = require('node:test')
54
const parseArgs = require('../args')
65

76
test('should parse args correctly', t => {
@@ -31,7 +30,7 @@ test('should parse args correctly', t => {
3130
]
3231
const parsedArgs = parseArgs(argv)
3332

34-
t.strictSame(parsedArgs, {
33+
t.assert.deepStrictEqual(parsedArgs, {
3534
_: ['app.js'],
3635
'--': [],
3736
prettyLogs: true,
@@ -88,7 +87,7 @@ test('should parse args with = assignment correctly', t => {
8887
]
8988
const parsedArgs = parseArgs(argv)
9089

91-
t.strictSame(parsedArgs, {
90+
t.assert.deepStrictEqual(parsedArgs, {
9291
_: ['app.js'],
9392
'--': [],
9493
prettyLogs: true,
@@ -141,7 +140,7 @@ test('should parse env vars correctly', t => {
141140
process.env.FASTIFY_DEBUG_HOST = '1.1.1.1'
142141
process.env.FASTIFY_LOGGING_MODULE = './custom-logger.js'
143142

144-
t.teardown(function () {
143+
t.after(() => {
145144
delete process.env.FASTIFY_PORT
146145
delete process.env.FASTIFY_ADDRESS
147146
delete process.env.FASTIFY_SOCKET
@@ -164,7 +163,7 @@ test('should parse env vars correctly', t => {
164163

165164
const parsedArgs = parseArgs([])
166165

167-
t.strictSame(parsedArgs, {
166+
t.assert.deepStrictEqual(parsedArgs, {
168167
_: [],
169168
'--': [],
170169
prettyLogs: true,
@@ -203,20 +202,20 @@ test('should respect default values', t => {
203202

204203
const parsedArgs = parseArgs(argv)
205204

206-
t.equal(parsedArgs._[0], 'app.js')
207-
t.equal(parsedArgs.options, false)
208-
t.equal(parsedArgs.prettyLogs, false)
209-
t.equal(parsedArgs.watch, false)
210-
t.equal(parsedArgs.ignoreWatch, 'node_modules build dist .git bower_components logs .swp .nyc_output')
211-
t.equal(parsedArgs.verboseWatch, false)
212-
t.equal(parsedArgs.logLevel, 'fatal')
213-
t.equal(parsedArgs.pluginTimeout, 10000)
214-
t.equal(parsedArgs.closeGraceDelay, 500)
215-
t.equal(parsedArgs.debug, false)
216-
t.equal(parsedArgs.debugPort, 9320)
217-
t.equal(parsedArgs.loggingModule, undefined)
218-
t.equal(parsedArgs.require, undefined)
219-
t.equal(parsedArgs.import, undefined)
205+
t.assert.equal(parsedArgs._[0], 'app.js')
206+
t.assert.equal(parsedArgs.options, false)
207+
t.assert.equal(parsedArgs.prettyLogs, false)
208+
t.assert.equal(parsedArgs.watch, false)
209+
t.assert.equal(parsedArgs.ignoreWatch, 'node_modules build dist .git bower_components logs .swp .nyc_output')
210+
t.assert.equal(parsedArgs.verboseWatch, false)
211+
t.assert.equal(parsedArgs.logLevel, 'fatal')
212+
t.assert.equal(parsedArgs.pluginTimeout, 10000)
213+
t.assert.equal(parsedArgs.closeGraceDelay, 500)
214+
t.assert.equal(parsedArgs.debug, false)
215+
t.assert.equal(parsedArgs.debugPort, 9320)
216+
t.assert.equal(parsedArgs.loggingModule, undefined)
217+
t.assert.equal(parsedArgs.require, undefined)
218+
t.assert.equal(parsedArgs.import, undefined)
220219
})
221220

222221
test('should parse custom plugin options', t => {
@@ -249,7 +248,7 @@ test('should parse custom plugin options', t => {
249248
]
250249
const parsedArgs = parseArgs(argv)
251250

252-
t.strictSame(parsedArgs, {
251+
t.assert.deepStrictEqual(parsedArgs, {
253252
_: ['app.js'],
254253
'--': [
255254
'-abc',
@@ -297,7 +296,7 @@ test('should parse config file correctly and prefer config values over default o
297296
]
298297
const parsedArgs = parseArgs(argv)
299298

300-
t.strictSame(parsedArgs, {
299+
t.assert.deepStrictEqual(parsedArgs, {
301300
_: ['app.js'],
302301
'--': [],
303302
port: 5000,
@@ -340,7 +339,7 @@ test('should prefer command line args over config file options', t => {
340339
]
341340
const parsedArgs = parseArgs(argv)
342341

343-
t.strictSame(parsedArgs, {
342+
t.assert.deepStrictEqual(parsedArgs, {
344343
_: ['app.js'],
345344
'--': [],
346345
port: 4000,

test/cli.test.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
'use strict'
22

3-
const t = require('tap')
3+
const { test } = require('node:test')
44
const { execSync } = require('node:child_process')
55
const { mkdirSync, readFileSync } = require('node:fs')
66
const path = require('node:path')
77
const rimraf = require('rimraf')
88

9-
t.test('generate', async (t) => {
9+
test('generate', async () => {
1010
const workdir = path.join(__dirname, 'workdir')
1111
const target = path.join(workdir, 'cli.test')
1212

@@ -16,22 +16,22 @@ t.test('generate', async (t) => {
1616
execSync(`node cli.js generate ${target}`)
1717
})
1818

19-
t.test('help', async t => {
20-
t.equal(
19+
test('help', async t => {
20+
t.assert.equal(
2121
execSync('node cli.js', { encoding: 'utf-8' }),
2222
readFileSync(path.join(__dirname, '../help/help.txt'), 'utf-8')
2323
)
2424
})
2525

26-
t.test('--help', async t => {
27-
t.equal(
26+
test('--help', async t => {
27+
t.assert.equal(
2828
execSync('node cli.js --help', { encoding: 'utf-8' }),
2929
readFileSync(path.join(__dirname, '../help/help.txt'), 'utf-8')
3030
)
3131
})
3232

33-
t.test('generate --help', async t => {
34-
t.equal(
33+
test('generate --help', async t => {
34+
t.assert.equal(
3535
execSync('node cli.js generate --help', { encoding: 'utf-8' }),
3636
readFileSync(path.join(__dirname, '../help/generate.txt'), 'utf-8')
3737
)

test/generate-readme.test.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22

33
const path = require('node:path')
44
const fs = require('node:fs')
5-
const t = require('tap')
5+
const { test } = require('node:test')
66
const rimraf = require('rimraf')
77
const { generate } = require('../generate-readme')
88

99
const plugindir = path.join(__dirname, 'plugindir')
1010
const plugin = require(plugindir)
11-
const { test } = t
1211

1312
test('should create readme', async (t) => {
1413
t.plan(1)
@@ -18,9 +17,9 @@ test('should create readme', async (t) => {
1817
try {
1918
await generate(plugindir, { pluginMeta, encapsulated, pluginFileName })
2019
const readme = path.join(plugindir, 'README.md')
21-
t.ok(fs.existsSync(readme))
22-
rimraf(readme, () => t.end())
20+
t.assert.ok(fs.existsSync(readme))
21+
rimraf.sync(readme)
2322
} catch (err) {
24-
t.error(err)
23+
t.assert.ifError(err)
2524
}
2625
})

test/generate-swagger.test.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
'use strict'
22

33
const path = require('node:path')
4-
const t = require('tap')
5-
const { test } = t
4+
const { test } = require('node:test')
65
const { generateSwagger } = require('../generate-swagger')
76

87
const swaggerplugindir = path.join(__dirname, 'swaggerplugindir')
@@ -13,9 +12,9 @@ test('should generate swagger', async (t) => {
1312

1413
try {
1514
const swagger = JSON.parse(await generateSwagger([swaggerplugin]))
16-
t.equal(swagger.openapi, '3.0.3')
15+
t.assert.equal(swagger.openapi, '3.0.3')
1716
} catch (err) {
18-
t.error(err)
17+
t.assert.ifError(err)
1918
}
2019
})
2120

@@ -24,8 +23,8 @@ test('should generate swagger in yaml format', async (t) => {
2423

2524
try {
2625
const swagger = await generateSwagger(['--yaml=true', swaggerplugin])
27-
t.ok(swagger.startsWith('openapi: 3.0.3'))
26+
t.assert.ok(swagger.startsWith('openapi: 3.0.3'))
2827
} catch (err) {
29-
t.error(err)
28+
t.assert.ifError(err)
3029
}
3130
})

test/templates/app-ts.test.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { fastify } from 'fastify'
2-
import { test } from 'tap'
1+
import { fastify } from 'fastify';
2+
import { test, TestContext } from 'node:test';
33
const sgetOriginal = require('simple-get').concat
44

5-
import appDefault, { app } from '../../templates/app-ts/src/app'
6-
import {AddressInfo} from "net";
5+
import { AddressInfo } from "net";
6+
import appDefault, { app } from '../../templates/app-ts/src/app';
77

88
const sget = (opts: Record<string, any>): Record<string, any> => {
99
return new Promise((resolve, reject) => {
@@ -14,7 +14,7 @@ const sget = (opts: Record<string, any>): Record<string, any> => {
1414
})
1515
}
1616

17-
test('should print routes for TS app', async t => {
17+
test('should print routes for TS app', async (t: TestContext) => {
1818
t.plan(4)
1919

2020
const fastifyApp = fastify({}, );
@@ -26,15 +26,15 @@ test('should print routes for TS app', async t => {
2626
method: 'GET',
2727
url: `http://localhost:${(fastifyApp.server.address() as AddressInfo).port}`
2828
})
29-
t.equal(response.statusCode, 200)
30-
t.equal(response.headers['content-length'], '' + body.length)
31-
t.same(JSON.parse(body), { root: true })
29+
t.assert.equal(response.statusCode, 200)
30+
t.assert.equal(response.headers['content-length'], '' + body.length)
31+
t.assert.deepStrictEqual(JSON.parse(body), { root: true })
3232

3333
await fastifyApp.close();
34-
t.pass('server closed')
34+
t.assert.ok('server closed')
3535
})
3636

37-
test('should print routes for default TS app', async t => {
37+
test('should print routes for default TS app', async (t: TestContext) => {
3838
t.plan(4)
3939

4040
const fastifyApp = fastify({}, );
@@ -46,10 +46,10 @@ test('should print routes for default TS app', async t => {
4646
method: 'GET',
4747
url: `http://localhost:${(fastifyApp.server.address() as AddressInfo).port}`
4848
})
49-
t.equal(response.statusCode, 200)
50-
t.equal(response.headers['content-length'], '' + body.length)
51-
t.same(JSON.parse(body), { root: true })
49+
t.assert.equal(response.statusCode, 200)
50+
t.assert.equal(response.headers['content-length'], '' + body.length)
51+
t.assert.deepStrictEqual(JSON.parse(body), { root: true })
5252

5353
await fastifyApp.close();
54-
t.pass('server closed')
54+
t.assert.ok('server closed')
5555
})

test/watch.test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22

33
const { arrayToRegExp } = require('../lib/watch/utils')
44

5-
const t = require('tap')
6-
const test = t.test
5+
const { test } = require('node:test')
76

87
test('should equal expect RegExp', t => {
98
t.plan(1)
109

1110
const expectRegExp = /(node_modules|build|dist|\.git|bower_components|logs)/
1211
const regExp = arrayToRegExp(['node_modules', 'build', 'dist', '.git', 'bower_components', 'logs'])
1312

14-
t.same(regExp, expectRegExp)
13+
t.assert.deepStrictEqual(regExp, expectRegExp)
1514
})

0 commit comments

Comments
 (0)