Merge pull request #17 from vizzuhq/veghdev

manual improvements

Author: simzer

test/integration/manual/index.js

@@ -3,6 +3,7 @@ import ImgDiff from './imgdiff.js';
 let queryString = window.location.search;
 let urlParams = new URLSearchParams(queryString);
 let urlTestCase = urlParams.get('testCase');
+let urlVersion = urlParams.get('version');
 
 let vizzuUrl = document.getElementById('vizzuUrl');
 let vizzuRefUrl = 'https://vizzu-lib-main.storage.googleapis.com/lib';
@@ -72,8 +73,11 @@ function populateLibs()
 			let url = data[name];
 			vizzuUrl.innerHTML += `<option value='${url}'>${name}</option>`;
 		}
-		let lastSelected = localStorage.getItem('vizzuUrl');
-		if (lastSelected === '') lastSelected = data['localhost'];
+        let lastSelected = localStorage.getItem('vizzuUrl');
+        if (urlVersion) {
+            lastSelected = data[urlVersion];
+        }
+        if (lastSelected === '') lastSelected = data['localhost']; 
 		vizzuUrl.value = lastSelected;
 		populateCases();
 	});

test/integration/manual/manual.js

@@ -37,19 +37,27 @@ class Manual {
         this.#server.get('/getLibList', (req, res) => {
             let libList = { localhost: 'http://127.0.0.1:' + this.#port + '/example/lib' };
             libList['HEAD'] = 'https://' + remoteStableBucket + '/lib';
+            this.#getLibJson().then(vizzuList => {
+                vizzuList.slice().reverse().forEach(vizzu => {
+                    libList[vizzu.time.substring(0,10) + ' ' + vizzu.time.substring(11,16)  + ' ' + vizzu.sha] = 'https://' + remoteLatestBucket + '/' + vizzu.sha;
+                });
+                //libList['0.3.1'] = 'https://cdn.jsdelivr.net/npm/[email protected]/dist';
+                //libList['0.3.0'] = 'https://cdn.jsdelivr.net/npm/[email protected]/dist';
+                libList['0.2.0'] = 'https://vizzuhq.github.io/vizzu-beta-release/0.2.0';
+                res.send(libList);
+            });
+        });
+    }
+
+    #getLibJson() {
+        return new Promise(resolve => {
             fetch('https://' + remoteCloudFunctions + '/getVizzuList').then(vizzuListUrl => {
                 vizzuListUrl.json().then(vizzuList => {
-                    vizzuList.slice().reverse().forEach(vizzu => {
-                        libList[vizzu.time.substring(0,10) + ' ' + vizzu.time.substring(11,16)  + ' ' + vizzu.sha] = 'https://' + remoteLatestBucket + '/' + vizzu.sha;
-                    });
-                    //libList['0.3.1'] = 'https://cdn.jsdelivr.net/npm/[email protected]/dist';
-                    //libList['0.3.0'] = 'https://cdn.jsdelivr.net/npm/[email protected]/dist';
-                    libList['0.2.0'] = 'https://vizzuhq.github.io/vizzu-beta-release/0.2.0';
-                    res.send(libList);
-                }).catch((err) => { 
-                    console.log(err)
+                    resolve(vizzuList);
+                }).catch((err) => {
+                    resolve(this.#getLibJson())
                 });
-            }); 
+            });
         });
     }
 

test/integration/vizzutest.js

@@ -231,7 +231,7 @@ try {
                 console.error(('tests failed:'.padEnd(15, ' ') + this.#testSuiteResults.FAILED.length).error);
                 process.exitCode = 1;
                 this.#testSuiteResults.FAILED.forEach(testCase => {
-                    console.error(''.padEnd(padLength + 5, ' ') + testCase);
+                    console.error(''.padEnd(padLength + 5, ' ') + testCase + ' http://127.0.0.1:8080/test/integration/manual/?version=localhost&testCase=' + testCase);
                 });
             } else {
                 console.log('tests failed:'.padEnd(15, ' ') + this.#testSuiteResults.FAILED.length);