Refactored test for CPromise.all;

DigitalBrainJS · Nov 30, 2020 · 4f28354 · 4f28354
1 parent b4ad695
commit 4f28354
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -526,7 +526,7 @@ CPromise class
     * _static_
         * [.isCanceledError(thing)](#module_CPromise..CPromise.isCanceledError) ⇒ <code>boolean</code>
         * [.delay(ms, value)](#module_CPromise..CPromise.delay) ⇒ <code>CPromise</code>
-        * [.all(iterable, options)](#module_CPromise..CPromise.all) ⇒ <code>CPromise</code>
+        * [.all(iterable, [options])](#module_CPromise..CPromise.all) ⇒ <code>CPromise</code>
         * [.race(thenables)](#module_CPromise..CPromise.race) ⇒ <code>CPromise</code>
         * [.allSettled(iterable, options)](#module_CPromise..CPromise.allSettled) ⇒ <code>CPromise</code>
         * [.from(thing, [options])](#module_CPromise..CPromise.from) ⇒ <code>CPromise</code>
@@ -904,15 +904,15 @@ Returns a CPromise that will be resolved after specified timeout
 
 <a name="module_CPromise..CPromise.all"></a>
 
-#### CPromise.all(iterable, options) ⇒ <code>CPromise</code>
+#### CPromise.all(iterable, [options]) ⇒ <code>CPromise</code>
 Returns a single CPromise that resolves to an array of the results of the input promises.If one fails then other promises will be canceled immediately
 
 **Kind**: static method of [<code>CPromise</code>](#module_CPromise..CPromise)  
 
 | Param | Type |
 | --- | --- |
 | iterable | <code>Iterable</code> \| <code>Generator</code> \| <code>GeneratorFunction</code> | 
-| options | <code>AllOptions</code> | 
+| [options] | <code>AllOptions</code> | 
 
 **Example**  
 ```js

diff --git a/lib/c-promise.js b/lib/c-promise.js
@@ -921,7 +921,7 @@ class CPromise extends Promise {
      * Returns a single CPromise that resolves to an array of the results of the input promises.
      * If one fails then other promises will be canceled immediately
      * @param {Iterable|Generator|GeneratorFunction} iterable
-     * @param {AllOptions} options
+     * @param {AllOptions} [options]
      * @returns {CPromise}
      * @example
      * CPromise.all(function*(){

diff --git a/test/tests/CPromise.js b/test/tests/CPromise.js
@@ -543,23 +543,12 @@ module.exports = {
         'should support concurrency': async function () {
             let pending = 0;
 
-            setTimeout(() => {
-                assert.equal(pending, 2);
-            }, 10);
-
-            setTimeout(() => {
-                assert.equal(pending, 2);
-            }, 110);
-
-            setTimeout(() => {
-                assert.equal(pending, 1);
-            }, 210);
-
             return CPromise.all(function* () {
                 for (let i = 0; i < 5; i++) {
                     pending++;
-                    yield makePromise(100, i).then((v) => {
+                    yield makePromise(500, i).then((v) => {
                         pending--;
+                        assert.ok(pending < 2);
                         return v;
                     });
                 }