testeranto 0.121.1 → 0.125.1

package/src/lib/abstractBase.ts

@@ -1,57 +1,31 @@
-import { PM } from "../PM/index.js";
-import { Ibdd_in, Ibdd_out } from "../Types.js";
+import { IT, OT } from "../Types.js";
 
 import { ITTestResourceConfiguration, ITestArtifactory, ITLog } from ".";
+import { IPM } from "./types.js";
 
-export type IGivens<
-  I extends Ibdd_in<
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown
-  >
-> = Record<string, BaseGiven<I>>;
-
-export abstract class BaseSuite<
-  I extends Ibdd_in<
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown
-  >,
-  O extends Ibdd_out<
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>
-  >
-> {
+export type IGivens<I extends IT> = Record<string, BaseGiven<I>>;
+
+export abstract class BaseSuite<I extends IT = IT, O extends OT = OT> {
   name: string;
   givens: IGivens<I>;
-  checks: BaseCheck<I, O>[];
+  checks: BaseCheck<I>[];
   store: I["istore"];
-  fails: BaseGiven<I>[];
   testResourceConfiguration: ITTestResourceConfiguration;
   index: number;
+  failed: boolean;
+  fails: number;
 
   constructor(
     name: string,
     index: number,
     givens: IGivens<I> = {},
-    checks: BaseCheck<I, O>[] = []
+    checks: BaseCheck<I>[] = []
   ) {
     this.name = name;
     this.index = index;
     this.givens = givens;
     this.checks = checks;
-    this.fails = [];
+    this.fails = 0;
   }
 
   public features() {
@@ -61,10 +35,6 @@ export abstract class BaseSuite<
       .filter((value, index, array) => {
         return array.indexOf(value) === index;
       });
-    // .reduce((mm, lm) => {
-    //   mm[lm] = lm;
-    //   return mm;
-    // }, {});
     return features || [];
   }
 
@@ -77,6 +47,7 @@ export abstract class BaseSuite<
       givens,
       checks,
       fails: this.fails,
+      failed: this.failed,
       features: this.features(),
     };
   }
@@ -85,16 +56,16 @@ export abstract class BaseSuite<
     s: I["iinput"],
     artifactory: ITestArtifactory,
     tr: ITTestResourceConfiguration,
-    pm: PM
+    pm: IPM
   ): Promise<I["isubject"]> {
     return new Promise((res) => res(s as unknown as I["isubject"]));
   }
 
-  assertThat(t: I["then"]): unknown {
-    return t;
+  assertThat(t: Awaited<I["then"]> | undefined): boolean {
+    return !!t;
   }
 
-  afterAll(store: I["istore"], artifactory: ITestArtifactory, pm: PM) {
+  afterAll(store: I["istore"], artifactory: ITestArtifactory, pm: IPM) {
     return store;
   }
 
@@ -103,7 +74,7 @@ export abstract class BaseSuite<
     testResourceConfiguration: ITTestResourceConfiguration,
     artifactory: (fPath: string, value: unknown) => void,
     tLog: (...string) => void,
-    pm: PM
+    pm: IPM
   ): Promise<BaseSuite<I, O>> {
     this.testResourceConfiguration = testResourceConfiguration;
     // tLog("test resources: ", JSON.stringify(testResourceConfiguration));
@@ -161,8 +132,10 @@ export abstract class BaseSuite<
           sNdx
         );
       } catch (e) {
-        console.error(e);
-        this.fails.push(giver);
+        this.failed = true;
+        this.fails = this.fails + 1;
+        // console.error(e);
+        // this.fails.push(giver);
         // return this;
       }
     }
@@ -210,17 +183,7 @@ export abstract class BaseSuite<
   }
 }
 
