1.0.37

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tstest",
-  "version": "1.0.34",
+  "version": "1.0.37",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1567,16 +1567,31 @@
       }
     },
     "@pushrocks/tapbundle": {
-      "version": "3.2.1",
+      "version": "3.2.7",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.2.1.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2ftapbundle/-/tapbundle-3.2.7.tgz",
-      "integrity": "sha512-D3o205SE+Viu8sukm+6CvGkXEwOiQiEEcga9eWyvjWS4vDx6FWwrO0pNZkQq6GqsKQ9xRpCmBtI7F3KsJR0+PA==",
+      "integrity": "sha512-RBRjuJs3v/biKypc9rSecApn7IXRdmr/jbVH86+2mDxyzUQ8IcMhaKhUrIjKoNyvxvMAMS2j+OxPyiOCnK6RAw==",
       "dev": true,
       "requires": {
-        "@pushrocks/early": "^3.0.3",
+        "@pushrocks/smartdelay": "^2.0.9",
-        "@pushrocks/smartdelay": "^2.0.3",
+        "@pushrocks/smartenv": "^4.0.10",
-        "@pushrocks/smartfile": "^7.0.9",
         "@pushrocks/smartpromise": "^3.0.2",
+        "@pushrocks/smarttime": "^3.0.19",
         "smartchai": "^2.0.1"
+      },
+      "dependencies": {
+        "@pushrocks/smarttime": {
+          "version": "3.0.19",
+          "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarttime/-/smarttime-3.0.19.tgz",
+          "integrity": "sha512-1iSkNJcF632Mikcd/EvcBPC1T5tLRZqTHjVkuZlXpaNY11eZIzYVMOn5/ZDfLp2GuEi6hhIbEx9zwsdoYqz5cA==",
+          "dev": true,
+          "requires": {
+            "@pushrocks/smartdelay": "^2.0.9",
+            "@pushrocks/smartpromise": "^3.0.2",
+            "croner": "^1.1.23",
+            "dayjs": "^1.8.27",
+            "is-nan": "^1.3.0"
+          }
+        }
       }
     },
     "@pushrocks/webrequest": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tstest",
-  "version": "1.0.34",
+  "version": "1.0.37",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
   "main": "dist_ts/index.js",
@@ -11,7 +11,7 @@
     "tstest": "./cli.js"
   },
   "scripts": {
-    "test": "(npm run cleanUp && npm run prepareTest && npm run tstest && npm run cleanUp)",
+    "test": "(npm run cleanUp && npm run prepareTest && npm run tstest)",
     "prepareTest": "git clone https://gitlab.com/sandboxzone/sandbox-npmts.git .nogit/sandbox-npmts && cd .nogit/sandbox-npmts && npm install",
     "tstest": "cd .nogit/sandbox-npmts && node ../../cli.ts.js test/ --web",
     "cleanUp": "rm -rf .nogit/sandbox-npmts",
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
-    "@pushrocks/tapbundle": "^3.0.13",
+    "@pushrocks/tapbundle": "^3.2.7",
     "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0"
   },

ts/tstest.classes.tap.parser.ts

