Skip to content

Commit 5b4b9a6

Browse files
author
DavertMik
committed
fixed workers tests
1 parent 87608a4 commit 5b4b9a6

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

lib/result.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ class Result {
3131
this._endTime = new Date()
3232
}
3333

34+
get hasFailed() {
35+
return this.tests.some(test => test.state === 'failed')
36+
}
37+
3438
get tests() {
3539
return this._tests
3640
}
@@ -70,6 +74,7 @@ class Result {
7074

7175
simplify() {
7276
return {
77+
hasFailed: this.hasFailed,
7378
stats: this.stats,
7479
duration: this.duration,
7580
tests: this._tests.map(test => test.simplify()),

lib/workers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ class Workers extends EventEmitter {
443443

444444
_finishRun() {
445445
event.dispatcher.emit(event.workers.after, { tests: this.workers.map(worker => worker.tests) })
446-
if (this.isFailed()) {
446+
if (Container.result().hasFailed) {
447447
process.exitCode = 1
448448
} else {
449449
process.exitCode = 0

test/unit/worker_test.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ describe('Workers', function () {
2828

2929
workers.run()
3030

31-
workers.on(event.all.result, status => {
32-
expect(status).equal(false)
31+
workers.on(event.all.result, result => {
32+
expect(result.hasFailed).equal(false)
3333
expect(passedCount).equal(5)
3434
expect(failedCount).equal(3)
3535
done()
@@ -63,9 +63,9 @@ describe('Workers', function () {
6363

6464
workers.run()
6565

66-
workers.on(event.all.result, status => {
66+
workers.on(event.all.result, result => {
6767
expect(workers.getWorkers().length).equal(2)
68-
expect(status).equal(true)
68+
expect(result.hasFailed).equal(false)
6969
done()
7070
})
7171
})
@@ -100,8 +100,8 @@ describe('Workers', function () {
100100
passedCount += 1
101101
})
102102

103-
workers.on(event.all.result, status => {
104-
expect(status).equal(false)
103+
workers.on(event.all.result, result => {
104+
expect(result.hasFailed).equal(false)
105105
expect(passedCount).equal(3)
106106
expect(failedCount).equal(2)
107107
done()
@@ -135,9 +135,9 @@ describe('Workers', function () {
135135

136136
workers.run()
137137

138-
workers.on(event.all.result, status => {
138+
workers.on(event.all.result, result => {
139139
expect(workers.getWorkers().length).equal(2)
140-
expect(status).equal(true)
140+
expect(result.hasFailed).equal(false)
141141
done()
142142
})
143143
})
@@ -170,9 +170,9 @@ describe('Workers', function () {
170170

171171
workers.run()
172172

173-
workers.on(event.all.result, status => {
173+
workers.on(event.all.result, result => {
174174
expect(workers.getWorkers().length).equal(2)
175-
expect(status).equal(true)
175+
expect(result.hasFailed).equal(false)
176176
done()
177177
})
178178
})
@@ -199,8 +199,8 @@ describe('Workers', function () {
199199
workers.run()
200200
recorder.add(() => share({ fromMain: true }))
201201

202-
workers.on(event.all.result, status => {
203-
expect(status).equal(true)
202+
workers.on(event.all.result, result => {
203+
expect(result.hasFailed).equal(false)
204204
done()
205205
})
206206
})
@@ -258,9 +258,9 @@ describe('Workers', function () {
258258

259259
workers.run()
260260

261-
workers.on(event.all.result, status => {
261+
workers.on(event.all.result, result => {
262262
expect(workers.getWorkers().length).equal(8)
263-
expect(status).equal(true)
263+
expect(result.hasFailed).equal(false)
264264
done()
265265
})
266266
})

0 commit comments

Comments
 (0)