-export abstract class BaseGiven<
-  I extends Ibdd_in<
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown
-  >
-> {
+export abstract class BaseGiven<I extends IT = IT> {
   name: string;
   features: string[];
   whens: BaseWhen<I>[];
@@ -232,6 +195,7 @@ export abstract class BaseGiven<
   givenCB: I["given"];
   initialValues: any;
   key: string;
+  failed: boolean;
 
   constructor(
     name: string,
@@ -249,16 +213,7 @@ export abstract class BaseGiven<
     this.initialValues = initialValues;
   }
 
-  beforeAll(
-    store: I["istore"],
-    // artifactory: ITestArtifactory
-    // subject,
-    initializer,
-    artifactory,
-    testResource,
-    initialValues,
-    pm
-  ) {
+  beforeAll(store: I["istore"]) {
     return store;
   }
 
@@ -269,7 +224,7 @@ export abstract class BaseGiven<
       whens: this.whens.map((w) => w.toObj()),
       thens: this.thens.map((t) => t.toObj()),
       error: this.error ? [this.error, this.error.stack] : null,
-      // fail: this.fail ? [this.fail] : false,
+      failed: this.failed,
       features: this.features,
     };
   }
@@ -280,14 +235,14 @@ export abstract class BaseGiven<
     artifactory: ITestArtifactory,
     givenCB: I["given"],
     initialValues: any,
-    pm: PM
+    pm: IPM
   ): Promise<I["istore"]>;
 
   async afterEach(
     store: I["istore"],
     key: string,
     artifactory: ITestArtifactory,
-    pm: PM
+    pm: IPM
   ): Promise<unknown> {
     return store;
   }
@@ -301,7 +256,7 @@ export abstract class BaseGiven<
     tester: (t: Awaited<I["then"]> | undefined) => boolean,
     artifactory: ITestArtifactory,
     tLog: ITLog,
-    pm: PM,
+    pm: IPM,
     suiteNdx: number
   ) {
     this.key = key;
@@ -311,52 +266,51 @@ export abstract class BaseGiven<
 
     const givenArtifactory = (fPath: string, value: unknown) =>
       artifactory(`given-${key}/${fPath}`, value);
-    try {
-      // tLog(`\n Given this.store`, this.store);
 
-      const beforeEachProxy = new Proxy(pm, {
-        get(target, prop, receiver) {
-          if (prop === "writeFileSync") {
-            return (fp, contents) =>
-              target[prop](
-                `suite-${suiteNdx}/given-${key}/when/beforeEach/${fp}`,
-                contents
-              );
-          }
+    const beforeEachProxy = new Proxy(pm, {
+      get(target, prop, receiver) {
+        if (prop === "writeFileSync") {
+          return (fp, contents) =>
+            target[prop](
+              `suite-${suiteNdx}/given-${key}/when/beforeEach/${fp}`,
+              contents
+            );
+        }
 
-          if (prop === "customScreenShot") {
-            return (opts, p) =>
-              target.customScreenShot(
-                {
-                  ...opts,
-                  path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}`,
-                },
-                p
-              );
-          }
+        if (prop === "customScreenShot") {
+          return (opts, p) =>
+            target.customScreenShot(
+              {
+                ...opts,
+                path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}`,
+              },
+              p
+            );
+        }
 
-          if (prop === "screencast") {
-            return (opts, p) =>
-              target.screencast(
-                {
-                  ...opts,
-                  path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}`,
-                },
-                p
-              );
-          }
+        if (prop === "screencast") {
+          return (opts, p) =>
+            target.screencast(
+              {
+                ...opts,
+                path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}`,
+              },
+              p
+            );
+        }
 
-          /* @ts-ignore:next-line */
-          return Reflect.get(...arguments);
-        },
-      });
+        /* @ts-ignore:next-line */
+        return Reflect.get(...arguments);
+      },
+    });
 
-      this.uberCatcher((e) => {
-        console.error(e);
-        this.error = e.error;
-        tLog(e.stack);
-      });
+    this.uberCatcher((e) => {
+      console.error(e);
+      this.error = e.error;
+      tLog(e.stack);
+    });
 
