brought regression-test back to life

Author: Erwin Dondorp

docs/README.md

@@ -593,12 +593,12 @@ Then browse to [http://localhost:3333/](http://localhost:3333/), you can login w
 ## Testing
 We provide some functional tests and unit tests. They use the docker setup to run the functional tests. You will also need [yarn](https://yarnpkg.com) and [node.js](https://nodejs.org/en/) to run them. When you have docker, yarn and node.js installed, you can run the tests from the root of the repository like this:
 ```
-bash runtests.bash
+sh runtests.sh
 ```
 
 To show the browser window + a debugger while running the functional tests you can run:
 ```
-NIGHTMARE_DEBUG=1 bash runtests.bash
+NIGHTMARE_DEBUG=1 sh runtests.sh
 ```
 
 We use the following testing libraries:

runtests.bash runtests.shruntests.bash renamed to runtests.sh

@@ -1,14 +1,15 @@
-#!/bin/bash
+#!/bin/sh
 
-sudo systemctl stop salt-master salt-api
+# show what is going on
+set -x
 
-sudo apt install -y libxss1 libgconf-2-4 libnss3 libasound2
+# get the needed software
+sudo apt install -y libxss1 libgconf-2-4 libnss3 libasound2 xvfb psmisc
 
-# always cleanup the docker images when something goes wrong
-function cleanupdocker {
-    docker-compose --file docker/docker-compose.yml rm --force --stop
-}
-trap cleanupdocker EXIT
+# prevent conflict with a running salt installation
+sudo systemctl stop salt-master salt-api
+# or a previous running xvfb
+killall Xvfb
 
 set -e
 
@@ -36,8 +37,17 @@ docker-compose --file docker/docker-compose.yml up -d
 npm run wait-for-docker
 
 # run the nightmare.js functional tests
-export DEBUG=nightmare:*,electron:*
-export NIGHTMARE_DEBUG=1
-npm run test:functional
+# when debugging is needed:
+#export DEBUG=nightmare:*,electron:*
+#export NIGHTMARE_DEBUG=1
+# suppress Electron Security Warnings:
+export ELECTRON_DISABLE_SECURITY_WARNINGS=true
+xvfb-run npm run test:functional
+
+# remove the containers
+docker-compose --file docker/docker-compose.yml rm --force --stop
+
+# start the usual software again
+sudo systemctl start salt-master salt-api
 
-set +e
+echo "DONE!"

saltgui/static/scripts/index.js

@@ -3,3 +3,25 @@
 /* istanbul ignore file */
 import {Router} from "./Router.js";
 window.addEventListener("load", () => new Router());
+
+/* eslint-disable func-names */
+// Make sure the errors are shown during regression testing
+window.onerror = function (msg, url, lineNo, columnNo, error) {
+  console.log("JS Error:" + msg + ",error:" + error + ",url:" + url + "@" + lineNo + ":" + columnNo);
+  if (error && error.stack) {
+    console.log("Stack:" + error.stack);
+  }
+  return false;
+};
+
+// simple polyfill solution
+if (!Object.fromEntries) {
+  Object.fromEntries = function (pairs) {
+    const obj = {};
+    for (const pair of pairs) {
+      obj[pair[0]] = pair[1];
+    }
+    return obj;
+  }
+}
+/* eslint-enable func-names */

tests/functional/login.js

@@ -1,4 +1,4 @@
-/* global beforeEach describe it process */
+/* global afterEach beforeEach describe it process */
 
 import Nightmare from "nightmare";
 import {assert} from "chai";
@@ -26,34 +26,51 @@ describe("Funtional tests", function () {
     };
 
     if (process.env.NIGHTMARE_DEBUG === "1") {
+      console.log("NIGHTMARE_DEBUG=1, setting additional options");
+
       // show the browser and the debug window
       options.openDevTools = true;
       // to show in a separate window
       // options.openDevTools = { mode: "detach" };
-      options.show = true;
     }
 
     browser = new Nightmare(options);
-    browser.
+
+    browser.on('console', (type, message) => {
+      console.log(`[console][${type}] ` + JSON.stringify(message, null, 2));
+    });
+
+    browser.on('page', (type, message, stack) => {
+      console.error(`[page-error][${type}] ${JSON.stringify(message)}`);
+      if (stack) {
+        console.error('stack:', stack);
+      }
+    });
+
+    return browser.
       goto(url).
       wait(1000);
   });
 
+  /* eslint-disable arrow-body-style */
+  afterEach(() => {
+    return browser.end();
+  });
+  /* eslint-enable arrow-body-style */
+
   describe("Login and logout", () => {
 
     it("we should be redirected to the login page", (done) => {
       browser.
         wait(() => document.location.href.includes("login")).
         wait(500).
         evaluate(() => document.location.href).
-        end().
         then((href) => {
           href = href.replace(/[?]reason=.*/, "");
-          assert.equal(href, url + "login");
-          return true;
+          assert.equal(href, url);
         }).
         then(done).
-        catch(done);
+        catch((err) => done(err));
     });
 
     it("we cannot login with false credentials", (done) => {
@@ -67,10 +84,8 @@ describe("Funtional tests", function () {
         wait("#notice-wrapper div.notice_auth_failed").
         wait(1000).
         evaluate(() => document.querySelector("#notice-wrapper div").textContent).
-        end().
         then((message) => {
           assert.equal(message, "Authentication failed");
-          return true;
         }).
         then(done).
         catch(done);
@@ -91,10 +106,8 @@ describe("Funtional tests", function () {
         }).
         wait(1000).
         evaluate(() => document.location.href).
-        end().
         then((href) => {
-          assert.equal(href, url);
-          return true;
+          assert.equal(href, url + "#minions");
         }).
         then(done).
         catch(done);
@@ -125,11 +138,9 @@ describe("Funtional tests", function () {
         wait(() => document.location.href.includes("login")).
         wait(1000).
         evaluate(() => document.location.href).
-        end().
         then((href) => {
           // and we redirected to the login page
-          assert.equal(href, url + "login?reason=logout");
-          return true;
+          assert.equal(href, url + "?reason=logout#login");
         }).
         then(done).
         catch(done);