diff options
author | David Baker <dave@matrix.org> | 2018-09-25 17:13:29 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2018-09-25 17:13:29 +0100 |
commit | 263b94428a24caaa5b899ed7f73b896620e6cdf4 (patch) | |
tree | dacfa7322ee472d9a09e4bd56805bae0aad215c9 /javascript/test/megolm.spec.js | |
parent | f29d8cdd7bf1faf8294f51624c633fb05c9a0e2f (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/megolm.spec.js')
-rw-r--r-- | javascript/test/megolm.spec.js | 10 |
1 files changed, 6 insertions, 4 deletions
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() { |