+    try {
       this.store = await this.givenThat(
         subject,
         testResourceConfiguration,
@@ -365,6 +319,13 @@ export abstract class BaseGiven<
         this.initialValues,
         beforeEachProxy
       );
+    } catch (e) {
+      this.error = e;
+      throw e;
+    }
+
+    try {
+      // tLog(`\n Given this.store`, this.store);
 
       for (const [whenNdx, whenStep] of this.whens.entries()) {
         await whenStep.test(
@@ -387,12 +348,10 @@ export abstract class BaseGiven<
         tester(t);
       }
     } catch (e) {
-      console.error(e);
-      this.error = e;
+      // this.error = e;
+      this.failed = true;
       tLog(e.stack);
-      // tLog("\u0007"); // bell
-
-      // throw e;
+      throw e;
     } finally {
       try {
         const afterEachProxy = new Proxy(pm, {
@@ -429,25 +388,17 @@ export abstract class BaseGiven<
           afterEachProxy
         );
       } catch (e) {
-        console.error("afterEach failed!", e);
-        this.error = e.message;
+        this.failed = e;
+        throw e;
+        // console.error("afterEach failed!", e);
+        // this.error = e.message;
       }
     }
     return this.store;
   }
 }
 
-export abstract class BaseWhen<
-  I extends Ibdd_in<
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown
-  >
-> {
+export abstract class BaseWhen<I extends IT> {
   public name: string;
   whenCB: (x: I["iselection"]) => I["then"];
   error: boolean;
@@ -461,7 +412,7 @@ export abstract class BaseWhen<
     store: I["istore"],
     whenCB: (x: I["iselection"]) => I["then"],
     testResource,
-    pm: PM
+    pm: IPM
   ): Promise<any>;
 
   toObj() {
@@ -475,7 +426,7 @@ export abstract class BaseWhen<
     store: I["istore"],
     testResourceConfiguration,
     tLog: ITLog,
-    pm: PM,
+    pm: IPM,
     filepath: string
   ) {
     tLog(" When:", this.name);
@@ -525,17 +476,7 @@ export abstract class BaseWhen<
   }
 }
 
-export abstract class BaseThen<
-  I extends Ibdd_in<
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown
-  >
-> {
+export abstract class BaseThen<I extends IT> {
   public name: string;
   thenCB: (storeState: I["iselection"]) => I["then"];
   go: (storeState: I["iselection"]) => I["then"];
@@ -559,14 +500,15 @@ export abstract class BaseThen<
     store: I["istore"],
     thenCB: (s: I["iselection"]) => I["isubject"],
     testResourceConfiguration: ITTestResourceConfiguration,
-    pm: PM
+    pm: IPM,
+    ...args: any[]
   ): Promise<I["iselection"]>;
 
   async test(
     store: I["istore"],
     testResourceConfiguration,
     tLog: ITLog,
-    pm: PM,
+    pm: IPM,
     filepath: string
   ): Promise<I["then"] | undefined> {
     this.go = async (s: I["iselection"]) => {
@@ -575,8 +517,9 @@ export abstract class BaseThen<
       try {
         await this.thenCB(s);
       } catch (e) {
-        console.log("test failed", e);
-        this.error = e.message;
+        console.log("test failed 1", e);
+        this.error = e;
+        throw e;
       }
     };
 
@@ -610,12 +553,12 @@ export abstract class BaseThen<
         testResourceConfiguration,
         butThenProxy
       ).catch((e) => {
-        this.error = true;
+        this.error = e;
         throw e;
       });
     } catch (e) {
-      console.log("test failed", e);
-      this.error = e.message;
+      console.log("test failed 2", e);
+      this.error = e;
       throw e;
     }
   }
@@ -623,42 +566,19 @@ export abstract class BaseThen<
   check() {}
 }
 
