From 40d7e1bc5a2a8debf81e451ef3bf7a4256ef8247 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Tue, 28 Jul 2020 11:50:36 +0200 Subject: [PATCH] async watcher --- packages/jest-core/src/TestScheduler.ts | 16 ++++++++-------- packages/jest-core/src/TestWatcher.ts | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/jest-core/src/TestScheduler.ts b/packages/jest-core/src/TestScheduler.ts index bf455a2e05c1..67d89b8663d1 100644 --- a/packages/jest-core/src/TestScheduler.ts +++ b/packages/jest-core/src/TestScheduler.ts @@ -367,15 +367,15 @@ export default class TestScheduler { aggregatedResults.numFailedTests >= this._globalConfig.bail ) { if (watcher.isWatchMode()) { - watcher.setState({interrupted: true}); - } else { - const failureExit = () => exit(1); - - return this._dispatcher - .onRunComplete(contexts, aggregatedResults) - .then(failureExit) - .catch(failureExit); + return watcher.setState({interrupted: true}); } + + const failureExit = () => exit(1); + + return this._dispatcher + .onRunComplete(contexts, aggregatedResults) + .then(failureExit) + .catch(failureExit); } return Promise.resolve(); } diff --git a/packages/jest-core/src/TestWatcher.ts b/packages/jest-core/src/TestWatcher.ts index 651c78f122eb..3dbacb3fb5e4 100644 --- a/packages/jest-core/src/TestWatcher.ts +++ b/packages/jest-core/src/TestWatcher.ts @@ -21,9 +21,9 @@ export default class TestWatcher extends emittery.Typed<{change: State}> { this._isWatchMode = isWatchMode; } - setState(state: State): void { + async setState(state: State): Promise { Object.assign(this.state, state); - this.emit('change', this.state); + await this.emit('change', this.state); } isInterrupted(): boolean {