Skip to content

Commit 9de19c6

Browse files
committed
test: fix flaky tests
1 parent 56935db commit 9de19c6

File tree

2 files changed

+15
-27
lines changed

2 files changed

+15
-27
lines changed

src/dev_server.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,9 @@ export class DevServer {
295295
/**
296296
* Handles TypeScript source file change
297297
*/
298-
#handleSourceFileChange(action: string, port: string, relativePath: string) {
299-
void this.#hooks.onSourceFileChanged({ colors: ui.colors, logger: this.#logger }, relativePath)
298+
async #handleSourceFileChange(action: string, port: string, relativePath: string) {
299+
console.log({ relativePath })
300+
await this.#hooks.onSourceFileChanged({ colors: ui.colors, logger: this.#logger }, relativePath)
300301

301302
this.#clearScreen()
302303
this.#logger.log(`${this.#colors.green(action)} ${relativePath}`)

tests/dev_server.spec.ts

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ import { setTimeout as sleep } from 'node:timers/promises'
1515
import { DevServer } from '../index.js'
1616

1717
test.group('DevServer', () => {
18-
test('start() execute onDevServerStarted hook', async ({ assert, fs, cleanup }) => {
19-
assert.plan(1)
20-
18+
test('start() execute onDevServerStarted hook', async ({ fs, cleanup }, done) => {
2119
await fs.create('bin/server.js', `process.send({ isAdonisJS: true, environment: 'web' })`)
2220
await fs.create('.env', 'PORT=3334')
2321

@@ -31,7 +29,7 @@ test.group('DevServer', () => {
3129
onDevServerStarted: [
3230
async () => ({
3331
default: () => {
34-
assert.isTrue(true)
32+
done()
3533
},
3634
}),
3735
],
@@ -40,12 +38,9 @@ test.group('DevServer', () => {
4038

4139
await devServer.start()
4240
cleanup(() => devServer.close())
43-
await sleep(600)
44-
})
45-
46-
test('startAndWatch() execute onDevServerStarted hook', async ({ assert, fs, cleanup }) => {
47-
assert.plan(1)
41+
}).waitForDone()
4842

43+
test('startAndWatch() execute onDevServerStarted hook', async ({ fs, cleanup }, done) => {
4944
await fs.create('bin/server.js', `process.send({ isAdonisJS: true, environment: 'web' })`)
5045
await fs.create('.env', 'PORT=3334')
5146

@@ -59,7 +54,7 @@ test.group('DevServer', () => {
5954
onDevServerStarted: [
6055
async () => ({
6156
default: () => {
62-
assert.isTrue(true)
57+
done()
6358
},
6459
}),
6560
],
@@ -68,12 +63,9 @@ test.group('DevServer', () => {
6863

6964
await devServer.startAndWatch(ts)
7065
cleanup(() => devServer.close())
71-
await sleep(600)
72-
})
73-
74-
test('execute onSourceFileChanged hook', async ({ assert, fs, cleanup }) => {
75-
assert.plan(1)
66+
}).waitForDone()
7667

68+
test('execute onSourceFileChanged hook', async ({ fs, cleanup }, done) => {
7769
await fs.createJson('tsconfig.json', {
7870
include: ['**/*'],
7971
exclude: [],
@@ -90,7 +82,7 @@ test.group('DevServer', () => {
9082
onSourceFileChanged: [
9183
async () => ({
9284
default: () => {
93-
assert.isTrue(true)
85+
done()
9486
},
9587
}),
9688
],
@@ -102,12 +94,9 @@ test.group('DevServer', () => {
10294

10395
await sleep(100)
10496
await fs.create('index.ts', 'foo')
105-
await sleep(10)
106-
})
107-
108-
test('wait for hooks to be registered', async ({ assert, fs, cleanup }) => {
109-
assert.plan(1)
97+
}).waitForDone()
11098

99+
test('wait for hooks to be registered', async ({ fs, cleanup }, done) => {
111100
await fs.createJson('tsconfig.json', {
112101
include: ['**/*'],
113102
exclude: [],
@@ -125,7 +114,7 @@ test.group('DevServer', () => {
125114
await sleep(400)
126115
return {
127116
default: () => {
128-
assert.isTrue(true)
117+
done()
129118
},
130119
}
131120
},
@@ -135,9 +124,7 @@ test.group('DevServer', () => {
135124

136125
await devServer.startAndWatch(ts)
137126
cleanup(() => devServer.close())
138-
139-
await sleep(500)
140-
}).timeout(10_000)
127+
})
141128

142129
test('onHttpServerMessage hook should be executed', async ({ assert, fs, cleanup }) => {
143130
let receivedMessages: any[] = []

0 commit comments

Comments
 (0)