diff --git a/flow-typed/environment/jest.js b/flow-typed/environment/jest.js index e94a4e2c382..d3cc6126ebb 100644 --- a/flow-typed/environment/jest.js +++ b/flow-typed/environment/jest.js @@ -1003,24 +1003,26 @@ type JestDoneFn = { fail: (error: Error) => void, }; +type JestProvidesCallback = + ((done: JestDoneFn) => void) | (() => PromiseLike); + +type JestProvidesHookCallback = (() => any) | JestProvidesCallback; + /** Runs this function after every test inside this context */ declare function afterEach( - fn: (done: JestDoneFn) => ?Promise, + fn: JestProvidesHookCallback, timeout?: number, ): void; /** Runs this function before every test inside this context */ declare function beforeEach( - fn: (done: JestDoneFn) => ?Promise, + fn: JestProvidesHookCallback, timeout?: number, ): void; /** Runs this function after all tests have finished inside this context */ -declare function afterAll( - fn: (done: JestDoneFn) => ?Promise, - timeout?: number, -): void; +declare function afterAll(fn: JestProvidesHookCallback, timeout?: number): void; /** Runs this function before any tests have started inside this context */ declare function beforeAll( - fn: (done: JestDoneFn) => ?Promise, + fn: JestProvidesHookCallback, timeout?: number, ): void; @@ -1049,7 +1051,7 @@ declare var describe: { | [ReadonlyArray, string] ): ( name: JestTestName, - fn?: (...args: ReadonlyArray) => ?Promise, + fn?: (...args: ReadonlyArray) => any, timeout?: number, ) => void, ... @@ -1064,11 +1066,7 @@ declare var it: { * @param {Function} Test * @param {number} Timeout for the test, in milliseconds. */ - ( - name: JestTestName, - fn?: (done: JestDoneFn) => ?Promise, - timeout?: number, - ): void, + (name: JestTestName, fn?: JestProvidesCallback, timeout?: number): void, /** * Only run this test * @@ -1077,16 +1075,12 @@ declare var it: { * @param {number} Timeout for the test, in milliseconds. */ only: { - ( - name: JestTestName, - fn?: (done: JestDoneFn) => ?Promise, - timeout?: number, - ): void, + (name: JestTestName, fn?: JestProvidesCallback, timeout?: number): void, each( ...table: Array | unknown> | [Array, string] ): ( name: JestTestName, - fn?: (...args: Array) => ?Promise, + fn?: (...args: Array) => any, timeout?: number, ) => void, }, @@ -1098,16 +1092,12 @@ declare var it: { * @param {number} Timeout for the test, in milliseconds. */ skip: { - ( - name: JestTestName, - fn?: (done: JestDoneFn) => ?Promise, - timeout?: number, - ): void, + (name: JestTestName, fn?: JestProvidesCallback, timeout?: number): void, each( ...table: Array | unknown> | [Array, string] ): ( name: JestTestName, - fn?: (...args: Array) => ?Promise, + fn?: (...args: Array) => any, timeout?: number, ) => void, }, @@ -1126,7 +1116,7 @@ declare var it: { */ concurrent( name: JestTestName, - fn?: (done: JestDoneFn) => ?Promise, + fn?: JestProvidesCallback, timeout?: number, ): void, /** @@ -1140,7 +1130,7 @@ declare var it: { | [ReadonlyArray, string] ): ( name: JestTestName, - fn?: (...args: Array) => ?Promise, + fn?: (...args: Array) => any, timeout?: number, ) => void, ... @@ -1148,7 +1138,7 @@ declare var it: { declare function fit( name: JestTestName, - fn: (done: JestDoneFn) => ?Promise, + fn: JestProvidesCallback, timeout?: number, ): void; /** An individual test unit */ diff --git a/packages/dev-middleware/src/__tests__/ServerUtils.js b/packages/dev-middleware/src/__tests__/ServerUtils.js index 6a7b9c1bacd..1352bbdea10 100644 --- a/packages/dev-middleware/src/__tests__/ServerUtils.js +++ b/packages/dev-middleware/src/__tests__/ServerUtils.js @@ -74,7 +74,7 @@ export function withServerForEachTest(options: CreateServerOptions): Readonly<{ Object.defineProperty(ref, 'app', {value: app}); Object.defineProperty(ref, 'port', {value: server.address().port}); }); - afterEach(done => { + afterEach((done: JestDoneFn) => { server.close(() => done()); }); return ref;