aboutsummaryrefslogtreecommitdiff
path: root/javascript/test/pk.spec.js
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-09-25 17:13:29 +0100
committerDavid Baker <dave@matrix.org>2018-09-25 17:13:29 +0100
commit263b94428a24caaa5b899ed7f73b896620e6cdf4 (patch)
treedacfa7322ee472d9a09e4bd56805bae0aad215c9 /javascript/test/pk.spec.js
parentf29d8cdd7bf1faf8294f51624c633fb05c9a0e2f (diff)
Another day, another interface
Change the interface again, hopefully this time a bit more normal. Now we wrap the emscripten module completely and just expose the high level objects. The olm library export is now imported as normal (ie. returns a module rather than a function returning a module) but has an `init` method which *must* be called. This returns a promise which resolves when the module is ready. It also rejects if the module failed to set up, unlike before (and unlike the promise-not-a-promise that emscripten returns). Generally catch failures to init the module.
Diffstat (limited to 'javascript/test/pk.spec.js')
-rw-r--r--javascript/test/pk.spec.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/javascript/test/pk.spec.js b/javascript/test/pk.spec.js
index 9f7dbfd..007882f 100644
--- a/javascript/test/pk.spec.js
+++ b/javascript/test/pk.spec.js
@@ -16,7 +16,7 @@ limitations under the License.
"use strict";
-var Olm = require('../olm')();
+var Olm = require('../olm');
if (!Object.keys) {
Object.keys = function(o) {
@@ -30,12 +30,12 @@ describe("pk", function() {
var encryption, decryption;
beforeEach(function(done) {
- Olm.then(function() {
+ Olm.init().then(function() {
+ encryption = new Olm.PkEncryption();
+ decryption = new Olm.PkDecryption();
+
done();
});
-
- encryption = new Olm.PkEncryption();
- decryption = new Olm.PkDecryption();
});
afterEach(function () {