From cc886ad402990bb9bdef265ab9245a044a3686a4 Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Thu, 11 Dec 2014 18:12:37 +0100
Subject: [PATCH] Use native promise api in services

---
 .jshintrc                                    |  1 -
 src/js/service/devicestorage.js              | 13 ++++----
 src/js/service/invitation.js                 |  5 ++-
 src/js/service/lawnchair.js                  | 20 ++++++------
 src/js/service/newsletter.js                 |  6 ++--
 src/js/service/oauth.js                      |  9 +++---
 src/js/service/rest.js                       |  6 ++--
 src/js/util/connection-doctor.js             | 13 ++++----
 src/js/util/update/update-handler.js         |  5 ++-
 test/main.js                                 |  4 ---
 test/unit/service/devicestorage-dao-test.js  |  2 +-
 test/unit/service/invitation-dao-test.js     |  2 +-
 test/unit/service/lawnchair-dao-test.js      |  2 +-
 test/unit/service/newsletter-service-test.js | 34 +++++++++-----------
 test/unit/service/oauth-test.js              |  2 +-
 test/unit/service/rest-dao-test.js           |  2 +-
 test/unit/util/connection-doctor-test.js     |  2 +-
 test/unit/util/update-handler-test.js        |  2 +-
 18 files changed, 56 insertions(+), 74 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index ab7ec1f..0c54222 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -21,7 +21,6 @@
         "$",
         "inject",
         "Promise",
-        "qMock",
         "resolves",
         "rejects",
         "self",
diff --git a/src/js/service/devicestorage.js b/src/js/service/devicestorage.js
index ed0fb0c..92ee808 100644
--- a/src/js/service/devicestorage.js
+++ b/src/js/service/devicestorage.js
@@ -3,13 +3,13 @@
 var ngModule = angular.module('woServices');
 
 // expose an instance with the static dbName 'app-config' to store configuration data
