mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

build: ensure runner is defined inside the spec callback (#17664)

Browse source
This commit is contained in:
Samuel Attard 2019-04-02 18:25:45 -07:00 • committed by GitHub
parent dc4fe537ee
commit 59e3164206
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

19
spec-main/index.js
View file

@ -75,16 +75,19 @@ app.whenReady().then(() => {
walker.on('end', () => { walker.on('end', () => {
const runner = mocha.run(() => { const runner = mocha.run(() => {
if (isCi && runner.hasOnly) { // Ensure the callback is called after runner is defined
try { process.nextTick(() => {
throw new Error('A spec contains a call to it.only or describe.only and should be reverted.') if (isCi && runner.hasOnly) {
} catch (error) { try {
console.error(error.stack || error) throw new Error('A spec contains a call to it.only or describe.only and should be reverted.')
} catch (error) {
console.error(error.stack || error)
}
process.exit(1)
} }
process.exit(1)
}
process.exit(runner.failures) process.exit(runner.failures)
})
}) })
}) })
}) })

27
spec/static/index.html
View file

@ -94,21 +94,24 @@
} }
const runner = mocha.run(() => { const runner = mocha.run(() => {
if (isCi && runner.hasOnly) { // Ensure the callback is called after runner is defined
try { setTimeout(() => {
throw new Error('A spec contains a call to it.only or describe.only and should be reverted.') if (isCi && runner.hasOnly) {
} catch (error) { try {
console.error(error.stack || error) throw new Error('A spec contains a call to it.only or describe.only and should be reverted.')
} catch (error) {
console.error(error.stack || error)
}
ipcRenderer.send('process.exit', 1)
return
} }
ipcRenderer.send('process.exit', 1)
return
}
Mocha.utils.highlightTags('code') Mocha.utils.highlightTags('code')
if (isCi) { if (isCi) {
ipcRenderer.send('process.exit', runner.failures) ipcRenderer.send('process.exit', runner.failures)
} }
}, 0)
}) })
}) })
})() })()