From 60122a2c2d68c9b04f2a95d2b06ef9fae546f247 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Wed, 22 Dec 2021 13:51:47 -0500 Subject: [PATCH] switch to jasmine (instead of jasmine-node) for JavaScript tests --- javascript/package.json | 4 ++-- javascript/test/jasmine.json | 6 ++++++ javascript/test/sas.spec.js | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 javascript/test/jasmine.json diff --git a/javascript/package.json b/javascript/package.json index 7a5306b..86aec13 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -14,7 +14,7 @@ ], "scripts": { "build": "make -C .. js", - "test": "jasmine-node test --verbose --junitreport --captureExceptions" + "test": "jasmine --config=test/jasmine.json" }, "repository": { "type": "git", @@ -30,7 +30,7 @@ }, "homepage": "https://gitlab.matrix.org/matrix-org/olm", "devDependencies": { - "jasmine-node": "^1.14.5" + "jasmine": "^3.0.0" }, "publishConfig": { "@matrix-org:registry":"https://gitlab.matrix.org/api/v4/projects/27/packages/npm/" diff --git a/javascript/test/jasmine.json b/javascript/test/jasmine.json new file mode 100644 index 0000000..373965e --- /dev/null +++ b/javascript/test/jasmine.json @@ -0,0 +1,6 @@ +{ + "spec_dir": "test", + "spec_files": [ + "**/*.spec.js" + ] +} diff --git a/javascript/test/sas.spec.js b/javascript/test/sas.spec.js index 4ab4120..126ed02 100644 --- a/javascript/test/sas.spec.js +++ b/javascript/test/sas.spec.js @@ -19,7 +19,7 @@ var Olm = require('../olm'); describe("sas", function() { var alice, bob; - beforeEach(async function(done) { + beforeEach(function(done) { Olm.init().then(function() { alice = new Olm.SAS(); bob = new Olm.SAS();