suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable spy call expecations on the web worker

Browse Source
This commit is contained in:
mmso 2018-02-13 17:21:20 +01:00
parent 7a2c3578bf
commit 2a504e4e1a
No known key found for this signature in database
GPG Key ID: 954AFC83B3C56A54
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/general/openpgp.js
View File

@ -210,6 +210,11 @@ function withCompression(tests) {
return options; return options;
}, },
function() { function() {
// Disable the call expectations when using the web worker because it's not possible to spy on what functions get called.
if (openpgp.getWorker()) {
return;
}
if (compression === openpgp.enums.compression.uncompressed) { if (compression === openpgp.enums.compression.uncompressed) {
expect(compressSpy.called).to.be.false; expect(compressSpy.called).to.be.false;
expect(decompressSpy.called).to.be.false; expect(decompressSpy.called).to.be.false;
@ -632,7 +637,6 @@ describe('OpenPGP.js public api tests', function() {
sessionKeys: decryptedSessionKeys[0], sessionKeys: decryptedSessionKeys[0],
message message
}); });
}).then(function (decrypted) { }).then(function (decrypted) {
expect(decrypted.data).to.equal(plaintext); expect(decrypted.data).to.equal(plaintext);
verifyCompressionDecrypted(decrypted); verifyCompressionDecrypted(decrypted);
@ -1382,14 +1386,13 @@ describe('OpenPGP.js public api tests', function() {
publicKeys: pubKeyDE, publicKeys: pubKeyDE,
message: openpgp.message.readArmored(encrypted.data) message: openpgp.message.readArmored(encrypted.data)
}); });
}).then(function (encrypted) { }).then(function (decrypted) {
expect(encrypted.data).to.exist; expect(decrypted.data).to.exist;
expect(encrypted.data).to.equal(plaintext); expect(decrypted.data).to.equal(plaintext);
expect(encrypted.signatures[0].valid).to.be.true; expect(decrypted.signatures[0].valid).to.be.true;
verifyCompressionDecrypted(encrypted);
return privKeyDE.verifyPrimaryUser().then(() => { return privKeyDE.verifyPrimaryUser().then(() => {
expect(encrypted.signatures[0].keyid.toHex()).to.equal(privKeyDE.getSigningKeyPacket().getKeyId().toHex()); expect(decrypted.signatures[0].keyid.toHex()).to.equal(privKeyDE.getSigningKeyPacket().getKeyId().toHex());
expect(encrypted.signatures[0].signature.packets.length).to.equal(1); expect(decrypted.signatures[0].signature.packets.length).to.equal(1);
}); });
}); });
}); });