From f3ec314d07a480c5adb2e3202d1e8420afedfb03 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Mon, 1 Dec 2014 16:55:30 -0300 Subject: [PATCH 1/2] fixed tests for EmailStore plugin --- plugins/emailstore.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/emailstore.js b/plugins/emailstore.js index 41b2074..229b78a 100644 --- a/plugins/emailstore.js +++ b/plugins/emailstore.js @@ -396,6 +396,9 @@ emailPlugin.db.del(valueKey(email, key), function(error) { if (error) { logger.error(error); + if (error.notFound) { + return callback(emailPlugin.errors.NOT_FOUND); + } return callback(emailPlugin.errors.INTERNAL_ERROR); } return emailPlugin.checkAndUpdateItemCounter(email, null, null, callback); @@ -415,7 +418,7 @@ emailPlugin.db.del(validatedKey(email), cb); } ], function(err) { - if (err) { + if (err && !err.notFound) { logger.error(err); return callback(emailPlugin.errors.INTERNAL_ERROR); } From 6e765b36ef9779790dceed3d9535ad3bf558f17b Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Mon, 1 Dec 2014 17:32:18 -0300 Subject: [PATCH 2/2] fixed tests --- test/test.EmailStore.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/test.EmailStore.js b/test/test.EmailStore.js index ffe2229..ac89845 100644 --- a/test/test.EmailStore.js +++ b/test/test.EmailStore.js @@ -288,6 +288,12 @@ describe('emailstore test', function() { plugin.exists.onFirstCall().callsArgWith(1, null, false); plugin.savePassphrase = sinon.stub(); plugin.savePassphrase.onFirstCall().callsArg(2); + plugin.isConfirmed = sinon.stub(); + plugin.isConfirmed.onFirstCall().callsArgWith(1, null, false); + plugin.checkSizeQuota = sinon.stub(); + plugin.checkSizeQuota.onFirstCall().callsArgWith(3, null); + plugin.checkAndUpdateItemQuota = sinon.stub(); + plugin.checkAndUpdateItemQuota.onFirstCall().callsArgWith(3, null); plugin.saveEncryptedData = sinon.stub(); plugin.saveEncryptedData.onFirstCall().callsArg(3); plugin.createVerificationSecretAndSendEmail = sinon.stub(); @@ -317,6 +323,12 @@ describe('emailstore test', function() { plugin.exists.onFirstCall().callsArgWith(1, null, true); plugin.checkPassphrase = sinon.stub(); plugin.checkPassphrase.onFirstCall().callsArgWith(2, null, true); + plugin.isConfirmed = sinon.stub(); + plugin.isConfirmed.onFirstCall().callsArgWith(1, null, false); + plugin.checkSizeQuota = sinon.stub(); + plugin.checkSizeQuota.onFirstCall().callsArgWith(3, null); + plugin.checkAndUpdateItemQuota = sinon.stub(); + plugin.checkAndUpdateItemQuota.onFirstCall().callsArgWith(3, null); plugin.saveEncryptedData = sinon.stub(); plugin.saveEncryptedData.onFirstCall().callsArg(3); plugin.createVerificationSecretAndSendEmail = sinon.stub(); @@ -385,6 +397,10 @@ describe('emailstore test', function() { }); it('deletes a stored element (key)', function(done) { leveldb_stub.del.onFirstCall().callsArg(1); + + plugin.checkAndUpdateItemCounter = sinon.stub(); + plugin.checkAndUpdateItemCounter.onFirstCall().callsArg(3); + plugin.deleteByEmailAndKey(fakeEmail, fakeKey, function(err) { expect(err).to.be.undefined; done(); @@ -440,6 +456,7 @@ describe('emailstore test', function() { response.send.onFirstCall().returnsThis(); plugin.addValidationHeader = sinon.stub().callsArg(2); + plugin.addValidationAndQuotaHeader = sinon.stub().callsArg(2); plugin.retrieve(request, response);