-export abstract class BaseCheck<
-  I extends Ibdd_in<
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown
-  >,
-  O extends Ibdd_out<
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>
-  >
-> {
+export abstract class BaseCheck<I extends IT = IT> {
   key: string;
   name: string;
   features: string[];
-  checkCB: (store: I["istore"], pm: PM) => any;
+  checkCB: (store: I["istore"], pm: IPM) => any;
   initialValues: any;
   store: I["istore"];
-  // whens: {
-  //   [K in keyof O["whens"]]: (p, tc) => BaseWhen<I>;
-  // };
-  // thens: {
-  //   [K in keyof O["thens"]]: (p, tc) => BaseThen<I>;
-  // };
   checker: any;
 
   constructor(
     name: string,
     features: string[],
-    checker: (store: I["istore"], pm: PM) => any,
+    checker: (store: I["istore"], pm: IPM) => any,
     x: any,
     checkCB: any
   ) {
@@ -674,7 +594,7 @@ export abstract class BaseCheck<
     artifactory: ITestArtifactory,
     initializer,
     initialValues,
-    pm: PM
+    pm: IPM
   ): Promise<I["istore"]>;
 
   toObj() {
@@ -682,9 +602,6 @@ export abstract class BaseCheck<
       key: this.key,
       name: this.name,
       functionAsString: this.checkCB.toString(),
-      // thens: this.thens.map((t) => t.toObj()),
-      // error: this.error ? [this.error, this.error.stack] : null,
-      // fail: this.fail ? [this.fail] : false,
       features: this.features,
     };
   }
@@ -693,21 +610,12 @@ export abstract class BaseCheck<
     store: I["istore"],
     key: string,
     artifactory: ITestArtifactory,
-    pm: PM
+    pm: IPM
   ): Promise<unknown> {
     return store;
   }
 
