testeranto 0.85.0 → 0.94.0

package/src/lib/abstractBase.ts

@@ -112,12 +112,13 @@ export abstract class BaseSuite<
     const suiteArtifactory = (fPath: string, value: unknown) =>
       artifactory(`suite-${this.index}-${this.name}/${fPath}`, value);
 
-    console.log("\nSuite:", this.index, this.name);
+    // console.log("\nSuite:", this.index, this.name);
     tLog("\nSuite:", this.index, this.name);
     const sNdx = this.index;
     const sName = this.name;
 
-    for (const [gNdx, g] of Object.entries(this.givens)) {
+    for (const [gKey, g] of Object.entries(this.givens)) {
+      // console.log("gKey", gKey);
       const beforeAllProxy = new Proxy(pm, {
         get(target, prop, receiver) {
           if (prop === "customScreenShot") {
@@ -134,60 +135,6 @@ export abstract class BaseSuite<
               target[prop](`suite-${sNdx}/beforeAll/${fp}`, contents);
           }
 
-          // if (prop === "browser") {
-          //   return new Proxy(target[prop], {
-          //     get(bTarget, bProp, bReceiver) {
-          //       if (bProp === "pages") {
-          //         return async () => {
-          //           return bTarget.pages().then((pages) => {
-          //             return pages.map((page) => {
-          //               return new Proxy(page, {
-          //                 get(pTarget, pProp, pReciever) {
-          //                   if (pProp === "screenshot") {
-          //                     return async (x) => {
-          //                       return pm.customScreenShot(
-          //                         {
-          //                           ...x,
-          //                           path:
-          //                             `${testResourceConfiguration.fs}/suite-${sNdx}/beforeAll` +
-          //                             "/" +
-          //                             x.path,
-          //                         },
-          //                         page
-          //                       );
-          //                       // return await window["custom-screenshot"]({
-          //                       //   ...x,
-          //                       //   path:
-          //                       //     `${testResourceConfiguration.fs}/suite-${sNdx}/afterAll` +
-          //                       //     "/" +
-          //                       //     x.path,
-          //                       // });
-          //                     };
-          //                   } else if (pProp === "mainFrame") {
-          //                     return () => pTarget[pProp]();
-          //                   } else if (pProp === "close") {
-          //                     return () => pTarget[pProp]();
-          //                   }
-
-          //                   // else if (pProp === "mainFrame") {
-          //                   //   return () => target[pProp](...arguments);
-          //                   // }
-          //                   else {
-          //                     return Reflect.get(...arguments);
-          //                   }
-          //                 },
-          //               });
-          //             });
-          //           });
-          //           // return (await target.pages()).map((page) => {
-          //           //   return new Proxy(page, handler2);
-          //           // });
-          //         };
-          //       }
-          //     },
-          //   });
-          // }
-
           return Reflect.get(...arguments);
         },
       });
@@ -199,11 +146,11 @@ export abstract class BaseSuite<
         beforeAllProxy
       );
 
-      const giver = this.givens[gNdx];
+      const giver = this.givens[gKey];
       try {
         this.store = await giver.give(
           subject,
-          gNdx,
+          gKey,
           testResourceConfiguration,
           this.assertThat,
           suiteArtifactory,
@@ -218,68 +165,6 @@ export abstract class BaseSuite<
       }
     }
 
-    // const afterAllProxy = new Proxy(pm, {
-    //   get(target, prop, receiver) {
-    //     if (prop === "writeFileSync") {
-    //       return (fp, contents) =>
-    //         target[prop](`suite-${sNdx}/afterAll/${fp}`, contents);
-    //     }
-
-    //     if (prop === "browser") {
-    //       return new Proxy(target[prop], {
-    //         get(bTarget, bProp, bReceiver) {
-    //           if (bProp === "pages") {
-    //             return async () => {
-    //               return bTarget.pages().then((pages) => {
-    //                 return pages.map((page) => {
-    //                   return new Proxy(page, {
-    //                     get(pTarget, pProp, pReciever) {
-    //                       if (pProp === "screenshot") {
-    //                         return async (x) => {
-    //                           return pm.customScreenShot({
-    //                             ...x,
-    //                             path:
-    //                               `${testResourceConfiguration.fs}/suite-${sNdx}/afterAll` +
-    //                               "/" +
-    //                               x.path,
-    //                           });
-    //                           // return await window["custom-screenshot"]({
-    //                           //   ...x,
-    //                           //   path:
-    //                           //     `${testResourceConfiguration.fs}/suite-${sNdx}/afterAll` +
-    //                           //     "/" +
-    //                           //     x.path,
-    //                           // });
-    //                         };
-    //                       } else if (pProp === "mainFrame") {
-    //                         return () => pTarget[pProp]();
-    //                       } else if (pProp === "close") {
-    //                         return () => pTarget[pProp]();
-    //                       }
-
-    //                       // else if (pProp === "mainFrame") {
-    //                       //   return () => target[pProp](...arguments);
-    //                       // }
-    //                       else {
-    //                         return Reflect.get(...arguments);
-    //                       }
-    //                     },
-    //                   });
-    //                 });
-    //               });
-    //               // return (await target.pages()).map((page) => {
-    //               //   return new Proxy(page, handler2);
-    //               // });
-    //             };
-    //           }
-    //         },
-    //       });
-    //     }
-
-    //     return Reflect.get(...arguments);
-    //   },
-    // });
-
     try {
       this.afterAll(
         this.store,
@@ -349,6 +234,7 @@ export abstract class BaseGiven<
   recommendedFsPath: string;
   givenCB: ITestShape["given"];
   initialValues: any;
+  key: string;
 
   constructor(
     name: string,
@@ -357,6 +243,7 @@ export abstract class BaseGiven<
     thens: BaseThen<ITestShape>[],
     givenCB: ITestShape["given"],
     initialValues: any
+    // key: string
   ) {
     this.name = name;
     this.features = features;
@@ -366,12 +253,22 @@ export abstract class BaseGiven<
     this.initialValues = initialValues;
   }
 
-  beforeAll(store: ITestShape["istore"], artifactory: ITestArtifactory) {
+  beforeAll(
+    store: ITestShape["istore"],
+    // artifactory: ITestArtifactory
+    // subject,
+    initializer,
+    artifactory,
+    testResource,
+    initialValues,
+    pm
+  ) {
     return store;
   }
 
   toObj() {
     return {
+      key: this.key,
       name: this.name,
       whens: this.whens.map((w) => w.toObj()),
       thens: this.thens.map((t) => t.toObj()),
@@ -386,6 +283,7 @@ export abstract class BaseGiven<
     testResourceConfiguration,
     artifactory: ITestArtifactory,
     givenCB: ITestShape["given"],
+    initialValues: any,
     pm: PM
   ): Promise<ITestShape["istore"]>;
 
@@ -398,6 +296,8 @@ export abstract class BaseGiven<
     return store;
   }
 
+  abstract uberCatcher(e);
+
   async give(
     subject: ITestShape["isubject"],
     key: string,
@@ -408,10 +308,12 @@ export abstract class BaseGiven<
     pm: PM,
     suiteNdx: number
   ) {
+    this.key = key;
+    tLog(`\n ${this.key}`);
     tLog(`\n Given: ${this.name}`);
 
     const givenArtifactory = (fPath: string, value: unknown) =>
-      artifactory(`given-${key}/${fPath}`, value);
+      artifactory(`given-${this.key}/${fPath}`, value);
     try {
       // tLog(`\n Given this.store`, this.store);
 
@@ -420,7 +322,7 @@ export abstract class BaseGiven<
           if (prop === "writeFileSync") {
             return (fp, contents) =>
               target[prop](
-                `suite-${suiteNdx}/given-${key}/when/beforeEach/${fp}`,
+                `suite-${suiteNdx}/given-${this.key}/when/beforeEach/${fp}`,
                 contents
               );
           }
@@ -429,8 +331,7 @@ export abstract class BaseGiven<
             return (opts) =>
               target.customScreenShot({
                 ...opts,
-                // path: `${filepath}/${opts.path}`,
-                path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}`,
+                path: `suite-${suiteNdx}/given-${this.key}/when/beforeEach/${opts.path}`,
               });
           }
 
@@ -438,14 +339,20 @@ export abstract class BaseGiven<
         },
       });
 
+      this.uberCatcher((e) => {
+        console.error(e);
+        this.error = e.error;
+        tLog(e.stack);
+      });
+
       this.store = await this.givenThat(
         subject,
         testResourceConfiguration,
         givenArtifactory,
         this.givenCB,
+        this.initialValues,
         beforeEachProxy
       );
-      // console.log("mark6", this.store);
 
       for (const [whenNdx, whenStep] of this.whens.entries()) {
         await whenStep.test(
@@ -453,7 +360,7 @@ export abstract class BaseGiven<
           testResourceConfiguration,
           tLog,
           pm,
-          `suite-${suiteNdx}/given-${key}/when/${whenNdx}`
+          `suite-${suiteNdx}/given-${this.key}/when/${whenNdx}`
         );
       }
 
@@ -463,7 +370,7 @@ export abstract class BaseGiven<
           testResourceConfiguration,
           tLog,
           pm,
-          `suite-${suiteNdx}/given-${key}/then-${thenNdx}`
+          `suite-${suiteNdx}/given-${this.key}/then-${thenNdx}`
         );
         tester(t);
       }
@@ -482,92 +389,25 @@ export abstract class BaseGiven<
               return (opts) =>
                 target.customScreenShot({
                   ...opts,
-                  path: `suite-${suiteNdx}/given-${key}/afterEach/${opts.path}`,
+                  path: `suite-${suiteNdx}/given-${this.key}/afterEach/${opts.path}`,
                 });
             }
 
             if (prop === "writeFileSync") {
               return (fp, contents) =>
                 target[prop](
-                  `suite-${suiteNdx}/given-${key}/afterEach/${fp}`,
+                  `suite-${suiteNdx}/given-${this.key}/afterEach/${fp}`,
                   contents
                 );
             }
 
-            // if (prop === "browser") {
-            //   return new Proxy(target[prop], {
-            //     get(bTarget, bProp, bReceiver) {
-            //       if (bProp === "pages") {
-            //         return async () => {
-            //           return bTarget.pages().then((pages) => {
-            //             return pages.map((page) => {
-            //               return new Proxy(page, {
-            //                 get(pTarget, pProp, pReciever) {
-            //                   if (pProp === "screenshot") {
-            //                     return async (x) => {
-            //                       // console.log(
-            //                       //   "custom-screenshot-MARK-afterEachProxy",
-            //                       //   window["custom-screenshot"].toString()
-            //                       // );
-
-            //                       return pm.customScreenShot(
-            //                         {
-            //                           ...x,
-            //                           path:
-            //                             `${testResourceConfiguration.fs}/suite-${suiteNdx}/given-${key}/afterEach` +
-            //                             "/" +
-            //                             x.path,
-            //                         },
-            //                         page
-            //                       );
-
-            //                       // return await pTarget[pProp]({
-            //                       //   ...x,
-            //                       //   path:
-            //                       //     `${testResourceConfiguration.fs}/suite-${suiteNdx}/given-${key}/afterEach` +
-            //                       //     "/" +
-            //                       //     x.path,
-            //                       // });
-            //                     };
-            //                   } else if (pProp === "mainFrame") {
-            //                     return () => pTarget[pProp]();
-            //                     // return target[pProp];
-            //                     // return Reflect.get(...arguments);
-            //                   } else if (pProp === "exposeFunction") {
-            //                     // return Reflect.get(target, prop, receiver);
-            //                     return (...a) => pTarget[pProp](...a);
-            //                     // return target[pProp];
-            //                   } else if (pProp === "removeExposedFunction") {
-            //                     // return Reflect.get(target, prop, receiver);
-            //                     return pTarget[pProp].bind(pTarget);
-            //                     // return target[pProp];
-            //                   }
-            //                   // else if (pProp === "#frameManager") {
-            //                   //   return () => target[pProp](...arguments);
-            //                   // }
-            //                   else {
-            //                     return Reflect.get(...arguments);
-            //                   }
-            //                 },
-            //               });
-            //             });
-            //           });
-            //           // return (await target.pages()).map((page) => {
-            //           //   return new Proxy(page, handler2);
-            //           // });
-            //         };
-            //       }
-            //     },
-            //   });
-            // }
-
             return Reflect.get(...arguments);
           },
         });
 
         await this.afterEach(
           this.store,
-          key,
+          this.key,
           givenArtifactory,
           // pm
           afterEachProxy
@@ -809,63 +649,6 @@ export abstract class BaseThen<
               target[prop](`${filepath}/${fp}`, contents);
           }
 
-          // if (prop === "browser") {
-          //   return new Proxy(target[prop], {
-          //     get(bTarget, bProp, bReceiver) {
-          //       if (bProp === "pages") {
-          //         return async () => {
-          //           return bTarget.pages().then((pages) => {
-          //             return pages.map((page) => {
-          //               return new Proxy(page, {
-          //                 get(pTarget, pProp, pReciever) {
-          //                   if (pProp === "screenshot") {
-          //                     return async (x) => {
-          //                       return pm.customScreenShot(
-          //                         {
-          //                           ...x,
-          //                           path:
-          //                             `${testResourceConfiguration.fs}/${filepath}/butThen` +
-          //                             "/" +
-          //                             x.path,
-          //                         },
-          //                         page
-          //                       );
-          //                       // return await window["custom-screenshot"]({
-          //                       //   ...x,
-          //                       //   path:
-          //                       //     `${testResourceConfiguration.fs}/suite-${sNdx}/afterAll` +
-          //                       //     "/" +
-          //                       //     x.path,
-          //                       // });
-          //                     };
-          //                   } else if (pProp === "close") {
-          //                     return () => pTarget[pProp]();
-          //                   } else if (pProp === "mainFrame") {
-          //                     return () => pTarget[pProp]();
-          //                   } else if (pProp === "exposeFunction") {
-          //                     // return Reflect.get(target, prop, receiver);
-          //                     return (...a) => pTarget[pProp](...a);
-          //                     // return target[pProp];
-          //                   } else if (pProp === "removeExposedFunction") {
-          //                     // return Reflect.get(target, prop, receiver);
-          //                     return pTarget[pProp].bind(pTarget);
-          //                     // return target[pProp];
-          //                   } else {
-          //                     return Reflect.get(...arguments);
-          //                   }
-          //                 },
-          //               });
-          //             });
-          //           });
-          //           // return (await target.pages()).map((page) => {
-          //           //   return new Proxy(page, handler2);
-          //           // });
-          //         };
-          //       }
-          //     },
-          //   });
-          // }
-
           return Reflect.get(...arguments);
         },
       });

package/src/lib/basebuilder.ts

@@ -82,7 +82,6 @@ export abstract class BaseBuilder<
       this.Check()
     );
 
-    // const f = this.specs[0].features;
     this.testJobs = this.specs.map((suite: BaseSuite<ITestShape>) => {
       const suiteRunner =
         (suite: BaseSuite<ITestShape>) =>
@@ -90,14 +89,6 @@ export abstract class BaseBuilder<
           puppetMaster: PM,
           tLog: ITLog
         ): Promise<BaseSuite<ITestShape>> => {
-          // const puppeteerBrowser = await puppetMaster.startPuppeteer(
-          //   {
-          //     browserWSEndpoint:
-          //       puppetMaster.testResourceConfiguration.browserWSEndpoint,
-          //   },
-          //   puppetMaster.testResourceConfiguration.fs
-          // );
-
           const x = await suite.run(
             input,
             puppetMaster.testResourceConfiguration,
@@ -112,8 +103,6 @@ export abstract class BaseBuilder<
             puppetMaster
           );
 
-          // await puppetMaster.browser.disconnect();
-          // puppeteerBrowser.close();
           return x;
         };
 
@@ -163,7 +152,7 @@ export abstract class BaseBuilder<
             `tests.json`,
             JSON.stringify(this.toObj(), null, 2)
           );
-          console.log(`exiting gracefully with ${numberOfFailures} failures.`);
+          // console.log(`exiting gracefully with ${numberOfFailures} failures.`);
 
           return {
             failed: numberOfFailures,

package/src/lib/classBuilder.ts

@@ -57,8 +57,9 @@ export abstract class ClassBuilder<
       },
       {}
     );
+
     const classyGivens = Object.entries(testImplementation.givens).reduce(
-      (a, [key, givEn]) => {
+      (a, [key, g]) => {
         a[key] = (features, whens, thens, givEn) => {
           return new givenKlasser.prototype.constructor(
             key,

package/src/lib/core.ts

@@ -5,7 +5,7 @@ import {
   ITestImplementation,
 } from "../Types.js";
 
-import { ITestInterface } from "./types.js";
+import { IFinalResults, ITestInterface } from "./types.js";
 import {
   DefaultTestInterface,
   ITTestResourceRequest,
@@ -43,9 +43,11 @@ export default abstract class Testeranto<
     testSpecification: ITestSpecification<ITestShape>,
     testImplementation: ITestImplementation<ITestShape>,
     testResourceRequirement: ITTestResourceRequest = defaultTestResourceRequirement,
-    testInterface: Partial<ITestInterface<ITestShape>>
+    testInterface: Partial<ITestInterface<ITestShape>>,
+    uberCatcher: (cb) => void
   ) {
     const fullTestInterface = DefaultTestInterface(testInterface);
+
     super(
       testImplementation,
       testSpecification,
@@ -53,26 +55,6 @@ export default abstract class Testeranto<
 
       class extends BaseSuite<ITestShape> {
         afterAll(store: IStore, artifactory: ITestArtifactory, pm: PM) {
-          // const pagesHandler = {
-          //   get(target, prop) {
-          //     console.log(`Getting pages property ${prop}`);
-          //     return target[prop];
-          //   },
-          // };
-
-          // const browserHandler = {
-          //   get(target, prop) {
-          //     console.log(`Getting browser property ${prop}`);
-          //     if (prop === "pages") {
-          //       // return target[prop];
-          //       return new Proxy(target[prop], pagesHandler);
-          //     } else {
-          //       return target[prop];
-          //     }
-          //   },
-          // };
-          // const proxy = new Proxy(utils.browser, browserHandler);
-
           return fullTestInterface.afterAll(
             store,
             (fPath: string, value: unknown) =>
@@ -107,15 +89,22 @@ export default abstract class Testeranto<
       } as any,
 
       class Given extends BaseGiven<ITestShape> {
-        async givenThat(subject, testResource, artifactory, initializer, pm) {
+        uberCatcher = uberCatcher;
+
+        async givenThat(
+          subject,
+          testResource,
+          artifactory,
+          initializer,
+          initialValues,
+          pm
+        ) {
           return fullTestInterface.beforeEach(
             subject,
             initializer,
-            (fPath: string, value: unknown) =>
-              // TODO does not work?
-              artifactory(`beforeEach/${fPath}`, value),
+            artifactory,
             testResource,
-            this.initialValues,
+            initialValues,
             pm
           );
         }
@@ -258,11 +247,10 @@ export default abstract class Testeranto<
       } as any,
 
       testResourceRequirement
-      // puppetMaster
     );
   }
 
   abstract receiveTestResourceConfig(
     partialTestResource: string
-  ): Promise<string[]>;
+  ): Promise<IFinalResults>;
 }

package/src/lib/types.ts

@@ -12,6 +12,8 @@ import {
 import { ITTestResourceConfiguration, ITestArtificer } from ".";
 import { PM } from "../PM/index";
 
+export type IFinalResults = { features: string[]; failed: number };
+
 export type IRunTime = `node` | `web`;
 
 export type ITestTypes = [string, IRunTime, { ports: number }, ITestTypes[]];
@@ -213,7 +215,7 @@ export type ITestInterface<
   beforeEach: (
     subject: ITestShape["isubject"],
     initializer: (c?) => ITestShape["given"],
-    // artificer: ITestArtificer,
+    artificer: ITestArtificer,
     testResource: ITTestResourceConfiguration,
     initialValues,
     pm: PM

package/src/run-tests.ts

@@ -0,0 +1,12 @@
+import Puppeteer from "./Puppeteer.js";
+
+import process from "process";
+
+if (!process.argv[2]) {
+  console.log("You didn't pass a config file");
+  process.exit(-1);
+} else {
+  import(process.cwd() + "/" + process.argv[2]).then((module) => {
+    Puppeteer(module.default);
+  });
+}

package/tsconfig.json

@@ -43,7 +43,7 @@
     "./**/*.*ts",
     "./**/*.*tsx",
     "index.d.ts",
-    "build-tests.ts",
+    "src/build-tests.ts",
     "run-tests.ts",
     "testeranto.ts",
   ],

package/build-tests.ts

@@ -1,16 +0,0 @@
-// import { ITProject } from "./src/Project.js";
-
-// import Project from "./testeranto.js";
-
-import process from "process";
-import { ITProject } from "./src/Project";
-// import { ITProject } from "testeranto/src/Project";
-
-// process.chdir(__dirname);
-
-// import Puppeteer from "./src/Puppeteer.js";
-
-console.log(process.argv);
-const Project = await import(process.argv[2]);
-
-export default new ITProject(Project as any);

package/dist/common/init-docs.js

@@ -1,8 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const Init_js_1 = __importDefault(require("./src/Init.js"));
-const testeranto_js_1 = __importDefault(require("./testeranto.js"));
-exports.default = (0, Init_js_1.default)(testeranto_js_1.default);

package/dist/module/build-tests.js

@@ -1,10 +0,0 @@
-// import { ITProject } from "./src/Project.js";
-// import Project from "./testeranto.js";
-import process from "process";
-import { ITProject } from "./src/Project";
-// import { ITProject } from "testeranto/src/Project";
-// process.chdir(__dirname);
-// import Puppeteer from "./src/Puppeteer.js";
-console.log(process.argv);
-const Project = await import(process.argv[2]);
-export default new ITProject(Project);

package/dist/module/init-docs.js

@@ -1,3 +0,0 @@
-import Init from "./src/Init.js";
-import Project from "./testeranto.js";
-export default Init(Project);

package/dist/module/run-tests.js

@@ -1,6 +0,0 @@
-import process from "process";
-process.chdir(__dirname);
-import Puppeteer from "./src/Puppeteer.js";
-console.log(process.argv);
-const Project = await import(process.argv[2]);
-export default Puppeteer(Project);