@@ -113,7 +113,7 @@ export class TapParser {
    * returns all tests that threw an error
    */
   public getErrorTests() {
-    return this.testStore.filter(tapTestArg => {
+    return this.testStore.filter((tapTestArg) => {
       return !tapTestArg.testOk;
     });
   }
@@ -140,49 +140,54 @@ export class TapParser {
    * handles a tap process
    * @param childProcessArg
    */
-  async handleTapProcess(childProcessArg: ChildProcess) {
+  public async handleTapProcess(childProcessArg: ChildProcess) {
     const done = plugins.smartpromise.defer();
-    childProcessArg.stdout.on('data', data => {
+    childProcessArg.stdout.on('data', (data) => {
       this._processLog(data);
     });
-    childProcessArg.stderr.on('data', data => {
+    childProcessArg.stderr.on('data', (data) => {
       this._processLog(data);
     });
-    childProcessArg.on('exit', () => {
+    childProcessArg.on('exit', async () => {
-      this.receivedTests = this.testStore.length;
+      await this._evaluateResult();
-
-      // check wether all tests ran
-      if (this.expectedTests === this.receivedTests) {
-        console.log(
-          `${logPrefixes.TapPrefix} ${cs(
-            `${this.receivedTests} out of ${this.expectedTests} Tests completed!`,
-            'green'
-          )}`
-        );
-      } else {
-        console.log(
-          `${logPrefixes.TapErrorPrefix} ${cs(
-            `Only ${this.receivedTests} out of ${this.expectedTests} completed!`,
-            'red'
-          )}`
-        );
-      }
-      if (this.getErrorTests().length === 0) {
-        console.log(`${logPrefixes.TapPrefix} ${cs(`All tests are successfull!!!`, 'green')}`);
-      } else {
-        console.log(
-          `${logPrefixes.TapPrefix} ${cs(
-            `${this.getErrorTests().length} tests threw an error!!!`,
-            'red'
-          )}`
-        );
-      }
       done.resolve();
     });
     await done.promise;
   }
 
-  public handleTapLog(tapLog: string) {
+  public async handleTapLog(tapLog: string) {
     this._processLog(tapLog);
+    await this._evaluateResult();
+  }
+
+  private async _evaluateResult() {
+    this.receivedTests = this.testStore.length;
+
+    // check wether all tests ran
+    if (this.expectedTests === this.receivedTests) {
+      console.log(
+        `${logPrefixes.TapPrefix} ${cs(
+          `${this.receivedTests} out of ${this.expectedTests} Tests completed!`,
+          'green'
+        )}`
+      );
+    } else {
+      console.log(
+        `${logPrefixes.TapErrorPrefix} ${cs(
+          `Only ${this.receivedTests} out of ${this.expectedTests} completed!`,
+          'red'
+        )}`
+      );
+    }
+    if (this.getErrorTests().length === 0) {
+      console.log(`${logPrefixes.TapPrefix} ${cs(`All tests are successfull!!!`, 'green')}`);
+    } else {
+      console.log(
+        `${logPrefixes.TapPrefix} ${cs(
+          `${this.getErrorTests().length} tests threw an error!!!`,
+          'red'
+        )}`
+      );
+    }
   }
 }

ts/tstest.classes.tstest.ts

@@ -39,7 +39,7 @@ export class TsTest {
     const tapCombinator = new TapCombinator(); // lets create the TapCombinator
     for (const fileNameArg of fileNamesToRun) {
       let tapParser: TapParser;
-      switch(true) {
+      switch (true) {
         case fileNameArg.endsWith('.browser.ts'):
           tapParser = await this.runInChrome(fileNameArg);
           break;
@@ -48,6 +48,8 @@ export class TsTest {
           break;
       }
       tapCombinator.addTapParser(tapParser);
+      console.log(cs(`^`.repeat(16), 'cyan'));
+      console.log(''); // force new line
     }
     tapCombinator.evaluate();
   }
@@ -67,8 +69,6 @@ export class TsTest {
       `tsrun ${fileNameArg}${tsrunOptions}`
     );
     await tapParser.handleTapProcess(execResultStreaming.childProcess);
-    console.log(cs(`^`.repeat(16), 'cyan'));
-    console.log(''); // force new line
     return tapParser;
   }
 
@@ -88,36 +88,98 @@ export class TsTest {
     // lets create a server
     const server = new plugins.smartexpress.Server({
       cors: true,
-      port: 3007
+      port: 3007,
     });
-    server.addRoute('/test', new plugins.smartexpress.Handler('GET', async (req, res) => {
+    server.addRoute(
-      res.type('.html');
+      '/test',
-      res.write(`
+      new plugins.smartexpress.Handler('GET', async (req, res) => {
+        res.type('.html');
+        res.write(`
         <html>
-          <head></head>
+          <head>
+            <script>
+              globalThis.testdom = true;
+            </script>
+          </head>
           <body></body>
         </html>
       `);
-      res.end();
+        res.end();
-    }));
+      })
+    );
     server.addRoute('*', new plugins.smartexpress.HandlerStatic(tsbundleCacheDirPath));
     await server.start();
 
     // lets do the browser bit
     await this.smartbrowserInstance.start();
-    const evaluation = await this.smartbrowserInstance.evaluateOnPage('http://localhost:3007/test', async () => {
+    const evaluation = await this.smartbrowserInstance.evaluateOnPage(
-      const logStore = 'hello';
+      `http://localhost:3007/test?bundleName=${bundleFileName}`,
-      const log = console.log.bind(console);
+      async () => {
-      console.log = (...args) => {
+        const convertToText = (obj) => {
-        log('My Console!!!');
+          // create an array that will later be joined into a string.
-        log(...args);
+          const stringArray = [];
-      };
+
-      const script = document.createElement('script');
+          if (typeof obj === 'object' && obj.join === undefined) {
-      script.src = '/test__test.browser.ts.js';
+            stringArray.push('{');
-      document.head.appendChild(script);
+            for (const prop of Object.keys(obj)) {
-      return logStore;
+              stringArray.push(prop, ': ', convertToText(obj[prop]), ',');
-    });
+            }
-    await plugins.smartdelay.delayFor(1000);
+            stringArray.push('}');
+
+            // is array
+          } else if (typeof obj === 'object' && !(obj.join === undefined)) {
+            stringArray.push('[');
+            for (const prop of Object.keys(obj)) {
+              stringArray.push(convertToText(obj[prop]), ',');
+            }
+            stringArray.push(']');
+
+            // is function
+          } else if (typeof obj === 'function') {
+            stringArray.push(obj.toString());
+
+            // all other values can be done with JSON.stringify
+          } else {
+            stringArray.push(JSON.stringify(obj));
+          }
+
+          return stringArray.join('');
+        };
+
+        let logStore = 'Starting log capture\n';
+        // tslint:disable-next-line: max-classes-per-file
+        const log = console.log.bind(console);
+        console.log = (...args) => {
+          args = args.map((argument) => {
+            return typeof argument !== 'string' ? convertToText(argument) : argument;
+          });
+          logStore += `${args}\n`;
+          log(...args);
+        };
+        const error = console.error;
+        console.error = (...args) => {
+          args = args.map((argument) => {
+            return typeof argument !== 'string' ? convertToText(argument) : argument;
+          });
+          logStore += `${args}\n`;
+          error(...args);
+        };
+        const bundle = await (await fetch('/test__test.browser.ts.js')).text();
+        try  {
+          // tslint:disable-next-line: no-eval
+          eval(bundle);
+        } catch (err) {
+          console.error(err);
+        }
+        
+        if (globalThis.tapbundleDeferred && globalThis.tapbundleDeferred.promise) {
+          await globalThis.tapbundleDeferred.promise;
+        } else {
+          console.log('Error: Could not find tapbundle Deferred');
+        }
+        return logStore;
+      }
+    );
     await this.smartbrowserInstance.stop();
     console.log(`${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} chromium instance.`);
     await server.stop();