fixed until behavior in case condition throws (#5)

sha1n · Jan 22, 2022 · 058c9fc · 058c9fc
1 parent 04ff39e
commit 058c9fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/lib/utilities.ts b/lib/utilities.ts
@@ -51,10 +51,6 @@ async function until(
   condition: () => boolean,
   opts?: { interval?: number; timeout: number; units?: TimeUnit }
 ): Promise<void> {
-  if (condition()) {
-    return;
-  }
-
   const defaultInterval = 50;
   const deadline = opts ? Date.now() + toMilliseconds(opts.timeout, opts.units) : Number.MAX_VALUE;
   const interval = opts?.interval ? toMilliseconds(opts.interval, opts.units) : defaultInterval;
@@ -66,9 +62,14 @@ async function until(
         reject(new Error('Timeout'));
       }
 
-      if (condition()) {
+      try {
+        if (condition()) {
+          clearInterval(handle);
+          resolve();
+        }
+      } catch (e) {
         clearInterval(handle);
-        resolve();
+        reject(e);
       }
     }, interval);
   });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sha1n/about-time",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "A set of essential time related utilities",
   "repository": "https://github.com/sha1n/about-time",
   "author": "Shai Nagar",

diff --git a/test/until.spec.ts b/test/until.spec.ts
@@ -16,7 +16,7 @@ describe.each(cases())('%s', ({ fn }) => {
       throw expectedError;
     };
 
-    await expect(fn(never, { timeout: 1, units: TimeUnit.Milliseconds })).rejects.toThrow(expectedError);
+    await expect(fn(never, { timeout: 1, units: TimeUnit.Seconds })).rejects.toThrow(expectedError);
   });
 
   test('should resolve when the provided condition is true within a specified timeout boundary', async () => {