mirror of
https://github.com/moparisthebest/mail
synced 2024-11-22 08:52:15 -05:00
[WO-429] minor refactoring to fix the tests
This commit is contained in:
Felix Hammerl
parent
9465ce57ed
commit
fa1fbda11f
@ -78,7 +78,7 @@ define(function(require) {
|
||||
|
||||
function initFolders() {
|
||||
// try init folders from memory, since imap client not initiated yet
|
||||
self._initFolders(function(err) {
|
||||
self._initFoldersFromDisk(function(err) {
|
||||
// dont handle offline case this time
|
||||
if (err && err.code !== 42) {
|
||||
callback(err);
|
||||
@ -966,7 +966,7 @@ define(function(require) {
|
||||
}
|
||||
|
||||
// init folders
|
||||
self._initFolders(function(err) {
|
||||
self._initFoldersFromImap(function(err) {
|
||||
if (err) {
|
||||
callback(err);
|
||||
return;
|
||||
@ -1121,123 +1121,26 @@ define(function(require) {
|
||||
|
||||
|
||||
/**
|
||||
* Updates the folder information from memory (if we're offline), or from imap (if we're online),
|
||||
* and adds/removes folders in account.folders, if we added/removed folder in IMAP. If we have an
|
||||
* uninitialized folder that lacks folder.messages, all the locally available messages are loaded
|
||||
* from memory
|
||||
* Updates the folder information from memory, and adds/removes folders in account.folders.
|
||||
* The locally available messages are loaded from memory
|
||||
*
|
||||
* @param {Function} callback Invoked when the folders are up to date
|
||||
*/
|
||||
EmailDAO.prototype._initFolders = function(callback) {
|
||||
EmailDAO.prototype._initFoldersFromDisk = function(callback) {
|
||||
var self = this,
|
||||
folderDbType = 'folders';
|
||||
|
||||
self._account.busy = true; // start the spinner
|
||||
|
||||
if (!self._account.online) {
|
||||
// fetch list from local cache
|
||||
self._devicestorage.listItems(folderDbType, 0, null, function(err, stored) {
|
||||
if (err) {
|
||||
done(err);
|
||||
return;
|
||||
}
|
||||
|
||||
self._account.folders = stored[0] || [];
|
||||
readMessagesFromDisk();
|
||||
});
|
||||
return;
|
||||
} else {
|
||||
// fetch list from imap server
|
||||
self._imapClient.listWellKnownFolders(function(err, wellKnownFolders) {
|
||||
if (err) {
|
||||
done(err);
|
||||
return;
|
||||
}
|
||||
|
||||
// this array is dropped directly into the ui to create the folder list
|
||||
var folders = [
|
||||
wellKnownFolders.inbox,
|
||||
wellKnownFolders.sent, {
|
||||
type: 'Outbox',
|
||||
path: config.outboxMailboxPath
|
||||
},
|
||||
wellKnownFolders.drafts,
|
||||
wellKnownFolders.trash
|
||||
];
|
||||
|
||||
var foldersChanged = false; // indicates if are there any new/removed folders?
|
||||
|
||||
// check for added folders
|
||||
folders.forEach(function(folder) {
|
||||
if (!_.findWhere(self._account.folders, {
|
||||
path: folder.path
|
||||
})) {
|
||||
// add the missing folder
|
||||
self._account.folders.push(folder);
|
||||
foldersChanged = true;
|
||||
}
|
||||
});
|
||||
|
||||
// check for deleted folders
|
||||
self._account.folders.forEach(function(folder) {
|
||||
if (!_.findWhere(folders, {
|
||||
path: folder.path
|
||||
})) {
|
||||
// remove the obsolete folder
|
||||
self._account.folders.splice(self._account.folder.indexOf(folder), 1);
|
||||
foldersChanged = true;
|
||||
}
|
||||
});
|
||||
|
||||
// if folder have changed, we need to persist them to disk.
|
||||
if (!foldersChanged) {
|
||||
readMessagesFromDisk();
|
||||
return;
|
||||
}
|
||||
|
||||
// persist encrypted list in device storage
|
||||
// NB! persis the array we received from IMAP! do *not* persist self._account.folders with all the messages...
|
||||
self._devicestorage.storeList([folders], folderDbType, function(err) {
|
||||
if (err) {
|
||||
done(err);
|
||||
return;
|
||||
}
|
||||
|
||||
readMessagesFromDisk();
|
||||
});
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// fill uninitialized folders with the locally available messages
|
||||
function readMessagesFromDisk() {
|
||||
if (!self._account.folders || self._account.folders.length === 0) {
|
||||
done();
|
||||
return;
|
||||
// fetch list from local cache
|
||||
self._devicestorage.listItems(folderDbType, 0, null, function(err, stored) {
|
||||
if (err) {
|
||||
return done(err);
|
||||
}
|
||||
|
||||
var after = _.after(self._account.folders.length, done);
|
||||
|
||||
self._account.folders.forEach(function(folder) {
|
||||
if (folder.messages) {
|
||||
// the folder is already initialized
|
||||
after();
|
||||
return;
|
||||
}
|
||||
|
||||
// sync messages from disk to the folder model
|
||||
self.refreshFolder({
|
||||
folder: folder
|
||||
}, function(err) {
|
||||
if (err) {
|
||||
done(err);
|
||||
return;
|
||||
}
|
||||
|
||||
after();
|
||||
});
|
||||
});
|
||||
}
|
||||
self._account.folders = stored[0] || [];
|
||||
self._initMessagesFromDisk(done);
|
||||
});
|
||||
|
||||
function done(err) {
|
||||
self._account.busy = false; // stop the spinner
|
||||
@ -1245,6 +1148,115 @@ define(function(require) {
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Updates the folder information from imap (if we're online). Adds/removes folders in account.folders,
|
||||
* if we added/removed folder in IMAP. If we have an uninitialized folder that lacks folder.messages,
|
||||
* all the locally available messages are loaded from memory.
|
||||
*
|
||||
* @param {Function} callback Invoked when the folders are up to date
|
||||
*/
|
||||
EmailDAO.prototype._initFoldersFromImap = function(callback) {
|
||||
var self = this,
|
||||
folderDbType = 'folders';
|
||||
|
||||
self._account.busy = true; // start the spinner
|
||||
|
||||
// fetch list from imap server
|
||||
self._imapClient.listWellKnownFolders(function(err, wellKnownFolders) {
|
||||
if (err) {
|
||||
return done(err);
|
||||
}
|
||||
|
||||
// this array is dropped directly into the ui to create the folder list
|
||||
var folders = [
|
||||
wellKnownFolders.inbox,
|
||||
wellKnownFolders.sent, {
|
||||
type: 'Outbox',
|
||||
path: config.outboxMailboxPath
|
||||
},
|
||||
wellKnownFolders.drafts,
|
||||
wellKnownFolders.trash
|
||||
];
|
||||
|
||||
var foldersChanged = false; // indicates if are there any new/removed folders?
|
||||
|
||||
// check for added folders
|
||||
folders.forEach(function(folder) {
|
||||
if (!_.findWhere(self._account.folders, {
|
||||
path: folder.path
|
||||
})) {
|
||||
// add the missing folder
|
||||
self._account.folders.push(folder);
|
||||
foldersChanged = true;
|
||||
}
|
||||
});
|
||||
|
||||
// check for deleted folders
|
||||
self._account.folders.forEach(function(folder) {
|
||||
if (!_.findWhere(folders, {
|
||||
path: folder.path
|
||||
})) {
|
||||
// remove the obsolete folder
|
||||
self._account.folders.splice(self._account.folder.indexOf(folder), 1);
|
||||
foldersChanged = true;
|
||||
}
|
||||
});
|
||||
|
||||
// if folder have changed, we need to persist them to disk.
|
||||
if (!foldersChanged) {
|
||||
return self._initMessagesFromDisk(done);
|
||||
}
|
||||
|
||||
// persist encrypted list in device storage
|
||||
// NB! persis the array we received from IMAP! do *not* persist self._account.folders with all the messages...
|
||||
self._devicestorage.storeList([folders], folderDbType, function(err) {
|
||||
if (err) {
|
||||
return done(err);
|
||||
}
|
||||
|
||||
self._initMessagesFromDisk(done);
|
||||
});
|
||||
});
|
||||
|
||||
function done(err) {
|
||||
self._account.busy = false; // stop the spinner
|
||||
callback(err);
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Fill uninitialized folders with the locally available messages.
|
||||
*
|
||||
* @param {Function} callback Invoked when the folders are filled with messages
|
||||
*/
|
||||
EmailDAO.prototype._initMessagesFromDisk = function(callback) {
|
||||
var self = this;
|
||||
|
||||
if (!self._account.folders || self._account.folders.length === 0) {
|
||||
return callback();
|
||||
}
|
||||
|
||||
var after = _.after(self._account.folders.length, callback);
|
||||
|
||||
self._account.folders.forEach(function(folder) {
|
||||
if (folder.messages) {
|
||||
// the folder is already initialized
|
||||
return after();
|
||||
}
|
||||
|
||||
// sync messages from disk to the folder model
|
||||
self.refreshFolder({
|
||||
folder: folder
|
||||
}, function(err) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
after();
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
//
|
||||
//
|
||||
|
||||
@ -130,7 +130,7 @@ define(function(require) {
|
||||
|
||||
beforeEach(function() {
|
||||
delete dao._account;
|
||||
initFoldersStub = sinon.stub(dao, '_initFolders');
|
||||
initFoldersStub = sinon.stub(dao, '_initFoldersFromDisk');
|
||||
});
|
||||
|
||||
it('should initialize folders and return keypair', function(done) {
|
||||
@ -1486,7 +1486,7 @@ define(function(require) {
|
||||
var initFoldersStub;
|
||||
|
||||
beforeEach(function() {
|
||||
initFoldersStub = sinon.stub(dao, '_initFolders');
|
||||
initFoldersStub = sinon.stub(dao, '_initFoldersFromImap');
|
||||
delete dao._imapClient;
|
||||
delete dao._pgpMailer;
|
||||
});
|
||||
@ -1610,50 +1610,51 @@ define(function(require) {
|
||||
|
||||
|
||||
describe('internal API', function() {
|
||||
describe('#_initFolders', function() {
|
||||
var refreshFolderStub;
|
||||
|
||||
describe('#_initFoldersFromDisk', function() {
|
||||
beforeEach(function() {
|
||||
refreshFolderStub = sinon.stub(dao, 'refreshFolder');
|
||||
sinon.stub(dao, 'refreshFolder');
|
||||
});
|
||||
|
||||
it('should initialize from disk if offline and not refresh folder', function(done) {
|
||||
account.online = false;
|
||||
devicestorageStub.listItems.withArgs('folders').yieldsAsync(null, [
|
||||
[inboxFolder]
|
||||
]);
|
||||
refreshFolderStub.withArgs({
|
||||
dao.refreshFolder.withArgs({
|
||||
folder: inboxFolder
|
||||
}).yieldsAsync();
|
||||
|
||||
dao._initFolders(function(err) {
|
||||
dao._initFoldersFromDisk(function(err) {
|
||||
expect(err).to.not.exist;
|
||||
expect(devicestorageStub.listItems.calledOnce).to.be.true;
|
||||
expect(refreshFolderStub.called).to.be.false;
|
||||
expect(dao.refreshFolder.called).to.be.false;
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should initialize from disk if offline and refresh folder', function(done) {
|
||||
account.online = false;
|
||||
delete inboxFolder.messages;
|
||||
devicestorageStub.listItems.withArgs('folders').yieldsAsync(null, [
|
||||
[inboxFolder]
|
||||
]);
|
||||
refreshFolderStub.withArgs({
|
||||
dao.refreshFolder.withArgs({
|
||||
folder: inboxFolder
|
||||
}).yieldsAsync();
|
||||
|
||||
dao._initFolders(function(err) {
|
||||
dao._initFoldersFromDisk(function(err) {
|
||||
expect(err).to.not.exist;
|
||||
expect(devicestorageStub.listItems.calledOnce).to.be.true;
|
||||
expect(refreshFolderStub.calledOnce).to.be.true;
|
||||
expect(dao.refreshFolder.calledOnce).to.be.true;
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('#_initFoldersFromImap', function() {
|
||||
beforeEach(function() {
|
||||
sinon.stub(dao, 'refreshFolder');
|
||||
});
|
||||
|
||||
it('should initialize from imap if online', function(done) {
|
||||
account.online = true;
|
||||
account.folders = [];
|
||||
imapClientStub.listWellKnownFolders.yieldsAsync(null, {
|
||||
inbox: inboxFolder,
|
||||
@ -1671,9 +1672,9 @@ define(function(require) {
|
||||
return true;
|
||||
}), 'folders').yieldsAsync();
|
||||
|
||||
refreshFolderStub.yieldsAsync();
|
||||
dao.refreshFolder.yieldsAsync();
|
||||
|
||||
dao._initFolders(function(err) {
|
||||
dao._initFoldersFromImap(function(err) {
|
||||
expect(err).to.not.exist;
|
||||
expect(imapClientStub.listWellKnownFolders.calledOnce).to.be.true;
|
||||
expect(devicestorageStub.storeList.calledOnce).to.be.true;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user