-  beforeAll(
-    store: I["istore"],
-    // artifactory: ITestArtifactory
-    // subject,
-    initializer,
-    artifactory,
-    testResource,
-    initialValues,
-    pm
-  ) {
+  beforeAll(store: I["istore"]) {
     return store;
   }
 
@@ -718,7 +626,7 @@ export abstract class BaseCheck<
     tester,
     artifactory: ITestArtifactory,
     tLog: ITLog,
-    pm: PM
+    pm: IPM
   ) {
     this.key = key;
     tLog(`\n Check: ${this.name}`);

package/src/lib/basebuilder.ts

@@ -1,14 +1,15 @@
 import { PassThrough } from "stream";
 
-import { ITTestResourceRequest, ITestJob, ITLog } from ".";
-import { Ibdd_in, Ibdd_out, ITestSpecification } from "../Types.js";
+import { IT, ITestSpecification, OT } from "../Types.js";
 
+import { ITTestResourceRequest, ITestJob, ITLog, IFinalResults } from ".";
 import {
   ISuiteKlasser,
   IGivenKlasser,
   IWhenKlasser,
   IThenKlasser,
   ICheckKlasser,
+  IPM,
 } from "./types.js";
 import {
   BaseCheck,
@@ -17,25 +18,10 @@ import {
   BaseThen,
   BaseGiven,
 } from "./abstractBase.js";
-import { PM } from "../PM/index.js";
 
 export abstract class BaseBuilder<
-  I extends Ibdd_in<
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown,
-    unknown
-  >,
-  O extends Ibdd_out<
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>,
-    Record<string, any>
-  >,
+  I extends IT,
+  O extends OT,
   SuiteExtensions,
   GivenExtensions,
   WhenExtensions,
@@ -54,8 +40,8 @@ export abstract class BaseBuilder<
   givenOverides: Record<keyof GivenExtensions, IGivenKlasser<I>>;
   whenOverides: Record<keyof WhenExtensions, IWhenKlasser<I>>;
   thenOverides: Record<keyof ThenExtensions, IThenKlasser<I>>;
-  checkOverides: Record<keyof CheckExtensions, ICheckKlasser<I, O>>;
-  puppetMaster: PM;
+  checkOverides: Record<keyof CheckExtensions, ICheckKlasser<I>>;
+  puppetMaster: IPM;
 
   constructor(
     input: I["iinput"],
@@ -63,7 +49,7 @@ export abstract class BaseBuilder<
     givenOverides: Record<keyof GivenExtensions, IGivenKlasser<I>>,
     whenOverides: Record<keyof WhenExtensions, IWhenKlasser<I>>,
     thenOverides: Record<keyof ThenExtensions, IThenKlasser<I>>,
-    checkOverides: Record<keyof CheckExtensions, ICheckKlasser<I, O>>,
+    checkOverides: Record<keyof CheckExtensions, ICheckKlasser<I>>,
     testResourceRequirement: ITTestResourceRequest,
     testSpecification: any
   ) {
@@ -87,7 +73,7 @@ export abstract class BaseBuilder<
     this.testJobs = this.specs.map((suite: BaseSuite<I, O>) => {
       const suiteRunner =
         (suite: BaseSuite<I, O>) =>
-        async (puppetMaster: PM, tLog: ITLog): Promise<BaseSuite<I, O>> => {
+        async (puppetMaster: IPM, tLog: ITLog): Promise<BaseSuite<I, O>> => {
           const x = await suite.run(
             input,
             puppetMaster.testResourceConfiguration,
@@ -116,30 +102,36 @@ export abstract class BaseBuilder<
 
         runner,
 
-        receiveTestResourceConfig: async function (puppetMaster: PM) {
+        receiveTestResourceConfig: async function (
+          puppetMaster: IPM
+        ): Promise<IFinalResults> {
+          const start = await puppetMaster.start();
+
           const logFilePath = "log.txt";
-          const access = await puppetMaster.createWriteStream(logFilePath);
-          const tLog = (...l: string[]) => {
-            puppetMaster.write(access, `${l.toString()}\n`);
+          const access: number = await puppetMaster.createWriteStream(
+            logFilePath
+          );
+
+          const tLog = async (...l: string[]) => {
+            const x = await puppetMaster.write(access, `${l.toString()}\n`);
+            // console.log("x", x);
           };
 
           const suiteDone: BaseSuite<I, O> = await runner(puppetMaster, tLog);
 
-          const logPromise = new Promise((res, rej) => {
-            puppetMaster.end(access);
+          const logPromise = new Promise(async (res, rej) => {
+            await puppetMaster.end(access);
             res(true);
           });
 
-          const numberOfFailures = Object.keys(suiteDone.givens).filter((k) => {
-            return suiteDone.givens[k].error;
-          }).length;
-          puppetMaster.writeFileSync(
+          const fails = suiteDone.fails;
+
+          const b = await puppetMaster.writeFileSync(
             `bdd_errors.txt`,
-            numberOfFailures.toString()
+            fails.toString()
           );
 
-          const o = this.toObj();
-          puppetMaster.writeFileSync(
+          await puppetMaster.writeFileSync(
             `littleBoard.html`,
             `
 <!DOCTYPE html>
@@ -163,13 +155,14 @@ export abstract class BaseBuilder<
             `
           );
 
-          puppetMaster.writeFileSync(
+          await puppetMaster.writeFileSync(
             `tests.json`,
             JSON.stringify(this.toObj(), null, 2)
           );
 
           return {
-            failed: numberOfFailures,
+            failed: fails > 0,
+            fails,
             artifacts: this.artifacts || [],
             logPromise,
             features: suiteDone.features(),
@@ -179,6 +172,13 @@ export abstract class BaseBuilder<
     });
   }
 
+  // testsJson() {
+  //   puppetMaster.writeFileSync(
+  //     `tests.json`,
+  //     JSON.stringify({ features: suiteDone.features() }, null, 2)
+  //   );
+  // }
+
   Specs() {
     return this.specs;
   }
@@ -217,11 +217,11 @@ export abstract class BaseBuilder<
     keyof CheckExtensions,
     (
       feature: string,
-      callback: (whens, thens, pm: PM) => any,
+      callback: (whens, thens, pm: IPM) => any,
       whens,
       thens,
       x
-    ) => BaseCheck<I, O>
+    ) => BaseCheck<I>
   > {
     return this.checkOverides;
   }