From 263b94428a24caaa5b899ed7f73b896620e6cdf4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 25 Sep 2018 17:13:29 +0100
Subject: 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.
---
 javascript/test/megolm.spec.js | 10 ++++++----
 javascript/test/olm.spec.js    | 16 +++++++++-------
 javascript/test/pk.spec.js     | 10 +++++-----
 3 files changed, 20 insertions(+), 16 deletions(-)

(limited to 'javascript/test')

diff --git a/javascript/test/megolm.spec.js b/javascript/test/megolm.spec.js
index 9d5eb72..241d4bd 100644
--- a/javascript/test/megolm.spec.js
+++ b/javascript/test/megolm.spec.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,17 +17,18 @@ limitations under the License.
 
 "use strict";
 
-var Olm = require('../olm')();
+var Olm = require('../olm');
 
 describe("megolm", function() {
     var aliceSession, bobSession;
 
     beforeEach(function(done) {
-        Olm.then(function() {
+        Olm.init().then(function() {
+            aliceSession = new Olm.OutboundGroupSession();
+            bobSession = new Olm.InboundGroupSession();
+
             done();
         });
-        aliceSession = new Olm.OutboundGroupSession();
-        bobSession = new Olm.InboundGroupSession();
     });
 
     afterEach(function() {
diff --git a/javascript/test/olm.spec.js b/javascript/test/olm.spec.js
index 94fa87b..77dd712 100644
--- a/javascript/test/olm.spec.js
+++ b/javascript/test/olm.spec.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,7 +17,7 @@ limitations under the License.
 
 "use strict";
 
-var Olm = require('../olm')();
+var Olm = require('../olm');
 
 if (!Object.keys) {
     Object.keys = function(o) {
@@ -33,14 +34,15 @@ describe("olm", function() {
     beforeEach(function(done) {
         // This should really be in a beforeAll, but jasmine-node
         // doesn't support that
-        Olm.then(function() {
+        debugger;
+        Olm.init().then(function() {
+            aliceAccount = new Olm.Account();
+            bobAccount = new Olm.Account();
+            aliceSession = new Olm.Session();
+            bobSession = new Olm.Session();
+
             done();
         });
-
-        aliceAccount = new Olm.Account();
-        bobAccount = new Olm.Account();
-        aliceSession = new Olm.Session();
-        bobSession = new Olm.Session();
     });
 
     afterEach(function() {
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 () {
-- 
cgit v1.2.3