Move unit tests to subdirectories

test/unit/app-controller-test.js

@@ -1,282 +0,0 @@
-'use strict';
-
-var controller = require('../../src/js/app-controller'),
-    EmailDAO = require('../../src/js/dao/email-dao'),
-    OutboxBO = require('../../src/js/bo/outbox'),
-    DeviceStorageDAO = require('../../src/js/dao/devicestorage-dao'),
-    UpdateHandler = require('../../src/js/util/update/update-handler'),
-    KeychainDAO = require('../../src/js/dao/keychain-dao'),
-    config = require('../../src/js/app-config').config,
-    Auth = require('../../src/js/bo/auth');
-
-describe('App Controller unit tests', function() {
-    var emailDaoStub, outboxStub, updateHandlerStub, appConfigStoreStub, devicestorageStub, isOnlineStub, authStub, keychainStub;
-
-    beforeEach(function() {
-        controller._emailDao = emailDaoStub = sinon.createStubInstance(EmailDAO);
-        controller._outboxBo = outboxStub = sinon.createStubInstance(OutboxBO);
-        controller._appConfigStore = appConfigStoreStub = sinon.createStubInstance(DeviceStorageDAO);
-        controller._userStorage = devicestorageStub = sinon.createStubInstance(DeviceStorageDAO);
-        controller._updateHandler = updateHandlerStub = sinon.createStubInstance(UpdateHandler);
-        controller._auth = authStub = sinon.createStubInstance(Auth);
-        controller._keychain = keychainStub = sinon.createStubInstance(KeychainDAO);
-
-        isOnlineStub = sinon.stub(controller, 'isOnline');
-    });
-
-    afterEach(function() {
-        isOnlineStub.restore();
-    });
-
-    describe('buildModules', function() {
-        it('should work', function() {
-            controller.buildModules({
-                onError: function() {}
-            });
-            expect(controller._appConfigStore).to.exist;
-            expect(controller._auth).to.exist;
-            expect(controller._userStorage).to.exist;
-            expect(controller._invitationDao).to.exist;
-            expect(controller._keychain).to.exist;
-            expect(controller._pgp).to.exist;
-            expect(controller._pgpbuilder).to.exist;
-            expect(controller._emailDao).to.exist;
-            expect(controller._outboxBo).to.exist;
-            expect(controller._updateHandler).to.exist;
-        });
-    });
-
-    describe('start', function() {
-        it('should not explode', function(done) {
-            controller.start({
-                onError: function() {}
-            }, function(err) {
-                expect(err).to.not.exist;
-                done();
-            });
-        });
-    });
-
-    describe('onDisconnect', function() {
-        it('should work', function() {
-            controller.onDisconnect();
-
-            expect(emailDaoStub.onDisconnect.calledOnce).to.be.true;
-        });
-    });
-
-    describe('logout', function() {
-        it('should work', function(done) {
-            authStub.logout.yields();
-            emailDaoStub.onDisconnect.yields(new Error());
-
-            controller.onError = function(err) {
-                expect(err).to.exist;
-                expect(authStub.logout.calledOnce).to.be.true;
-                expect(emailDaoStub.onDisconnect.calledOnce).to.be.true;
-                done();
-            };
-
-            controller.logout();
-        });
-    });
-
-    describe('onConnect', function() {
-        beforeEach(function() {
-            controller._emailDao._account = {};
-        });
-
-        it('should not connect if offline', function(done) {
-            isOnlineStub.returns(false);
-
-            controller.onConnect(function(err) {
-                expect(err).to.not.exist;
-                done();
-            });
-        });
-
-        it('should not connect if account is not initialized', function(done) {
-            controller._emailDao._account = null;
-
-            controller.onConnect(function(err) {
-                expect(err).to.not.exist;
-                done();
-            });
-        });
-
-        it('should fail due to error in auth.getCredentials', function(done) {
-            isOnlineStub.returns(true);
-            authStub.getCredentials.yields(new Error());
-
-            controller.onConnect(function(err) {
-                expect(err).to.exist;
-                expect(authStub.getCredentials.calledOnce).to.be.true;
-                done();
-            });
-        });
-
-        it('should work', function(done) {
-            isOnlineStub.returns(true);
-            authStub.getCredentials.yields(null, {
-                emailAddress: 'asdf@example.com',
-                oauthToken: 'token',
-                sslCert: 'cert',
-                imap: {},
-                smtp: {}
-            });
-            emailDaoStub.onConnect.yields();
-
-            controller.onConnect(function(err) {
-                expect(err).to.not.exist;
-                expect(authStub.getCredentials.calledOnce).to.be.true;
-                expect(emailDaoStub.onConnect.calledOnce).to.be.true;
-                done();
-            });
-        });
-    });
-
-    describe('init', function() {
-        var onConnectStub, emailAddress, keysWithPubKey;
-
-        beforeEach(function() {
-            emailAddress = 'alice@bob.com';
-            keysWithPubKey = {
-                publicKey: {}
-            };
-
-            // onConnect
-            onConnectStub = sinon.stub(controller, 'onConnect');
-        });
-
-        afterEach(function() {
-            onConnectStub.restore();
-        });
-
-        it('should fail due to malformed email address', function(done) {
-            controller.init({
-                emailAddress: 'ishallfail'
-            }, function(err, keypair) {
-                expect(err).to.exist;
-                expect(keypair).to.not.exist;
-                done();
-            });
-        });
-
-        it('should fail due to error in storage initialization', function(done) {
-            devicestorageStub.init.withArgs(emailAddress).yields(new Error());
-
-            controller.init({
-                emailAddress: emailAddress
-            }, function(err, keypair) {
-                expect(err).to.exist;
-                expect(keypair).to.not.exist;
-                expect(devicestorageStub.init.calledOnce).to.be.true;
-                expect(updateHandlerStub.update.calledOnce).to.be.false;
-                done();
-            });
-        });
-
-        it('should fail due to error in update handler', function(done) {
-            devicestorageStub.init.yields();
-            updateHandlerStub.update.yields(new Error());
-
-            controller.init({
-                emailAddress: emailAddress
-            }, function(err, keypair) {
-                expect(err).to.exist;
-                expect(keypair).to.not.exist;
-                expect(updateHandlerStub.update.calledOnce).to.be.true;
-                expect(devicestorageStub.init.calledOnce).to.be.true;
-                done();
-            });
-        });
-
-        it('should fail due to error in getUserKeyPair', function(done) {
-            devicestorageStub.init.yields();
-            updateHandlerStub.update.yields();
-            keychainStub.getUserKeyPair.yields(new Error());
-
-            controller.init({
-                emailAddress: emailAddress
-            }, function(err, keypair) {
-                expect(err).to.exist;
-                expect(keypair).to.not.exist;
-                expect(updateHandlerStub.update.calledOnce).to.be.true;
-                expect(devicestorageStub.init.calledOnce).to.be.true;
-                expect(keychainStub.getUserKeyPair.calledOnce).to.be.true;
-                done();
-            });
-        });
-
-        it('should fail due to error in refreshKeyForUserId', function(done) {
-            devicestorageStub.init.yields();
-            updateHandlerStub.update.yields();
-            keychainStub.getUserKeyPair.yields(null, keysWithPubKey);
-            keychainStub.refreshKeyForUserId.yields(new Error());
-
-            controller.init({
-                emailAddress: emailAddress
-            }, function(err, keypair) {
-                expect(err).to.exist;
-                expect(keypair).to.not.exist;
-                expect(updateHandlerStub.update.calledOnce).to.be.true;
-                expect(devicestorageStub.init.calledOnce).to.be.true;
-                expect(keychainStub.getUserKeyPair.calledOnce).to.be.true;
-                expect(keychainStub.refreshKeyForUserId.calledOnce).to.be.true;
-                done();
-            });
-        });
-
-        it('should fail due to error in emailDao.init', function(done) {
-            devicestorageStub.init.yields();
-            updateHandlerStub.update.yields();
-            keychainStub.getUserKeyPair.yields(null, keysWithPubKey);
-            keychainStub.refreshKeyForUserId.yields();
-            emailDaoStub.init.yields(new Error());
-
-            controller.init({
-                emailAddress: emailAddress
-            }, function(err, keypair) {
-                expect(err).to.exist;
-                expect(keypair).to.not.exist;
-                expect(updateHandlerStub.update.calledOnce).to.be.true;
-                expect(devicestorageStub.init.calledOnce).to.be.true;
-                expect(keychainStub.getUserKeyPair.calledOnce).to.be.true;
-                expect(keychainStub.refreshKeyForUserId.calledOnce).to.be.true;
-                expect(emailDaoStub.init.calledOnce).to.be.true;
-                done();
-            });
-        });
-
-        it('should work and not return a keypair', function(done) {
-            devicestorageStub.init.withArgs(emailAddress).yields();
-            updateHandlerStub.update.yields();
-            keychainStub.getUserKeyPair.withArgs(emailAddress).yields(null, keysWithPubKey);
-            keychainStub.refreshKeyForUserId.withArgs({
-                userId: emailAddress,
-                overridePermission: true
-            }).yields();
-            emailDaoStub.init.withArgs({
-                account: {
-                    realname: undefined,
-                    emailAddress: emailAddress,
-                    asymKeySize: config.asymKeySize
-                }
-            }).yields();
-
-            controller.init({
-                emailAddress: emailAddress
-            }, function(err, keypair) {
-                expect(err).to.not.exist;
-                expect(keypair.publicKey).to.not.exist;
-                expect(updateHandlerStub.update.calledOnce).to.be.true;
-                expect(devicestorageStub.init.calledOnce).to.be.true;
-                expect(keychainStub.getUserKeyPair.calledOnce).to.be.true;
-                expect(keychainStub.refreshKeyForUserId.calledOnce).to.be.true;
-                expect(emailDaoStub.init.calledOnce).to.be.true;
-
-                done();
-            });
-        });
-    });
-});

