diff options
| author | David Baker <dbkr@users.noreply.github.com> | 2018-10-10 20:07:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-10 20:07:19 +0100 |
| commit | 3cfcf1615dfe434e1aa10d5c904d537b159e1566 (patch) | |
| tree | dc1271227d8cef2bf6a687e0b31e288c99d274d6 /javascript/test/olm.spec.js | |
| parent | 713e9aeb4d63732f7671f9c7ac3d9c4897449583 (diff) | |
| parent | 1dbb060c44423048d9782b9a9977e51cc8f43b8d (diff) | |
Merge pull request #57 from matrix-org/dbkr/wasm
WebAssembly support
Diffstat (limited to 'javascript/test/olm.spec.js')
| -rw-r--r-- | javascript/test/olm.spec.js | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/javascript/test/olm.spec.js b/javascript/test/olm.spec.js index b7cc3ae..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. @@ -30,11 +31,18 @@ describe("olm", function() { var aliceAccount, bobAccount; var aliceSession, bobSession; - beforeEach(function() { - aliceAccount = new Olm.Account(); - bobAccount = new Olm.Account(); - aliceSession = new Olm.Session(); - bobSession = new Olm.Session(); + beforeEach(function(done) { + // This should really be in a beforeAll, but jasmine-node + // doesn't support that + debugger; + Olm.init().then(function() { + aliceAccount = new Olm.Account(); + bobAccount = new Olm.Account(); + aliceSession = new Olm.Session(); + bobSession = new Olm.Session(); + + done(); + }); }); afterEach(function() { |