Update until and doUntil to support promised arguments

jgornick · Oct 13, 2016 · e809fe4 · e809fe4
1 parent e61bf26
commit e809fe4
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 4 deletions.
diff --git a/src/doUntil.js b/src/doUntil.js
@@ -1,11 +1,12 @@
 import tryFn from './tryFn';
+import promised from './promised';
 import until from './until';
 
-export default function doUntil(task, condition, ...args) {
+export default promised(function doUntil(task, condition, ...args) {
     return tryFn(task, ...args)
         .then((result) =>
             Array.isArray(result)
                 ? until(condition, task, ...result)
                 : until(condition, task, result)
         );
-};
+});
diff --git a/src/until.js b/src/until.js
@@ -1,6 +1,7 @@
 import tryFn from './tryFn';
+import promised from './promised';
 
-export default function until(condition, task, ...args) {
+export default promised(function until(condition, task, ...args) {
     return tryFn(condition, ...args)
         .then((conditionResult) => {
             return conditionResult
@@ -11,4 +12,4 @@ export default function until(condition, task, ...args) {
                         : until(condition, task, result)
                 );
         });
-};
+});
diff --git a/test/doUntil.js b/test/doUntil.js
@@ -103,6 +103,50 @@ describe('doUntil', function() {
         ]);
     });
 
+    it('supports promised arguments', function() {
+        let order = [];
+        const p = async.doUntil(
+            new Promise(resolve => setTimeout(
+                resolve.bind(
+                    null,
+                    count => new Promise(resolve => setTimeout(_ => {
+                        order.push(`task${count}`);
+                        count++;
+                        resolve(count);
+                    }, 25))
+                ),
+                25
+            )),
+            new Promise(resolve => setTimeout(
+                resolve.bind(
+                    null,
+                    count => new Promise(resolve => setTimeout(_ => {
+                        order.push(`condition${count}`);
+                        resolve(count == 5);
+                    }, 25))
+                ),
+                25
+            )),
+            Promise.resolve(0)
+        );
+
+        return Promise.all([
+            p.should.eventually.equal(undefined),
+            p.then(() => order.should.deep.equal([
+                'task0',
+                'condition1',
+                'task1',
+                'condition2',
+                'task2',
+                'condition3',
+                'task3',
+                'condition4',
+                'task4',
+                'condition5'
+            ]))
+        ]);
+    });
+
     it('rejects in delayed task', function() {
         let order = [];
         const p = async.doUntil(

diff --git a/test/until.js b/test/until.js
@@ -142,6 +142,52 @@ describe('until', function() {
         ]);
     });
 
+    it('supports promised arguments', function() {
+        let order = [];
+        const p = async.until(
+            new Promise(resolve => setTimeout(
+                resolve.bind(
+                    null,
+                    count => new Promise(resolve => setTimeout(_ => {
+                        order.push(`condition${count}`);
+                        resolve(count == 5);
+                    }, 25))
+                ),
+                25
+            )),
+            new Promise(resolve => setTimeout(
+                resolve.bind(
+                    null,
+                    count => new Promise(resolve => setTimeout(_ => {
+                        order.push(`task${count}`);
+                        count++;
+                        resolve(count);
+                    }, 25))
+                ),
+                25
+            )),
+            Promise.resolve(0)
+        );
+
+        return Promise.all([
+            p.should.eventually.equal(undefined),
+            p.then(() => order.should.deep.equal([
+                'condition0',
+                'task0',
+                'condition1',
+                'task1',
+                'condition2',
+                'task2',
+                'condition3',
+                'task3',
+                'condition4',
+                'task4',
+                'condition5'
+            ]))
+        ]);
+    });
+
+
     it('rejects in delayed task', function() {
         let order = [];
         const p = async.until(