Zengtudor
/
Nuxt
mirror of https://github.com/nuxt/nuxt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify killNuxt

This commit is contained in:
Clark Du 2018-08-12 13:40:27 +01:00
parent 04e53b0f9f
commit 141a54a1e3
No known key found for this signature in database
GPG Key ID: D0E5986AF78B86D9
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/unit/cli.test.js
View File

@ -9,17 +9,12 @@ const rootDir = resolve(__dirname, '..', 'fixtures/cli')
const url = route => 'http://localhost:' + port + route
const nuxtBin = resolve(__dirname, '..', '..', 'bin', 'nuxt')
const killNuxt = async (nuxtInt) => {
let exitCode
nuxtInt.on('close', (code) => { exitCode = code })
nuxtInt.kill()
const close = async (nuxtInt) => {
nuxtInt.kill('SIGKILL')
// Wait max 10s for the process to be killed
if (await waitUntil(() => exitCode !== undefined, 10)) {
console.warn( // eslint-disable-line no-console
`we were unable to automatically kill the child process with pid: ${
nuxtInt.pid
}`
)
if (await waitUntil(() => nuxtInt.killed, 10)) {
// eslint-disable-next-line no-console
console.warn(`Unable to close process with pid: ${nuxtInt.pid}`)
}
}
@ -44,7 +39,7 @@ describe.skip.appveyor('cli', () => {
stdout.indexOf('Compiled client') !==
stdout.lastIndexOf('Compiled client')
)
await killNuxt(nuxtDev)
await close(nuxtDev)
})
test('nuxt start', async () => {
@ -75,6 +70,6 @@ describe.skip.appveyor('cli', () => {
const html = await rp(url('/'))
expect(html).toMatch(('<div>CLI Test</div>'))
await killNuxt(nuxtStart)
await close(nuxtStart)
})
})