moparisthebest/mail
1
0
Fork 0
mirror of https://github.com/moparisthebest/mail synced 2025-02-07 02:20:14 -05:00
Code Issues Releases Wiki Activity

rename _mark

Browse Source
This commit is contained in:
Felix Hammerl 2013-12-05 19:10:30 +01:00
parent 7e2f0b0284
commit 65c61b2a09
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/dao/email-dao.js
View File

@ -305,7 +305,7 @@ define(function(require) {
}); });
deltaF1.forEach(function(message) { deltaF1.forEach(function(message) {
self._mark({ self._imapMark({
folder: folder.path, folder: folder.path,
uid: message.uid, uid: message.uid,
unread: message.unread, unread: message.unread,
@ -581,7 +581,7 @@ define(function(require) {
} }
// public key has been verified, mark the message as read, delete it, and ignore it in the future // public key has been verified, mark the message as read, delete it, and ignore it in the future
self._mark({ self._imapMark({
folder: options.folder, folder: options.folder,
uid: email.uid, uid: email.uid,
unread: false unread: false
@ -661,7 +661,7 @@ define(function(require) {
} }
}; };
EmailDAO.prototype._mark = function(options, callback) { EmailDAO.prototype._imapMark = function(options, callback) {
this._imapClient.updateFlags({ this._imapClient.updateFlags({
path: options.folder, path: options.folder,
uid: options.uid, uid: options.uid,

24
test/new-unit/email-dao-test.js
View File

@ -1241,7 +1241,7 @@ define(function(require) {
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]);
imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail); imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail);
keychainStub.verifyPublicKey.withArgs(verificationUuid).yields(); keychainStub.verifyPublicKey.withArgs(verificationUuid).yields();
markReadStub = sinon.stub(dao, '_mark').withArgs({ markReadStub = sinon.stub(dao, '_imapMark').withArgs({
folder: folder, folder: folder,
uid: verificationMail.uid, uid: verificationMail.uid,
unread: false unread: false
@ -1291,7 +1291,7 @@ define(function(require) {
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]);
imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail); imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail);
keychainStub.verifyPublicKey.yields(); keychainStub.verifyPublicKey.yields();
markReadStub = sinon.stub(dao, '_mark').yields(); markReadStub = sinon.stub(dao, '_imapMark').yields();
imapDeleteStub = sinon.stub(dao, '_imapDeleteMessage').yields({}); imapDeleteStub = sinon.stub(dao, '_imapDeleteMessage').yields({});
dao.sync({ dao.sync({
@ -1334,7 +1334,7 @@ define(function(require) {
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]);
imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail); imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail);
keychainStub.verifyPublicKey.yields(); keychainStub.verifyPublicKey.yields();
markReadStub = sinon.stub(dao, '_mark').yields({}); markReadStub = sinon.stub(dao, '_imapMark').yields({});
imapDeleteStub = sinon.stub(dao, '_imapDeleteMessage'); imapDeleteStub = sinon.stub(dao, '_imapDeleteMessage');
dao.sync({ dao.sync({
@ -1377,7 +1377,7 @@ define(function(require) {
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]);
imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail); imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail);
keychainStub.verifyPublicKey.yields({}); keychainStub.verifyPublicKey.yields({});
markReadStub = sinon.stub(dao, '_mark'); markReadStub = sinon.stub(dao, '_imapMark');
imapDeleteStub = sinon.stub(dao, '_imapDeleteMessage'); imapDeleteStub = sinon.stub(dao, '_imapDeleteMessage');
dao.sync({ dao.sync({
@ -1421,7 +1421,7 @@ define(function(require) {
localListStub = sinon.stub(dao, '_localListMessages').yields(null, []); localListStub = sinon.stub(dao, '_localListMessages').yields(null, []);
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]);
imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail); imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail);
markReadStub = sinon.stub(dao, '_mark'); markReadStub = sinon.stub(dao, '_imapMark');
imapDeleteStub = sinon.stub(dao, '_imapDeleteMessage'); imapDeleteStub = sinon.stub(dao, '_imapDeleteMessage');
dao.sync({ dao.sync({
@ -1464,7 +1464,7 @@ define(function(require) {
localListStub = sinon.stub(dao, '_localListMessages').yields(null, []); localListStub = sinon.stub(dao, '_localListMessages').yields(null, []);
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [verificationMail]);
imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail); imapGetStub = sinon.stub(dao, '_imapGetMessage').yields(null, verificationMail);
markReadStub = sinon.stub(dao, '_mark'); markReadStub = sinon.stub(dao, '_imapMark');
imapDeleteStub = sinon.stub(dao, '_imapDeleteMessage'); imapDeleteStub = sinon.stub(dao, '_imapDeleteMessage');
dao.sync({ dao.sync({
@ -1509,7 +1509,7 @@ define(function(require) {
localListStub = sinon.stub(dao, '_localListMessages').yields(null, [inStorage]); localListStub = sinon.stub(dao, '_localListMessages').yields(null, [inStorage]);
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [inImap]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [inImap]);
markStub = sinon.stub(dao, '_mark').withArgs({ markStub = sinon.stub(dao, '_imapMark').withArgs({
folder: folder, folder: folder,
uid: dummyDecryptedMail.uid, uid: dummyDecryptedMail.uid,
unread: dummyDecryptedMail.unread, unread: dummyDecryptedMail.unread,
@ -1560,7 +1560,7 @@ define(function(require) {
localListStub = sinon.stub(dao, '_localListMessages').yields(null, [inStorage]); localListStub = sinon.stub(dao, '_localListMessages').yields(null, [inStorage]);
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [inImap]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [inImap]);
markStub = sinon.stub(dao, '_mark').yields(); markStub = sinon.stub(dao, '_imapMark').yields();
localStoreStub = sinon.stub(dao, '_localStoreMessages').yields({}); localStoreStub = sinon.stub(dao, '_localStoreMessages').yields({});
dao.sync({ dao.sync({
@ -1596,7 +1596,7 @@ define(function(require) {
localListStub = sinon.stub(dao, '_localListMessages').yields(null, [inStorage]); localListStub = sinon.stub(dao, '_localListMessages').yields(null, [inStorage]);
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [inImap]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [inImap]);
markStub = sinon.stub(dao, '_mark').yields({}); markStub = sinon.stub(dao, '_imapMark').yields({});
localStoreStub = sinon.stub(dao, '_localStoreMessages'); localStoreStub = sinon.stub(dao, '_localStoreMessages');
dao.sync({ dao.sync({
@ -1632,7 +1632,7 @@ define(function(require) {
localListStub = sinon.stub(dao, '_localListMessages').yields(null, [inStorage]); localListStub = sinon.stub(dao, '_localListMessages').yields(null, [inStorage]);
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [inImap]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [inImap]);
markStub = sinon.stub(dao, '_mark'); markStub = sinon.stub(dao, '_imapMark');
localStoreStub = sinon.stub(dao, '_localStoreMessages').withArgs({ localStoreStub = sinon.stub(dao, '_localStoreMessages').withArgs({
folder: folder, folder: folder,
emails: [dummyDecryptedMail] emails: [dummyDecryptedMail]
@ -1680,7 +1680,7 @@ define(function(require) {
localListStub = sinon.stub(dao, '_localListMessages').yields(null, [inStorage]); localListStub = sinon.stub(dao, '_localListMessages').yields(null, [inStorage]);
imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [inImap]); imapListStub = sinon.stub(dao, '_imapListMessages').yields(null, [inImap]);
markStub = sinon.stub(dao, '_mark'); markStub = sinon.stub(dao, '_imapMark');
localStoreStub = sinon.stub(dao, '_localStoreMessages').yields({}); localStoreStub = sinon.stub(dao, '_localStoreMessages').yields({});
dao.sync({ dao.sync({
@ -1718,7 +1718,7 @@ define(function(require) {
answered: false answered: false
}).yields(); }).yields();
dao._mark({ dao._imapMark({
folder: 'asdf', folder: 'asdf',
uid: 1, uid: 1,
unread: false, unread: false,