Merge pull request #616 from gemini-testing/feature/proper-bluebird

Replace Q with Bluebird

lib/browser-pool/basic-pool.js

@@ -4,7 +4,7 @@ var util = require('util'),
     Pool = require('./pool'),
     signalHandler = require('../signal-handler'),
     _ = require('lodash'),
-    Q = require('q');
+    Promise = require('bluebird');
 
 var activeSessions = {};
 
@@ -32,12 +32,11 @@ Pool.prototype.getBrowser = function(id) {
     };
 
     return launchPromise
-        .then(browser.reset.bind(browser))
-        .thenResolve(browser)
+        .then(browser.reset.bind(browser)).thenReturn(browser)
         .catch(function(e) {
             return _this.freeBrowser(browser)
                 .then(function() {
-                    return Q.reject(e);
+                    return Promise.reject(e);
                 });
         });
 };
@@ -52,9 +51,9 @@ signalHandler.on('exit', function() {
     return _(activeSessions)
         .map(function(session) {
             var quit_ = session.browser.quit.bind(session.browser);
-            return Q.when(session.launchPromise, quit_);
+            return session.launchPromise.then(quit_);
         })
-        .thru(Q.all)
+        .thru(Promise.all)
         .value();
 });
 

lib/browser-pool/caching-pool.js

@@ -1,5 +1,5 @@
 'use strict';
-var q = require('q'),
+var Promise = require('bluebird'),
     util = require('util'),
     Pool = require('./pool'),
     LimitedUseSet = require('./limited-use-set'),
@@ -38,11 +38,10 @@ CachingPool.prototype.getBrowser = function(id) {
     log('has cached browser %o', browser);
     return browser.reset()
         .catch(function(e) {
-            var reject = q.reject.bind(null, e);
+            var reject = Promise.reject.bind(null, e);
             return this.underlyingPool.freeBrowser(browser)
                 .then(reject, reject);
-        }.bind(this))
-        .thenResolve(browser);
+        }.bind(this)).thenReturn(browser);
 };
 
 /**

lib/browser-pool/limited-pool.js

@@ -2,7 +2,7 @@
 
 const Pool = require('./pool');
 const CancelledError = require('../errors/cancelled-error');
-const q = require('q');
+const Promise = require('bluebird');
 const log = require('debug')('gemini:pool:limited');
 
 module.exports = class LimitedPool extends Pool {
@@ -22,7 +22,7 @@ module.exports = class LimitedPool extends Pool {
         this._limit = limit;
         this._launched = 0;
         this._requests = 0;
-        this._deferQueue = [];
+        this._requestQueue = [];
     }
 
     getBrowser(id) {
@@ -32,7 +32,7 @@ module.exports = class LimitedPool extends Pool {
         return this._getBrowser(id)
             .catch((e) => {
                 --this._requests;
-                return q.reject(e);
+                return Promise.reject(e);
             });
     }
 
@@ -47,9 +47,9 @@ module.exports = class LimitedPool extends Pool {
 
     cancel() {
         log('cancel');
-        this._deferQueue.forEach((entry) => entry.defer.reject(new CancelledError()));
+        this._requestQueue.forEach((entry) => entry.reject(new CancelledError()));
 
-        this._deferQueue.length = 0;
+        this._requestQueue.length = 0;
         this.underlyingPool.cancel();
     }
 
@@ -61,11 +61,9 @@ module.exports = class LimitedPool extends Pool {
         }
 
         log('queuing the request');
-        const defer = q.defer();
-        this._deferQueue.unshift({id, defer});
-
-        log(`queue length: ${this._deferQueue.length}`);
-        return defer.promise;
+        return new Promise((resolve, reject) => {
+            this._requestQueue.unshift({id, resolve, reject});
+        });
     }
 
     /**
@@ -77,17 +75,17 @@ module.exports = class LimitedPool extends Pool {
         return this.underlyingPool.getBrowser(id)
             .catch((e) => {
                 this._launchNextBrowser();
-                return q.reject(e);
+                return Promise.reject(e);
             });
     }
 
     _launchNextBrowser() {
-        var queued = this._deferQueue.pop();
+        var queued = this._requestQueue.pop();
         if (queued) {
             log('has queued requests');
-            log(`remaining queue length: ${this._deferQueue.length}`);
+            log(`remaining queue length: ${this._requestQueue.length}`);
             this._newBrowser(queued.id)
-                .then(queued.defer.resolve, queued.defer.reject);
+                .then(queued.resolve, queued.reject);
         } else {
             this._launched--;
         }

lib/browser-pool/limited-use-set.js

@@ -1,5 +1,5 @@
 'use strict';
-var q = require('q'),
+var Promise = require('bluebird'),
     log = require('debug')('gemini:pool:limited-use-set');
 
 /**
@@ -28,7 +28,7 @@ LimitedUseSet.prototype.push = function(value) {
     }
     log('under limit');
     this._objects.push(value);
-    return q();
+    return Promise.resolve();
 };
 
 LimitedUseSet.prototype._isOverLimit = function(value) {

lib/browser-pool/pool.js

@@ -1,5 +1,5 @@
 'use strict';
-var q = require('q');
+var Promise = require('bluebird');
 /**
  * @constructor
  */
