integration test: -v--version return vizzu version

veghdev · veghdev · commit cc3af32a5ae7 · 2021-11-24T18:06:21.000+01:00
diff --git a/test/integration/integration.test.js b/test/integration/integration.test.js
@@ -1,6 +1,7 @@
 const path = require("path");
 const yargs = require("yargs");
 
+const VizzuVersion = require("./modules/integration-test/version/vizzu-version");
 const TestSuite = require("./modules/integration-test/test-suite.js");
 
 
@@ -32,8 +33,10 @@ try {
         .help("h")
         .alias("h", "help")
 
-        .version("0.1.0")
+        .version(false)
+        .boolean("version")
         .alias("v", "version")
+        .describe("v", "Show version number of Vizzu")
 
         .array("c")
         .alias("c", "configs")
@@ -135,7 +138,13 @@ try {
 
         .argv;
 
-    if (!argv.delete) {
+    if (argv.version) {
+        VizzuVersion.get(argv.vizzu).then(vizzuVersion => {
+            console.log(vizzuVersion);
+        });
+    } else if (argv.delete) {
+        TestSuite.del();
+    } else {
         let testSuite = new TestSuite(
             argv.configs,
             argv._,
@@ -151,8 +160,6 @@ try {
         testSuite.test().catch(err => {
             catchError(err);
         });
-    } else {
-        TestSuite.del();
     }
 } catch (err) {
     catchError(err);
diff --git a/test/integration/modules/integration-test/test-suite.js b/test/integration/modules/integration-test/test-suite.js
@@ -54,7 +54,7 @@ class TestSuite {
         noLogs,
         browsersNum,
         browserGui,
-        cfgVizzuUrl,
+        vizzuUrl,
         createImages,
         createHashes
     ) {
@@ -65,7 +65,7 @@ class TestSuite {
             this.#cnsl.getTestSuiteLogPath(),
             this.#cnsl.getTimeStamp());
 
-        this.#vizzuUrl = cfgVizzuUrl;
+        this.#vizzuUrl = vizzuUrl;
 
         this.#createImages = createImages;
         this.#createHashes = createHashes;
diff --git a/test/integration/modules/integration-test/version/index.html b/test/integration/modules/integration-test/version/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Loading...</title>
+		<meta charset="utf-8"/>
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+	</head>
+<body>
+	<canvas id="vizzuCanvas" style="width:640px; height:360px;"></canvas>
+	<script id="vizzuVersion" type="module" src="index.js"></script>
+</body>
+</html>
diff --git a/test/integration/modules/integration-test/version/index.js b/test/integration/modules/integration-test/version/index.js
@@ -0,0 +1,28 @@
+function catchError(err) {
+    console.error(err)
+    let errMsg = err.toString();
+    if (err.stack !== undefined) {
+        errMsg = err.stack;
+    }
+    window.vizzuVersion = errMsg;
+    document.title = "Finished";
+}
+
+
+try {
+    let queryString = window.location.search;
+    let urlParams = new URLSearchParams(queryString);
+    let vizzuUrl = urlParams.get("vizzuUrl");
+
+    import(vizzuUrl).then(vizzuModule => {
+        let Vizzu = vizzuModule.default;
+        let chart = new Vizzu("vizzuCanvas");
+        return chart.initializing;
+    }).then(chart => {
+        window.vizzuVersion = chart.version();
+        document.title = "Finished";
+        return;
+    }).catch((err) => { catchError(err); });
+} catch (err) {
+    catchError(err);
+}
diff --git a/test/integration/modules/integration-test/version/vizzu-version.js b/test/integration/modules/integration-test/version/vizzu-version.js
@@ -0,0 +1,42 @@
+const path = require("path");
+
+const WorkspaceHost = require("../../../modules/workspace/workspace-host.js");
+const BrowserChrome = require("../../../modules/browser/chrome.js");
+const VizzuUrl = require("../../../modules/integration-test/vizzu-url.js");
+const TestEnv = require("../../../modules/integration-test/test-env.js");
+
+
+class VizzuVersion {
+
+    static get(vizzuUrl) {
+        return new Promise((resolve, reject) => {
+            let vizzuUrlReady = VizzuUrl.resolveVizzuUrl(vizzuUrl, TestEnv.getWorkspacePath(), TestEnv.getTestSuitePath());
+            vizzuUrlReady.then(vizzuUrl => {
+                let workspaceHost = new WorkspaceHost(TestEnv.getWorkspacePath());
+                let workspaceHostReady = workspaceHost.serverPortReady();
+                let browserChrome = new BrowserChrome();
+                let browserChromeReady = browserChrome.initializing;
+                Promise.all([workspaceHostReady, browserChromeReady]).then(([workspaceHostServerPort]) => {
+                    if (vizzuUrl.startsWith("/")) {
+                        vizzuUrl = "/" + path.relative(TestEnv.getWorkspacePath(), vizzuUrl);
+                    }
+                    browserChrome.getUrl("http://127.0.0.1:" + String(workspaceHostServerPort)
+                        + "/test/integration/modules/integration-test/version/index.html"
+                        + "?vizzuUrl=" + vizzuUrl)
+                        .then(() => {
+                            browserChrome.waitUntilTitleIs("Finished", 1000000).then(() => {
+                                browserChrome.executeScript("return vizzuVersion").then(VizzuVersion => {
+                                    browserChrome.closeBrowser();
+                                    workspaceHost.closeServer();
+                                    return resolve(VizzuVersion);
+                                })
+                            });
+                        });
+                });                
+            });
+        });
+    }
+}
+
+
+module.exports = VizzuVersion;
