Check for callback existence, utilize promises (#37)

getconversio · Oct 6, 2017 · 283241c · 283241c
1 parent 34ac453
commit 283241c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/request.js b/lib/request.js
@@ -153,7 +153,8 @@ Request.prototype.completeRequest = function(method, path, data, cb) {
   req.on('error', function(e) {
     logger.error(e);
     _hasError = true;
-    return cb(e);
+    if (cb) cb(e);
+    return deferred.reject(e);
   });
 
   if (data) {

diff --git a/test/request.js b/test/request.js
@@ -172,6 +172,16 @@ describe('Request', function() {
         done();
       });
     });
+
+    it('should return a promise based error', function(done) {
+      request.completeRequest('post', '/orders', {})
+        .then(function(res) {
+          return done(new Error('Should not complete'));
+        })
+        .catch(function(err) {
+          return done();
+        });
+    });
   });
 
   it('Should attach a keep-alive HTTPS agent', function(done) {