Merge pull request #258 from veghdev/integrationtest_vizzu

Integration test option to use custom ref vizzulib

Author: simzer

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

@@ -15,16 +15,18 @@ class TestCaseResult {
 
   #browserChrome;
   #vizzuUrl;
+  #vizzuRefUrl;
 
   #runTestCaseRef;
 
-  constructor(testCaseObj, testData, browserChrome, vizzuUrl, runTestCaseRef) {
+  constructor(testCaseObj, testData, browserChrome, vizzuUrl, vizzuRefUrl, runTestCaseRef) {
     this.#cnsl = testCaseObj.cnsl;
 
     this.#testCaseObj = testCaseObj;
     this.#testData = testData;
     this.#browserChrome = browserChrome;
     this.#vizzuUrl = vizzuUrl;
+    this.#vizzuRefUrl = vizzuRefUrl;
 
     this.#runTestCaseRef = runTestCaseRef;
   }
@@ -118,11 +120,11 @@ class TestCaseResult {
       } else {
         if (
           this.#testCaseObj.createImages !== "DISABLED" &&
-          !this.#vizzuUrl.includes(VizzuUrl.getRemoteStableBucket())
+          this.#vizzuUrl !== this.#vizzuRefUrl
         ) {
           let testCaseObj = Object.assign({}, this.#testCaseObj);
           testCaseObj.createImages = "ALL";
-          this.#runTestCaseRef(testCaseObj, this.#browserChrome).then(
+          this.#runTestCaseRef(testCaseObj, this.#browserChrome, this.#vizzuRefUrl).then(
             (testDataRef) => {
               let failureMsgs = [];
               this.#createImage(testDataRef, "-2ref");

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

@@ -5,7 +5,7 @@ const TestEnv = require("../../../modules/integration-test/test-env.js");
 const TestCaseResult = require("../../../modules/integration-test/test-case/test-case-result.js");
 
 class TestCase {
-  static runTestCase(testCaseObj, vizzuUrl) {
+  static runTestCase(testCaseObj, vizzuUrl, vizzuRefUrl) {
     return new Promise((resolve, reject) => {
       let browserChrome = testCaseObj.browsersChrome.shiftBrowser();
       TestCase.runTestCaseClient(testCaseObj, browserChrome, vizzuUrl).then(
@@ -17,6 +17,7 @@ class TestCase {
             testData,
             browserChrome,
             vizzuUrl,
+            vizzuRefUrl,
             TestCase.runTestCaseRef
           );
           testCaseResult.createTestCaseResult().then(() => {
@@ -28,10 +29,8 @@ class TestCase {
     });
   }
 
-  static runTestCaseRef(testCaseObj, browserChrome) {
+  static runTestCaseRef(testCaseObj, browserChrome, vizzuUrl) {
     return new Promise((resolve, reject) => {
-      let vizzuUrl =
-        VizzuUrl.getRemoteStableBucket() + "/lib" + VizzuUrl.getVizzuMinJs();
       TestCase.runTestCaseClient(testCaseObj, browserChrome, vizzuUrl)
         .then((testDataRef) => {
           return resolve(testDataRef);

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

@@ -23,6 +23,8 @@ class TestSuite {
 
   #vizzuUrl;
   #vizzuUrlReady;
+  #vizzuRefUrl;
+  #vizzuRefUrlReady;
 
   #workspaceHost;
   #workspaceHostReady;
@@ -54,6 +56,7 @@ class TestSuite {
     browsersNum,
     browserGui,
     vizzuUrl,
+    vizzuRefUrl,
     Werror,
     createImages,
     createHashes
@@ -69,6 +72,7 @@ class TestSuite {
     );
 
     this.#vizzuUrl = vizzuUrl;
+    this.#vizzuRefUrl = vizzuRefUrl;
 
     this.#Werror = Werror;
     this.#createImages = createImages;
@@ -136,7 +140,7 @@ class TestSuite {
                   cnsl: this.#cnsl,
                 };
                 return limit(() =>
-                  TestCase.runTestCase(testCaseObj, this.#vizzuUrl)
+                  TestCase.runTestCase(testCaseObj, this.#vizzuUrl, this.#vizzuRefUrl)
                 );
               }
             );
@@ -239,6 +243,25 @@ class TestSuite {
         );
       });
 
+      this.#vizzuRefUrlReady = VizzuUrl.resolveVizzuUrl(
+        this.#vizzuRefUrl,
+        TestEnv.getWorkspacePath(),
+        TestEnv.getTestSuitePath()
+      );
+      startTestSuiteReady.push(this.#vizzuRefUrlReady);
+      this.#vizzuRefUrlReady.then((url) => {
+        this.#vizzuRefUrl = url;
+        this.#cnsl.log(
+          "[ " +
+            "V.R. URL".padEnd(this.#cnsl.getTestStatusPad(), " ") +
+            " ]" +
+            " " +
+            "[ " +
+            url +
+            " ]"
+        );
+      });
+
       this.#workspaceHost = new WorkspaceHost(TestEnv.getWorkspacePath());
       this.#workspaceHostReady = this.#workspaceHost.serverPortReady();
       startTestSuiteReady.push(this.#workspaceHostReady);

test/integration/test.js

@@ -112,6 +112,25 @@ try {
     )
     .default("vizzu", "/example/lib/vizzu.js")
 
+    .string("vizzu-ref")
+    .nargs("vizzu-ref", 1)
+    .describe(
+      "vizzu-ref",
+      "Change reference Vizzu url" +
+        "\n(can be forced to use vizzu.js or vizzu.min.js if its given)" +
+        '\n\n- "head": select the last stable Vizzu from the main branch' +
+        "\n(default: vizzu.min.js)" +
+        "\n\n- [sha]: select Vizzu with a short commit number" +
+        "\n(default: vizzu.min.js)" +
+        "\n\n- [version]: select Vizzu with a version number" +
+        "\n(vizzu.min.js only)" +
+        "\n\n- path: select Vizzu from the local file system" +
+        "\n(relative or absolute path where the repo folder is the root)" +
+        "\n(default: vizzu.js)" +
+        "\n"
+    )
+    .default("vizzu-ref", "head")
+
     .boolean("g")
     .alias("g", "gui")
     .describe("g", "Use browser with graphical user interface" + "\n")
@@ -177,6 +196,7 @@ try {
       argv.browsers,
       argv.gui,
       argv.vizzu,
+      argv.vizzuRef,
       (argv.Werror || []),
       argv.images,
       argv.hashes