1.0.54

.gitlab-ci.yml

@@ -19,23 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    # - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitzone/tstest",
-  "version": "1.0.36",
+  "version": "1.0.54",
   "private": false,
   "description": "a test utility to run tests that match test/**/*.ts",
   "main": "dist_ts/index.js",
@@ -18,22 +18,22 @@
     "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "tslint": "^6.1.2",
+    "@gitzone/tsbuild": "^2.1.25",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@gitzone/tsbundle": "^1.0.72",
+    "@gitzone/tsbundle": "^1.0.80",
     "@gitzone/tsrun": "^1.2.12",
     "@pushrocks/consolecolor": "^2.0.1",
     "@pushrocks/smartbrowser": "^1.0.17",
-    "@pushrocks/smartdelay": "^2.0.9",
-    "@pushrocks/smartexpress": "^3.0.73",
-    "@pushrocks/smartfile": "^7.0.6",
-    "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartdelay": "^2.0.10",
+    "@pushrocks/smartexpress": "^3.0.100",
+    "@pushrocks/smartfile": "^8.0.10",
+    "@pushrocks/smartlog": "^2.0.39",
+    "@pushrocks/smartpromise": "^3.1.5",
     "@pushrocks/smartshell": "^2.0.25",
+    "@pushrocks/tapbundle": "^3.2.14",
     "@types/figures": "^3.0.1",
     "figures": "^3.0.0"
   },
@@ -48,5 +48,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

readme.md