test/unit/util/dialog-test.js

@@ -1,7 +1,7 @@
 'use strict';
 
 describe('Dialog Service unit test', function() {
-    var dialog,
+    var dialog, logErrorStub,
         opt = {
             foo: 'bar'
         };
@@ -9,12 +9,15 @@ describe('Dialog Service unit test', function() {
     beforeEach(function() {
         angular.module('dialog-test', ['woUtil']);
         angular.mock.module('dialog-test');
-        angular.mock.inject(function($injector) {
+        angular.mock.inject(function($injector, axe) {
+            logErrorStub = sinon.stub(axe, 'error');
             dialog = $injector.get('dialog');
         });
     });
 
-    afterEach(function() {});
+    afterEach(function() {
+        logErrorStub.restore();
+    });
 
     describe('info', function() {
         it('should work', inject(function($rootScope) {
@@ -46,6 +49,7 @@ describe('Dialog Service unit test', function() {
                 expect(result).to.not.exist;
             });
 
+            expect(logErrorStub.calledOnce).to.be.true;
             $rootScope.$apply();
             expect(displayErrorStub.withArgs(opt).calledOnce).to.be.true;
         }));
@@ -54,6 +58,7 @@ describe('Dialog Service unit test', function() {
                 expect(err.message).to.match(/displayError/);
             });
 
+            expect(logErrorStub.calledOnce).to.be.true;
             $rootScope.$apply();
         }));
     });