codeceptjs 4.0.1-beta.8 → 4.0.1-beta.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/step/meta.js +18 -1
- package/package.json +1 -1
package/lib/step/meta.js
CHANGED
|
@@ -58,17 +58,24 @@ class MetaStep extends Step {
|
|
|
58
58
|
this.status = 'queued'
|
|
59
59
|
this.setArguments(Array.from(arguments).slice(1))
|
|
60
60
|
let result
|
|
61
|
+
let hasChildSteps = false
|
|
61
62
|
|
|
62
63
|
const registerStep = step => {
|
|
63
64
|
this.setMetaStep(null)
|
|
64
65
|
step.setMetaStep(this)
|
|
66
|
+
hasChildSteps = true
|
|
65
67
|
}
|
|
66
68
|
event.dispatcher.prependListener(event.step.before, registerStep)
|
|
69
|
+
|
|
70
|
+
// Start timing
|
|
71
|
+
this.startTime = Date.now()
|
|
72
|
+
|
|
67
73
|
// Handle async and sync methods.
|
|
68
74
|
if (fn.constructor.name === 'AsyncFunction') {
|
|
69
75
|
result = fn
|
|
70
76
|
.apply(this.context, this.args)
|
|
71
77
|
.then(result => {
|
|
78
|
+
this.setStatus('success')
|
|
72
79
|
return result
|
|
73
80
|
})
|
|
74
81
|
.catch(error => {
|
|
@@ -78,17 +85,27 @@ class MetaStep extends Step {
|
|
|
78
85
|
.finally(() => {
|
|
79
86
|
this.endTime = Date.now()
|
|
80
87
|
event.dispatcher.removeListener(event.step.before, registerStep)
|
|
88
|
+
// Only emit events if no child steps were registered
|
|
89
|
+
if (!hasChildSteps) {
|
|
90
|
+
event.emit(event.step.started, this)
|
|
91
|
+
event.emit(event.step.finished, this)
|
|
92
|
+
}
|
|
81
93
|
})
|
|
82
94
|
} else {
|
|
83
95
|
try {
|
|
84
|
-
this.startTime = Date.now()
|
|
85
96
|
result = fn.apply(this.context, this.args)
|
|
97
|
+
this.setStatus('success')
|
|
86
98
|
} catch (error) {
|
|
87
99
|
this.setStatus('failed')
|
|
88
100
|
throw error
|
|
89
101
|
} finally {
|
|
90
102
|
this.endTime = Date.now()
|
|
91
103
|
event.dispatcher.removeListener(event.step.before, registerStep)
|
|
104
|
+
// Only emit events if no child steps were registered
|
|
105
|
+
if (!hasChildSteps) {
|
|
106
|
+
event.emit(event.step.started, this)
|
|
107
|
+
event.emit(event.step.finished, this)
|
|
108
|
+
}
|
|
92
109
|
}
|
|
93
110
|
}
|
|
94
111
|
|