@@ -19,12 +19,15 @@ TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x
 node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
 Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
 PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@gitzone/tstest)](https://lossless.cloud)
-PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tstest)](https://lossless.cloud)
+PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@gitzone/tstest)](https://lossless.cloud)
 BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@gitzone/tstest)](https://lossless.cloud)
 Platform support | [![Supports Windows 10](https://badgen.net/badge/supports%20Windows%2010/yes/green?icon=windows)](https://lossless.cloud) [![Supports Mac OS X](https://badgen.net/badge/supports%20Mac%20OS%20X/yes/green?icon=apple)](https://lossless.cloud)
 
 ## Usage
 
+## Contribution
+
+We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
 
 ## Contribution
 

ts/tstest.classes.tap.combinator.ts

@@ -20,7 +20,24 @@ export class TapCombinator {
 
     let failGlobal = false; // determine wether tstest should fail
     for (const tapParser of this.tapParserStore) {
-      if (tapParser.getErrorTests().length === 0) {
+      if (!tapParser.expectedTests) {
+        failGlobal = true;
+        let overviewString =
+          logPrefixes.TsTestPrefix +
+          cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') +
+          ` ${plugins.figures.pointer} ` +
+          `does not specify tests!`;
+        console.log(overviewString);
+      } else if (tapParser.expectedTests !== tapParser.receivedTests) {
+        failGlobal = true;
+        let overviewString =
+          logPrefixes.TsTestPrefix +
+          cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') +
+          ` ${plugins.figures.pointer} ` +
+          tapParser.getTestOverviewAsString() +
+          `did not execute all specified tests!`;
+        console.log(overviewString);
+      } else if (tapParser.getErrorTests().length === 0) {
         let overviewString =
           logPrefixes.TsTestPrefix +
           cs(` ${tapParser.fileName} ${plugins.figures.tick}`, 'green') +
@@ -28,13 +45,13 @@ export class TapCombinator {
           tapParser.getTestOverviewAsString();
         console.log(overviewString);
       } else {
+        failGlobal = true;
         let overviewString =
           logPrefixes.TsTestPrefix +
           cs(` ${tapParser.fileName} ${plugins.figures.cross}`, 'red') +
           ` ${plugins.figures.pointer} ` +
           tapParser.getTestOverviewAsString();
         console.log(overviewString);
-        failGlobal = true;
       }
     }
     console.log(cs(plugins.figures.hamburger.repeat(48), 'cyan'));

ts/tstest.classes.tap.parser.ts

@@ -179,7 +179,16 @@ export class TapParser {
         )}`
       );
     }
-    if (this.getErrorTests().length === 0) {
+    if (!this.expectedTests) {
+      console.log(cs('Error: No tests were defined. Therefore the testfile failed!', 'red'));
+    } else if (this.expectedTests !== this.receivedTests) {
+      console.log(
+        cs(
+          'Error: The amount of received tests and expectedTests is unequal! Therefore the testfile failed',
+          'red'
+        )
+      );
+    } else if (this.getErrorTests().length === 0) {
       console.log(`${logPrefixes.TapPrefix} ${cs(`All tests are successfull!!!`, 'green')}`);
     } else {
       console.log(

ts/tstest.classes.tstest.ts

@@ -7,7 +7,6 @@ import { coloredString as cs } from '@pushrocks/consolecolor';
 import { TestDirectory } from './tstest.classes.testdirectory';
 import { TapCombinator } from './tstest.classes.tap.combinator';
 import { TapParser } from './tstest.classes.tap.parser';
-import { threeEighths } from 'figures';
 
 export class TsTest {
   public testDir: TestDirectory;
@@ -38,16 +37,34 @@ export class TsTest {
 
     const tapCombinator = new TapCombinator(); // lets create the TapCombinator
     for (const fileNameArg of fileNamesToRun) {
-      let tapParser: TapParser;
       switch (true) {
+        case process.env.CI && fileNameArg.includes('.nonci.'):
+          console.log('!!!!!!!!!!!');
+          console.log(
+            `not running testfile ${fileNameArg}, sinc we are CI and file name includes '.nonci.' tag`
+          );
+          console.log('!!!!!!!!!!!');
+          break;
         case fileNameArg.endsWith('.browser.ts'):
-          tapParser = await this.runInChrome(fileNameArg);
+          const tapParserBrowser = await this.runInChrome(fileNameArg);
+          tapCombinator.addTapParser(tapParserBrowser);
+          break;
+        case fileNameArg.endsWith('.both.ts'):
+          console.log('>>>>>>> TEST PART 1: chrome');
+          const tapParserBothBrowser = await this.runInChrome(fileNameArg);
+          tapCombinator.addTapParser(tapParserBothBrowser);
+          console.log(cs(`|`.repeat(16), 'cyan'));
+          console.log(''); // force new line
+          console.log('>>>>>>> TEST PART 2: node');
+          const tapParserBothNode = await this.runInNode(fileNameArg);
+          tapCombinator.addTapParser(tapParserBothNode);
           break;
         default:
-          tapParser = await this.runInNode(fileNameArg);
+          const tapParserNode = await this.runInNode(fileNameArg);
+          tapCombinator.addTapParser(tapParserNode);
           break;
       }
-      tapCombinator.addTapParser(tapParser);
+
       console.log(cs(`^`.repeat(16), 'cyan'));
       console.log(''); // force new line
     }
@@ -56,8 +73,8 @@ export class TsTest {
 
   public async runInNode(fileNameArg: string): Promise<TapParser> {
     console.log(`${cs('=> ', 'blue')} Running ${cs(fileNameArg, 'orange')} in node.js runtime.`);
-    console.log(cs(`=`.repeat(16), 'cyan'));
-    const tapParser = new TapParser(fileNameArg);
+    console.log(`${cs(`= `.repeat(32), 'cyan')}`);
+    const tapParser = new TapParser(fileNameArg + ':node');
 
     // tsrun options
     let tsrunOptions = '';
@@ -74,7 +91,7 @@ export class TsTest {
 
   public async runInChrome(fileNameArg: string): Promise<TapParser> {
     console.log(`${cs('=> ', 'blue')} Running ${cs(fileNameArg, 'orange')} in chromium runtime.`);
-    console.log(cs(`=`.repeat(16), 'cyan'));
+    console.log(`${cs(`= `.repeat(32), 'cyan')}`);
 
     // lets get all our paths sorted
     const tsbundleCacheDirPath = plugins.path.join(paths.cwd, './.nogit/tstest_cache');
@@ -115,47 +132,13 @@ export class TsTest {
     const evaluation = await this.smartbrowserInstance.evaluateOnPage(
       `http://localhost:3007/test?bundleName=${bundleFileName}`,
       async () => {
-        let logStore = 'Starting log capture\n';
-        // tslint:disable-next-line: max-classes-per-file
-        class Deferred<T> {
-          public promise: Promise<T>;
-          public resolve;
-          public reject;
-          public status;
-
-          public startedAt: number;
-          public stoppedAt: number;
-          public get duration(): number {
-            if (this.stoppedAt) {
-              return this.stoppedAt - this.startedAt;
-            } else {
-              return Date.now() - this.startedAt;
-            }
-          }
-
-          constructor() {
-            this.promise = new Promise<T>((resolve, reject) => {
-              this.resolve = (valueArg: T | PromiseLike<T>) => {
-                this.status = 'fulfilled';
-                this.stoppedAt = Date.now();
-                resolve(valueArg);
-              };
-              this.reject = (reason: any) => {
-                this.status = 'rejected';
-                this.stoppedAt = Date.now();
-                reject(reason);
-              };
-              this.startedAt = Date.now();
-              this.status = 'pending';
-            });
-          }
-        }
-        const done = new Deferred();
         const convertToText = (obj) => {
           // create an array that will later be joined into a string.
           const stringArray = [];
 
-          if (typeof obj === 'object' && obj.join === undefined) {
+          if (typeof obj === 'object' && typeof obj.toString === 'function') {
+            stringArray.push(obj.toString());
+          } else if (typeof obj === 'object' && obj.join === undefined) {
             stringArray.push('{');
             for (const prop of Object.keys(obj)) {
               stringArray.push(prop, ': ', convertToText(obj[prop]), ',');
@@ -181,6 +164,9 @@ export class TsTest {
 
           return stringArray.join('');
         };
+
+        let logStore = '';
+        // tslint:disable-next-line: max-classes-per-file
         const log = console.log.bind(console);
         console.log = (...args) => {
           args = args.map((argument) => {
@@ -197,28 +183,37 @@ export class TsTest {
           logStore += `${args}\n`;
           error(...args);
         };
-        const bundle = await (await fetch('/test__test.browser.ts.js')).text();
-        try  {
+        const bundleName = new URLSearchParams(window.location.search).get('bundleName');
+        console.log(`::TSTEST IN CHROMIUM:: Relevant Script name is: ${bundleName}`);
+        const bundleResponse = await fetch(`/${bundleName}`);
+        console.log(
+          `::TSTEST IN CHROMIUM:: Got ${bundleName} with STATUS ${bundleResponse.status}`
+        );
+        const bundle = await bundleResponse.text();
+        console.log(`::TSTEST IN CHROMIUM:: Executing ${bundleName}`);
+        try {
           // tslint:disable-next-line: no-eval
           eval(bundle);
         } catch (err) {
           console.error(err);
         }
-        setTimeout(() => {
-          console.log(globalThis.testdom);
-          done.resolve();
-        }, 5000);
-        await done.promise;
+
+        if (globalThis.tapbundleDeferred && globalThis.tapbundleDeferred.promise) {
+          await globalThis.tapbundleDeferred.promise;
+        } else {
+          console.log('Error: Could not find tapbundle Deferred');
+        }
         return logStore;
       }
     );
-    await plugins.smartdelay.delayFor(1000);
     await this.smartbrowserInstance.stop();
-    console.log(`${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} chromium instance.`);
     await server.stop();
-    console.log(`${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} server.`);
+    console.log(
+      `${cs('=> ', 'blue')} Stopped ${cs(fileNameArg, 'orange')} chromium instance and server.`
+    );
+    console.log(`${cs('=> ', 'blue')} See the result captured from the chromium execution:`);
     // lets create the tap parser
-    const tapParser = new TapParser(fileNameArg);
+    const tapParser = new TapParser(fileNameArg + ':chrome');
     tapParser.handleTapLog(evaluation);
     return tapParser;
   }

ts/tstest.plugins.ts

@@ -12,15 +12,24 @@ import * as smartfile from '@pushrocks/smartfile';
 import * as smartlog from '@pushrocks/smartlog';
 import * as smartpromise from '@pushrocks/smartpromise';
 import * as smartshell from '@pushrocks/smartshell';
+import * as tapbundle from '@pushrocks/tapbundle';
 
-export { consolecolor, smartbrowser, smartexpress, smartdelay, smartfile, smartlog, smartpromise, smartshell };
+export {
+  consolecolor,
+  smartbrowser,
+  smartexpress,
+  smartdelay,
+  smartfile,
+  smartlog,
+  smartpromise,
+  smartshell,
+  tapbundle,
+};
 
 // @gitzone scope
 import * as tsbundle from '@gitzone/tsbundle';
 
-export {
-  tsbundle
-};
+export { tsbundle };
 
 // sindresorhus
 import * as figures from 'figures';