From 2e7924ee6478a5586b2969270301e75f258af022 Mon Sep 17 00:00:00 2001 From: George Bartlett Date: Thu, 16 Dec 2021 21:06:38 +0000 Subject: [PATCH] Return the result of the callback in the promise --- src/index.d.ts | 2 +- src/index.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.d.ts b/src/index.d.ts index 049a6e1..a73299b 100644 --- a/src/index.d.ts +++ b/src/index.d.ts @@ -6,4 +6,4 @@ * @param interval Number Wait-between-retries interval, 50ms by default * @return Promise Promise to return a callback result */ -export default function waitForExpect(expectation: () => void | Promise, timeout?: number, interval?: number): any; +export default function waitForExpect(expectation: () => T | Promise, timeout?: number, interval?: number): Promise; diff --git a/src/index.ts b/src/index.ts index 8d81984..2925289 100644 --- a/src/index.ts +++ b/src/index.ts @@ -13,8 +13,8 @@ const defaults = { * @param interval Number Wait-between-retries interval, 50ms by default * @return Promise Promise to return a callback result */ -const waitForExpect = function waitForExpect( - expectation: () => void | Promise, +const waitForExpect = function waitForExpect( + expectation: () => T | Promise, timeout = defaults.timeout, interval = defaults.interval ) { @@ -37,7 +37,7 @@ const waitForExpect = function waitForExpect( tries += 1; try { Promise.resolve(expectation()) - .then(() => resolve()) + .then(result => resolve(result)) .catch(rejectOrRerun); } catch (error) { rejectOrRerun(error);