diff --git a/test/integration/main.js b/test/integration/main.js index 96bb4085..4f26593f 100644 --- a/test/integration/main.js +++ b/test/integration/main.js @@ -4,11 +4,15 @@ require.config({ baseUrl: './', paths: { - openpgp: '../../resources/openpgp' + openpgp: '../../resources/openpgp', + jquery: '../../resources/jquery.min' }, shim: { openpgp: { exports: 'window' + }, + jquery: { + exports: 'window' } } }); @@ -22,4 +26,4 @@ require( // require modules loaded -> run tests mocha.run(); } -); \ No newline at end of file +); diff --git a/test/integration/pgp.js b/test/integration/pgp.js index bfbbf1cd..f664f04d 100644 --- a/test/integration/pgp.js +++ b/test/integration/pgp.js @@ -1,11 +1,15 @@ /** * High level crypto api that handles all calls to OpenPGP.js */ +function showMessages(str) { +}; + define(function(require) { 'use strict'; var openpgp = require('openpgp').openpgp, - util = require('openpgp').util; + util = require('openpgp').util, + jquery = require('jquery').jquery; var PGP = function() { openpgp.init(); @@ -131,7 +135,8 @@ define(function(require) { */ PGP.prototype.decrypt = function(ciphertext, senderKey, callback) { var privateKey = openpgp.keyring.exportPrivateKey(0).obj; - senderKey = openpgp.read_publicKey(senderKey)[0]; + var publicKey = openpgp.read_publicKey(senderKey)[0]; + var pubKeys = [{armored: senderKey, obj: publicKey, keyId: publicKey.getKeyId()}]; var msg = openpgp.read_message(ciphertext)[0]; var keymat = null; @@ -159,7 +164,7 @@ define(function(require) { } } if (keymat !== null) { - var decrypted = msg.decryptAndVerifySignature(keymat, sesskey, senderKey); + var decrypted = msg.decryptAndVerifySignature(keymat, sesskey, pubKeys); callback(null, decrypted); } else { @@ -170,4 +175,4 @@ define(function(require) { }; return PGP; -}); \ No newline at end of file +});