aboutsummaryrefslogtreecommitdiff
path: root/javascript/test/olm.spec.js
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2018-10-03 16:22:13 +0100
committerDavid Baker <dave@matrix.org>2018-10-03 16:22:13 +0100
commit877166dedc0d25e9404ff429219e19e940aa80af (patch)
tree62c8db0be9032ab88666413f106c1d2115410aaf /javascript/test/olm.spec.js
parent3e775938e50bffdfcb20241d598fea74ddaaf7e0 (diff)
parent00384ba87a5943a8a12c9b8bfcb8903cc9be490f (diff)
Merge branch 'dbkr/wasm' into dbkr/ci2
Diffstat (limited to 'javascript/test/olm.spec.js')
-rw-r--r--javascript/test/olm.spec.js18
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() {