From 1c7e9d627decbc784502ddd8229c031e02359992 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Mon, 30 Sep 2024 01:35:24 +0200 Subject: [PATCH] Updating tests --- common/.mocharc.jsonc | 4 ++-- common/test/hooks.mjs | 4 ++-- common/test/math/domain.mjs | 2 +- scripts/run-tests.sh | 6 ++++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/common/.mocharc.jsonc b/common/.mocharc.jsonc index 5fa553a..56a6b31 100644 --- a/common/.mocharc.jsonc +++ b/common/.mocharc.jsonc @@ -20,6 +20,6 @@ "recursive": true, "require": [ "esm", - "./tests/js/hooks.mjs" + "./test/hooks.mjs" ] -} \ No newline at end of file +} diff --git a/common/test/hooks.mjs b/common/test/hooks.mjs index 8c3e929..e48525e 100644 --- a/common/test/hooks.mjs +++ b/common/test/hooks.mjs @@ -19,7 +19,7 @@ import * as fs from "./mock/fs.mjs"; import Qt from "./mock/qt.mjs"; import { MockHelper } from "./mock/helper.mjs"; import { MockLatex } from "./mock/latex.mjs"; -import Modules from "../../LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/module/index.mjs"; +import Modules from "../src/module/index.mjs"; function setup() { globalThis.Helper = new MockHelper() @@ -27,4 +27,4 @@ function setup() { Modules.Latex.initialize({ latex: Latex, helper: Helper }) } -setup() \ No newline at end of file +setup() diff --git a/common/test/math/domain.mjs b/common/test/math/domain.mjs index 6c185d4..c00384f 100644 --- a/common/test/math/domain.mjs +++ b/common/test/math/domain.mjs @@ -19,7 +19,7 @@ import { describe, it } from "mocha" import { expect } from "chai" -import { Domain, parseDomainSimple } from "../../../LogarithmPlotter/qml/eu/ad5001/LogarithmPlotter/js/math/domain.mjs" +import { Domain, parseDomainSimple } from "../../src/math/domain.mjs" describe("math.domain", function() { describe("#parseDomainSimple", function() { diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh index ac612f4..21b1f41 100644 --- a/scripts/run-tests.sh +++ b/scripts/run-tests.sh @@ -6,6 +6,12 @@ bash scripts/build.sh # Run python tests cp -r runtime-pyside6/tests build/runtime-pyside6 +cp -r ci CHANGELOG.md build/runtime-pyside6 +cd build/runtime-pyside6 || exit 1 PYTHONPATH="$PYTHONPATH:." pytest --cov=LogarithmPlotter --cov-report term-missing . +cd ../../ + +# Run js tests +cd common npm test