diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2018-10-12 17:02:51 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2018-10-12 17:02:51 -0400 |
| commit | 5cf074d3372f1e189fe410a075013adefabb1aa5 (patch) | |
| tree | a72a96fafab69e62b5083cbe1933b4e34e9a72d5 /javascript/test/olm.spec.js | |
| parent | ac071d9c0d69e4330a06f171e3bddc713ecd97d6 (diff) | |
| parent | af86a9a8b899eeb3c1c464cb0c54218acd788fa6 (diff) | |
Merge branch 'master' into poljar
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() { |