From 00011e292268af5ebe1ec55901df10f01410a509 Mon Sep 17 00:00:00 2001 From: Tim Seckinger Date: Mon, 25 Mar 2019 21:30:37 +0100 Subject: [PATCH] end() reject instead of throw --- packages/jest-worker/src/__tests__/index.test.js | 4 ++-- packages/jest-worker/src/index.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/jest-worker/src/__tests__/index.test.js b/packages/jest-worker/src/__tests__/index.test.js index eae8116f2e1f..db0e2787ad32 100644 --- a/packages/jest-worker/src/__tests__/index.test.js +++ b/packages/jest-worker/src/__tests__/index.test.js @@ -141,10 +141,10 @@ it('does not let end the farm after it is ended', () => { farm.end(); expect(farm._workerPool.end).toHaveBeenCalledTimes(1); - expect(() => farm.end()).toThrow( + expect(farm.end()).rejects.toThrow( 'Farm is ended, no more calls can be done to it', ); - expect(() => farm.end()).toThrow( + expect(farm.end()).rejects.toThrow( 'Farm is ended, no more calls can be done to it', ); expect(farm._workerPool.end).toHaveBeenCalledTimes(1); diff --git a/packages/jest-worker/src/index.ts b/packages/jest-worker/src/index.ts index acbb3dda4944..459c5ac43f88 100644 --- a/packages/jest-worker/src/index.ts +++ b/packages/jest-worker/src/index.ts @@ -137,12 +137,12 @@ export default class JestWorker { return this._workerPool.getStdout(); } - end(): Promise { + async end(): Promise { if (this._ending) { throw new Error('Farm is ended, no more calls can be done to it'); } this._ending = true; - return this._workerPool.end(); + return await this._workerPool.end(); } }