@@ -17,7 +17,7 @@ BasicPool.prototype.getBrowser = function() {
  * @returns {Promise}
  */
 BasicPool.prototype.freeBrowser = function() {
-    return q.resolve();
+    return Promise.resolve();
 };
 
 BasicPool.prototype.cancel = function() {

lib/browser/browser.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
+const Promise = require('bluebird');
 const wd = require('wd');
 
 const Camera = require('./camera');
@@ -44,6 +45,6 @@ module.exports = class Browser {
     }
 
     _configureHttp(timeout) {
-        return this._wd.configureHttp({retries: 'never', timeout});
+        return Promise.resolve(this._wd.configureHttp({retries: 'never', timeout}));
     }
 };

lib/browser/camera.js

@@ -2,7 +2,7 @@
 
 var Image = require('../image'),
     inherit = require('inherit'),
-    q = require('q'),
+    Promise = require('bluebird'),
     _ = require('lodash'),
     util = require('./util');
 
@@ -25,7 +25,7 @@ module.exports = inherit({
                         // if _takeScreenshotWithNativeContext fails too, the original error
                         // most likely was not related to the different Appium contexts and
                         // it is more useful to report it instead of second one
-                        return q.reject(originalError);
+                        return Promise.reject(originalError);
                     });
             });
     },

lib/browser/client-bridge.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var util = require('util'),
-    q = require('q'),
+    Promise = require('bluebird'),
 
     StateError = require('../errors/state-error'),
 
@@ -35,11 +35,11 @@ ClientBridge.prototype._callCommand = function(command, injectAllowed) {
     return this._browser.evalScript(command)
         .then(function(result) {
             if (!result || !result.error) {
-                return q.resolve(result);
+                return Promise.resolve(result);
             }
 
             if (result.error !== NO_CLIENT_FUNC) {
-                return q.reject(new StateError(result.message));
+                return Promise.reject(new StateError(result.message));
             }
 
             if (injectAllowed) {
@@ -48,7 +48,7 @@ ClientBridge.prototype._callCommand = function(command, injectAllowed) {
                         return _this._callCommand(command, false);
                     });
             }
-            return q.reject(new StateError('Unable to inject gemini client script'));
+            return Promise.reject(new StateError('Unable to inject gemini client script'));
         });
 };
 

lib/browser/existing-browser.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var Browser = require('./browser');
+const Browser = require('./browser');
 
 module.exports = class ExistingBrowser extends Browser {
     static fromObject(serializedObject) {
@@ -22,6 +22,6 @@ module.exports = class ExistingBrowser extends Browser {
     attach() {
         return this._setHttpTimeout()
             .then(() => this._wd.attach(this.sessionId))
-            .thenResolve(this);
+            .thenReturn(this);
     }
 };