integration test: manual, test-cases-config fix

Author: veghdev

test/integration/man.js

@@ -0,0 +1,35 @@
+const yargs = require("yargs");
+
+const Manual = require("./modules/manual/manual.js");
+
+
+try {
+    var argv = yargs
+        .usage("Usage: [options]")
+
+        .help("h")
+        .alias("h", "help")
+        .version(false)
+
+        .alias("p", "port")
+        .describe("p", "Change workspace host's port")
+        .nargs("p", 1)
+        .default("p", "8080")
+
+        .array("c")
+        .alias("c", "configs")
+        .nargs("c", 1)
+        .describe("c",
+            "Change the list of config file's path of the test cases" +
+            "\n(relative or absolute path where the repo folder is the root)" +
+            "\n")
+        .default("c",
+            ["/test/integration/test_cases/test_cases.json"])
+        .argv;
+
+    let manual = new Manual(argv.configs, argv.port);
+    manual.runManual();
+} catch (err) {
+    process.exitCode = 1;
+    console.error(err);
+}

test/integration/manual/manual.js

@@ -5,7 +5,7 @@ const path = require("path");
 const fs = require("fs");
 
 const TestEnv = require("../../../modules/integration-test/test-env.js");
-const VizzuUrl = require("../../../modules/integration-test/vizzu-url.js");
+const VizzuUrl = require("../../../modules/vizzu/vizzu-url.js");
 
 
 class TestCaseResult {

test/integration/modules/integration-test/test-case/test-case-result.js

@@ -1,6 +1,6 @@
 const path = require("path");
 
-const VizzuUrl = require("../../../modules/integration-test/vizzu-url.js");
+const VizzuUrl = require("../../../modules/vizzu/vizzu-url.js");
 const TestEnv = require("../../../modules/integration-test/test-env.js");
 const TestCaseResult = require("../../../modules/integration-test/test-case/test-case-result.js");
 

test/integration/modules/integration-test/test-case/test-case.js

@@ -15,10 +15,11 @@ class TestCasesConfig {
             let configsReady = [];
             let configs = {suites: [], tests: {}};
             assert(Array.isArray(configPathList), "configPathList is array");
-            configPathList.forEach((configPath, index) => {
-                configPathList[index] = WorkspacePath.resolvePath(configPath, TestEnv.getWorkspacePath(), TestEnv.getTestSuitePath());
+            let configPathListClone = configPathList.slice();
+            configPathListClone.forEach((configPath, index) => {
+                configPathListClone[index] = WorkspacePath.resolvePath(configPath, TestEnv.getWorkspacePath(), TestEnv.getTestSuitePath());
                 let configReady = new Promise((resolve, reject) => {
-                    TestCasesConfig.readConfig(configPathList[index]).then(config => {
+                    TestCasesConfig.readConfig(configPathListClone[index]).then(config => {
                         const validate = ajv.compile(TestCasesConfig.getConfigSchema());
                         assert(validate(config), "config schema validation failed");
                         let suite = {

test/integration/modules/integration-test/test-case/test-cases-config.js

@@ -49,7 +49,7 @@ class TestSuiteResult {
             this.#cnsl.log(("tests failed:".padEnd(15, " ") + this.#testSuiteResults.FAILED.length).error);
             process.exitCode = 1;
             this.#testSuiteResults.FAILED.forEach(testCase => {
-                this.#cnsl.log("".padEnd(this.#cnsl.getTestStatusPad() + 5, " ") + path.relative(TestEnv.getTestSuitePath(), path.join(TestEnv.getWorkspacePath(), testCase)) + " http://127.0.0.1:8080/test/integration/manual/?version=localhost&testCase=" + testCase);
+                this.#cnsl.log("".padEnd(this.#cnsl.getTestStatusPad() + 5, " ") + path.relative(TestEnv.getTestSuitePath(), path.join(TestEnv.getWorkspacePath(), testCase)) + " http://127.0.0.1:8080/test/integration/modules/manual/client?version=localhost&testCase=" + testCase);
             });
         } else {
             this.#cnsl.log("tests failed:".padEnd(15, " ") + this.#testSuiteResults.FAILED.length);

test/integration/modules/integration-test/test-suite-result.js

@@ -6,7 +6,7 @@ const AggregateErrorReady = import("aggregate-error");
 
 const WorkspaceHost = require("../../modules/workspace/workspace-host.js");
 const BrowsersChrome = require("../../modules/browser/browsers-chrome.js");
-const VizzuUrl = require("../../modules/integration-test/vizzu-url.js");
+const VizzuUrl = require("../../modules/vizzu/vizzu-url.js");
 const TestEnv = require("../../modules/integration-test/test-env.js");
 const TestConsole = require("../../modules/integration-test/test-console.js");
 const TestCase = require("../../modules/integration-test/test-case/test-case.js");
@@ -182,7 +182,7 @@ class TestSuite {
             this.#workspaceHostReady.then(serverPort => {
                 this.#workspaceHostServerPort = serverPort;
                 this.#cnsl.log("[ " + "W. HOST".padEnd(this.#cnsl.getTestStatusPad(), " ") + " ]" + " " + "[ " + "http://127.0.0.1:" + String(serverPort) + " ]");
-            });            
+            });
 
             this.#browsersChrome.setBrowsersNum(((this.#testCases.filteredTestCases.length < this.#browsersChrome.getBrowsersNum()) ?
                 this.#testCases.filteredTestCases.length :

test/integration/modules/integration-test/test-suite.js

@@ -7,15 +7,19 @@ let vizzuUrl = urlParams.get('vizzuUrl');
 let canvas = document.getElementById('vizzuCanvas');
 let chart;
 
-import(vizzuUrl + '/vizzu.js').then(vizzuModule => {
+if (!vizzuUrl.endsWith('/vizzu.js') && !vizzuUrl.endsWith('/vizzu.min.js')) {
+    vizzuUrl = vizzuUrl + '/vizzu.js';
+}
+
+import(vizzuUrl).then(vizzuModule => {
     let Vizzu = vizzuModule.default;
     chart = new Vizzu(canvas);
     return chart.initializing;
 }).then(chart => {
     chart.module._vizzu_setLogging(true);
     console.log(chart.version());
     initSlider(chart);
-    return import('/test/integration/test_cases/' + testCase + '.mjs')
+    return import(testCase + '.mjs');
 }).then(testModule => {
     let anim = chart.initializing;
     for (let step of testModule.default) anim = anim.then(step);