From 8636ba201ba2640420a3f063b5c8b3364499cf45 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Wed, 5 Aug 2015 14:10:29 +0200 Subject: [PATCH] Properly mock publickey requests --- test/integration/email-dao-test.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/integration/email-dao-test.js b/test/integration/email-dao-test.js index fcb5b57..3ab9b53 100644 --- a/test/integration/email-dao-test.js +++ b/test/integration/email-dao-test.js @@ -249,6 +249,7 @@ describe('Email DAO integration tests', function() { function onCleaned() { userStorage = accountService._accountStore; auth = accountService._auth; + emailDao = accountService._emailDao; auth.setCredentials({ emailAddress: testAccount.user, @@ -257,19 +258,17 @@ describe('Email DAO integration tests', function() { imap: {} // a preconfigured smtpclient with mocked tcp sockets }); + // stub rest request to key server + sinon.stub(emailDao._keychain._publicKeyDao, 'get').returns(resolves(mockKeyPair.publicKey)); + sinon.stub(emailDao._keychain._publicKeyDao, 'getByUserId').returns(resolves(mockKeyPair.publicKey)); + auth.init().then(function() { accountService.init({ emailAddress: testAccount.user }).then(function() { - emailDao = accountService._emailDao; - // retrieve the pgpbuilder from the emaildao and initialize the pgpmailer with the existing pgpbuilder pgpMailer = new PgpMailer({}, emailDao._pgpbuilder); - // stub rest request to key server - sinon.stub(emailDao._keychain._publicKeyDao, 'get').returns(resolves(mockKeyPair.publicKey)); - sinon.stub(emailDao._keychain._publicKeyDao, 'getByUserId').returns(resolves(mockKeyPair.publicKey)); - emailDao.unlock({ passphrase: testAccount.pass, keypair: mockKeyPair