vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support err as first argument for done callbacks in async tests

Browse source
This commit is contained in:
Stephan Hoyer 2017-08-08 09:07:39 +02:00 • committed by Pierre-Yves Gérardy
parent 9b5afff52e
commit fad8a7286b
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ospec/ospec.js
View file

@ -87,7 +87,13 @@ module.exports = new function init(name) {
var timeout = 0, delay = 200, s = new Date
var isDone = false
function done() {
function done(err) {
if (err) {
if (err.message) record(err.message, err)
else record(err)
subjects.pop()
next()
}
if (timeout !== undefined) {
timeout = clearTimeout(timeout)
if (delay !== Infinity) record(null)
@ -114,9 +120,7 @@ module.exports = new function init(name) {
fn(done, function(t) {delay = t})
}
catch (e) {
record(e.message, e)
subjects.pop()
next()
done(e)
}
if (timeout === 0) {
startTimer()
@ -126,11 +130,7 @@ module.exports = new function init(name) {
var p = fn()
if (p && p.then) {
startTimer()
p.then(done, e => {
record(e.message, e)
subjects.pop()
next()
})
p.then(function() { done() }, done)
} else {
nextTickish(next)
}