-ngModule.factory('appConfigStore', function(appConfigLawnchair, $q) {
-    return new DeviceStorage(appConfigLawnchair, $q);
+ngModule.factory('appConfigStore', function(appConfigLawnchair) {
+    return new DeviceStorage(appConfigLawnchair);
 });
 
 // expose a singleton instance of DeviceStorage called 'accountStore' to persist user data
-ngModule.factory('accountStore', function(accountLawnchair, $q) {
-    return new DeviceStorage(accountLawnchair, $q);
+ngModule.factory('accountStore', function(accountLawnchair) {
+    return new DeviceStorage(accountLawnchair);
 });
 
 module.exports = DeviceStorage;
@@ -21,9 +21,8 @@ module.exports = DeviceStorage;
 /**
  * High level storage api that handles all persistence of a user's data on the device.
  */
-function DeviceStorage(lawnchairDAO, $q) {
+function DeviceStorage(lawnchairDAO) {
     this._lawnchairDAO = lawnchairDAO;
-    this._q = $q;
 }
 
 /**
@@ -43,7 +42,7 @@ DeviceStorage.prototype.init = function(dbName) {
  */
 DeviceStorage.prototype.storeList = function(list, type) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         var key, items = [];
         list = list || [];
 
diff --git a/src/js/service/invitation.js b/src/js/service/invitation.js
index 5db1fbe..377378a 100644
--- a/src/js/service/invitation.js
+++ b/src/js/service/invitation.js
@@ -8,9 +8,8 @@ module.exports = Invitation;
  * The Invitation is a high level Data Access Object that access the invitation service REST endpoint.
  * @param {Object} restDao The REST Data Access Object abstraction
  */
-function Invitation(invitationRestDao, $q) {
+function Invitation(invitationRestDao) {
     this._restDao = invitationRestDao;
-    this._q = $q;
 }
 
 //
@@ -25,7 +24,7 @@ function Invitation(invitationRestDao, $q) {
  */
 Invitation.prototype.invite = function(options) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         if (typeof options !== 'object' || typeof options.recipient !== 'string' || typeof options.sender !== 'string') {
             throw new Error('erroneous usage of api: incorrect parameters!');
         }
diff --git a/src/js/service/lawnchair.js b/src/js/service/lawnchair.js
index 6f5de0f..8ec2d50 100644
--- a/src/js/service/lawnchair.js
+++ b/src/js/service/lawnchair.js
@@ -8,9 +8,7 @@ module.exports = LawnchairDAO;
 /**
  * Handles generic caching of JSON objects in a lawnchair adapter
  */
-function LawnchairDAO($q) {
-    this._q = $q;
-}
+function LawnchairDAO() {}
 
 /**
  * Initialize the lawnchair database
@@ -19,7 +17,7 @@ function LawnchairDAO($q) {
  */
 LawnchairDAO.prototype.init = function(dbName) {
     var self = this;
-    return self._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         if (!dbName) {
             throw new Error('Lawnchair DB name must be specified!');
         }
@@ -42,7 +40,7 @@ LawnchairDAO.prototype.init = function(dbName) {
  */
 LawnchairDAO.prototype.persist = function(key, object) {
     var self = this;
-    return self._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         if (!key || !object) {
             throw new Error('Key and Object must be set!');
         }
@@ -67,7 +65,7 @@ LawnchairDAO.prototype.persist = function(key, object) {
  */
 LawnchairDAO.prototype.batch = function(list) {
     var self = this;
-    return self._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         if (!(list instanceof Array)) {
             throw new Error('Input must be of type Array!');
         }
@@ -88,7 +86,7 @@ LawnchairDAO.prototype.batch = function(list) {
  */
 LawnchairDAO.prototype.read = function(key) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         if (!key) {
             throw new Error('Key must be specified!');
         }
@@ -112,7 +110,7 @@ LawnchairDAO.prototype.read = function(key) {
  */
 LawnchairDAO.prototype.list = function(type, offset, num) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         var i, from, to,
             matchingKeys = [],
             intervalKeys = [],
@@ -171,7 +169,7 @@ LawnchairDAO.prototype.list = function(type, offset, num) {
  */
 LawnchairDAO.prototype.remove = function(key) {
     var self = this;
-    return self._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         self._db.remove(key, function(err) {
             if (err) {
                 reject(err);
@@ -188,7 +186,7 @@ LawnchairDAO.prototype.remove = function(key) {
  */
 LawnchairDAO.prototype.removeList = function(type) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         var matchingKeys = [],
             after;
 
@@ -226,7 +224,7 @@ LawnchairDAO.prototype.removeList = function(type) {
  */
 LawnchairDAO.prototype.clear = function() {
     var self = this;
-    return self._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         self._db.nuke(function(err) {
             if (err) {
                 reject(err);
diff --git a/src/js/service/newsletter.js b/src/js/service/newsletter.js
index 1686650..1f565f2 100644
--- a/src/js/service/newsletter.js
+++ b/src/js/service/newsletter.js
@@ -4,15 +4,13 @@ var ngModule = angular.module('woServices');
 ngModule.service('newsletter', Newsletter);
 module.exports = Newsletter;
 
-function Newsletter($q) {
-    this._q = $q;
-}
+function Newsletter() {}
 
 /**
  * Sign up to the whiteout newsletter
  */
 Newsletter.prototype.signup = function(emailAddress, agree) {
-    return this._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         // validate email address
         if (emailAddress.indexOf('@') < 0) {
             reject(new Error('Invalid email address!'));
diff --git a/src/js/service/oauth.js b/src/js/service/oauth.js
index 34e0e1f..61cb390 100644
--- a/src/js/service/oauth.js
+++ b/src/js/service/oauth.js
@@ -4,8 +4,7 @@ var ngModule = angular.module('woServices');
 ngModule.service('oauth', OAuth);
 module.exports = OAuth;
 
-function OAuth($q, oauthRestDao) {
-    this._q = $q;
+function OAuth(oauthRestDao) {
     this._googleApi = oauthRestDao;
 }
 
@@ -22,7 +21,7 @@ OAuth.prototype.isSupported = function() {
  * @param  {String}   emailAddress  The user's email address (optional)
  */
 OAuth.prototype.getOAuthToken = function(emailAddress) {
-    return this._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         var idOptions = {
             interactive: true
         };
@@ -59,7 +58,7 @@ OAuth.prototype.getOAuthToken = function(emailAddress) {
  */
 OAuth.prototype.refreshToken = function(options) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         if (!options.oldToken) {
             throw new Error('oldToken option not set!');
         }
@@ -80,7 +79,7 @@ OAuth.prototype.refreshToken = function(options) {
  */
 OAuth.prototype.queryEmailAddress = function(token) {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         if (!token) {
             throw new Error('Invalid OAuth token!');
         }
diff --git a/src/js/service/rest.js b/src/js/service/rest.js
index b281fc9..2449f8d 100644
--- a/src/js/service/rest.js
+++ b/src/js/service/rest.js
@@ -39,9 +39,7 @@ ngModule.factory('oauthRestDao', function() {
 
 module.exports = RestDAO;
 
-function RestDAO($q) {
-    this._q = $q;
-}
+function RestDAO() {}
 
 /**
  * Set the REST DAO's base url
@@ -99,7 +97,7 @@ RestDAO.prototype.remove = function(uri) {
 
 RestDAO.prototype._processRequest = function(options) {
     var self = this;
-    return self._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         var xhr, format;
 
         if (typeof options.uri === 'undefined') {
diff --git a/src/js/util/connection-doctor.js b/src/js/util/connection-doctor.js
index e309a57..eada553 100644
--- a/src/js/util/connection-doctor.js
+++ b/src/js/util/connection-doctor.js
@@ -15,8 +15,7 @@ var TCPSocket = require('tcp-socket'),
  *
  * @constructor
  */
-function ConnectionDoctor($q, appConfig) {
-    this._q = $q;
+function ConnectionDoctor(appConfig) {
     this._appConfig = appConfig;
     this._workerPath = appConfig.config.workerPath + '/tcp-socket-tls-worker.min.js';
 }
@@ -86,7 +85,7 @@ ConnectionDoctor.prototype.configure = function(credentials) {
  */
 ConnectionDoctor.prototype.check = function() {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         if (!self.credentials) {
             throw new Error('You need to configure() the connection doctor first!');
         } else {
@@ -115,7 +114,7 @@ ConnectionDoctor.prototype.check = function() {
  */
 ConnectionDoctor.prototype._checkOnline = function() {
     var self = this;
-    return self._q(function(resolve) {
+    return new Promise(function(resolve) {
         if (navigator.onLine) {
             resolve();
         } else {
@@ -133,7 +132,7 @@ ConnectionDoctor.prototype._checkOnline = function() {
  */
 ConnectionDoctor.prototype._checkReachable = function(options) {
     var self = this;
-    return self._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         var socket,
             error, // remember the error message
             timeout, // remember the timeout object
@@ -198,7 +197,7 @@ ConnectionDoctor.prototype._checkReachable = function(options) {
  */
 ConnectionDoctor.prototype._checkImap = function() {
     var self = this;
-    return self._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         var loggedIn = false,
             host = self.credentials.imap.host + ':' + self.credentials.imap.port,
             str = self._appConfig.string;
@@ -248,7 +247,7 @@ ConnectionDoctor.prototype._checkImap = function() {
  */
 ConnectionDoctor.prototype._checkSmtp = function() {
     var self = this;
-    return self._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         var host = self.credentials.smtp.host + ':' + self.credentials.smtp.port,
             errored = false, // tracks if we need to invoke the callback at onclose or not
             str = self._appConfig.string;
diff --git a/src/js/util/update/update-handler.js b/src/js/util/update/update-handler.js
index e8faba6..3a31192 100644
--- a/src/js/util/update/update-handler.js
+++ b/src/js/util/update/update-handler.js
@@ -15,8 +15,7 @@ var axe = require('axe-logger'),
 /**
  * Handles database migration
  */
-function UpdateHandler($q, appConfigStore, accountStore, auth, dialog) {
-    this._q = $q;
+function UpdateHandler(appConfigStore, accountStore, auth, dialog) {
     this._appConfigStorage = appConfigStore;
     this._userStorage = accountStore;
     this._updateScripts = [updateV1, updateV2, updateV3, updateV4, updateV5];
@@ -51,7 +50,7 @@ UpdateHandler.prototype.update = function() {
  */
 UpdateHandler.prototype._applyUpdate = function(options) {
     var self = this;
-    return self._q(function(resolve, reject) {
+    return new Promise(function(resolve, reject) {
         var scriptOptions,
             queue = [];
 
diff --git a/test/main.js b/test/main.js
index 38e8b24..0b34930 100644
--- a/test/main.js
+++ b/test/main.js
@@ -49,10 +49,6 @@ require('../src/js/email');
 // Global mocks
 //
 
-window.qMock = function(res, rej) {
-    return new Promise(res, rej);
-};
-
 window.resolves = function(val) {
     return new Promise(function(res) {
         res(val);
diff --git a/test/unit/service/devicestorage-dao-test.js b/test/unit/service/devicestorage-dao-test.js
index 4fb4640..43fd792 100644
--- a/test/unit/service/devicestorage-dao-test.js
+++ b/test/unit/service/devicestorage-dao-test.js
@@ -11,7 +11,7 @@ describe('Device Storage DAO unit tests', function() {
 
     beforeEach(function() {
         lawnchairDaoStub = sinon.createStubInstance(LawnchairDAO);
-        storageDao = new DeviceStorageDAO(lawnchairDaoStub, window.qMock);
+        storageDao = new DeviceStorageDAO(lawnchairDaoStub);
     });
 
     afterEach(function() {});
diff --git a/test/unit/service/invitation-dao-test.js b/test/unit/service/invitation-dao-test.js
index f38ac29..8a1f686 100644
--- a/test/unit/service/invitation-dao-test.js
+++ b/test/unit/service/invitation-dao-test.js
@@ -11,7 +11,7 @@ describe('Invitation DAO unit tests', function() {
 
     beforeEach(function() {
         restDaoStub = sinon.createStubInstance(RestDAO);
-        invitationDao = new InvitationDAO(restDaoStub, window.qMock);
+        invitationDao = new InvitationDAO(restDaoStub);
     });
 
     describe('initialization', function() {
diff --git a/test/unit/service/lawnchair-dao-test.js b/test/unit/service/lawnchair-dao-test.js
index 1adc9cd..a66ea97 100644
--- a/test/unit/service/lawnchair-dao-test.js
+++ b/test/unit/service/lawnchair-dao-test.js
@@ -21,7 +21,7 @@ describe('Lawnchair DAO unit tests', function() {
     var lawnchairDao;
 
     beforeEach(function(done) {
-        lawnchairDao = new LawnchairDAO(qMock);
+        lawnchairDao = new LawnchairDAO();
         lawnchairDao.init(dbName).then(function() {
             expect(lawnchairDao._db).to.exist;
             done();
diff --git a/test/unit/service/newsletter-service-test.js b/test/unit/service/newsletter-service-test.js
index 874a345..34d2594 100644
--- a/test/unit/service/newsletter-service-test.js
+++ b/test/unit/service/newsletter-service-test.js
@@ -29,45 +29,43 @@ describe('Newsletter Service unit test', function() {
             xhrMock.restore();
         });
 
-        it('should not signup if user has not agreed', inject(function($rootScope) {
+        it('should not signup if user has not agreed', function(done) {
             newsletter.signup('text@example.com', false).then(function(result) {
                 expect(result).to.be.false;
+                expect(requests.length).to.equal(0);
+                done();
             });
+        });
 
-            $rootScope.$apply();
-            expect(requests.length).to.equal(0);
-        }));
-
-        it('should not signup due to invalid email address', inject(function($rootScope) {
+        it('should not signup due to invalid email address', function(done) {
             newsletter.signup('textexample.com', true).catch(function(err) {
                 expect(err.message).to.contain('Invalid');
+                expect(requests.length).to.equal(0);
+                done();
             });
+        });
 
-            $rootScope.$apply();
-            expect(requests.length).to.equal(0);
-        }));
-
-        it('should fail', inject(function($rootScope) {
+        it('should fail', function(done) {
             newsletter.signup('text@example.com', true).catch(function(err) {
                 expect(err).to.exist;
+                expect(requests.length).to.equal(1);
+                done();
             });
 
             requests[0].onerror('err');
-            $rootScope.$apply();
-            expect(requests.length).to.equal(1);
-        }));
+        });
 
-        it('should work', inject(function($rootScope) {
+        it('should work', function(done) {
             newsletter.signup('text@example.com', true).then(function(result) {
                 expect(result).to.exist;
+                expect(requests.length).to.equal(1);
+                done();
             });
 
             requests[0].respond(200, {
                 "Content-Type": "text/plain"
             }, 'foobar!');
-            $rootScope.$apply();
-            expect(requests.length).to.equal(1);
-        }));
+        });
     });
 
 });
\ No newline at end of file
diff --git a/test/unit/service/oauth-test.js b/test/unit/service/oauth-test.js
index e6869fa..8e9fc38 100644
--- a/test/unit/service/oauth-test.js
+++ b/test/unit/service/oauth-test.js
@@ -9,7 +9,7 @@ describe('OAuth unit tests', function() {
 
     beforeEach(function() {
         googleApiStub = sinon.createStubInstance(RestDAO);
-        oauth = new OAuth(qMock, googleApiStub);
+        oauth = new OAuth(googleApiStub);
 
         window.chrome = window.chrome || {};
 
diff --git a/test/unit/service/rest-dao-test.js b/test/unit/service/rest-dao-test.js
index 7dd1638..330c1be 100644
--- a/test/unit/service/rest-dao-test.js
+++ b/test/unit/service/rest-dao-test.js
@@ -23,7 +23,7 @@ describe('Rest DAO unit tests', function() {
     describe('setBaseUri', function() {
         it('should accept base uri', function() {
             var baseUri = 'http://custom.com';
-            restDao = new RestDAO(window.qMock);
+            restDao = new RestDAO();
             expect(restDao._baseUri).to.not.exist;
             restDao.setBaseUri(baseUri);
             expect(restDao._baseUri).to.equal(baseUri);
diff --git a/test/unit/util/connection-doctor-test.js b/test/unit/util/connection-doctor-test.js
index 666210e..18b7bbb 100644
--- a/test/unit/util/connection-doctor-test.js
+++ b/test/unit/util/connection-doctor-test.js
@@ -52,7 +52,7 @@ describe('Connection Doctor', function() {
         //
         // Setup SUT
         //
-        doctor = new ConnectionDoctor(qMock, appConfig);
+        doctor = new ConnectionDoctor(appConfig);
         doctor.configure(credentials);
         doctor._imap = imapStub;
         doctor._smtp = smtpStub;
diff --git a/test/unit/util/update-handler-test.js b/test/unit/util/update-handler-test.js
index b6cd558..bac9973 100644
--- a/test/unit/util/update-handler-test.js
+++ b/test/unit/util/update-handler-test.js
@@ -17,7 +17,7 @@ describe('UpdateHandler', function() {
         userStorageStub = sinon.createStubInstance(DeviceStorageDAO);
         authStub = sinon.createStubInstance(Auth);
         dialogStub = sinon.createStubInstance(Dialog);
-        updateHandler = new UpdateHandler(qMock, appConfigStorageStub, userStorageStub, authStub, dialogStub);
+        updateHandler = new UpdateHandler(appConfigStorageStub, userStorageStub, authStub, dialogStub);
     });
 
     afterEach(function() {