Merge branch 'feature/timeout-fixes' into dev

ama-team · Aug 14, 2017 · 63463db · 63463db
2 parents 45aefa4 + 8aaabb3
commit 63463db
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/concurrent/timeout.js b/lib/concurrent/timeout.js
@@ -13,12 +13,12 @@ TimeoutException.prototype.constructor = TimeoutException
 
 /**
  * @param {Promise.<*>|Thenable.<*>} promise Promise to add time bound to
- * @param {int} timeout Timeout in milliseconds
- * @param {string} message
+ * @param {int} [timeout] Timeout in milliseconds
+ * @param {string} [message]
  * @return {Thenable.<*>}
  */
 function timeout (promise, timeout, message) {
-  if (timeout < 0) {
+  if (typeof timeout !== 'number' || timeout < 0) {
     return promise
   }
   return new Promise(function (resolve, reject) {

diff --git a/test/suites/integration/concurrent/timeout.timeout.spec.js b/test/suites/integration/concurrent/timeout.timeout.spec.js
@@ -21,6 +21,16 @@ describe('Integration', function () {
           return expect(timeout(promise, -1)).to.equal(promise)
         })
 
+        it('returns promise if timeout is omitted', function () {
+          var promise = new Promise(function () {})
+          return expect(timeout(promise)).to.equal(promise)
+        })
+
+        it('returns promise if not-a-number is supplied', function () {
+          var promise = new Promise(function () {})
+          return expect(timeout(promise, false)).to.equal(promise)
+        })
+
         it('wraps promise in timed out one', function () {
           var promise = new Promise(function () {})
           var wrapped = timeout(promise, 0)