testeranto 0.85.0 → 0.94.0

package/dist/common/src/lib/abstractBase.js

@@ -44,11 +44,12 @@ class BaseSuite {
         this.testResourceConfiguration = testResourceConfiguration;
         tLog("test resources: ", JSON.stringify(testResourceConfiguration));
         const suiteArtifactory = (fPath, value) => 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") {
@@ -59,65 +60,13 @@ class BaseSuite {
                     if (prop === "writeFileSync") {
                         return (fp, contents) => 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);
                 },
             });
             const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, beforeAllProxy);
-            const giver = this.givens[gNdx];
+            const giver = this.givens[gKey];
             try {
-                this.store = await giver.give(subject, gNdx, testResourceConfiguration, this.assertThat, suiteArtifactory, tLog, pm, sNdx);
+                this.store = await giver.give(subject, gKey, testResourceConfiguration, this.assertThat, suiteArtifactory, tLog, pm, sNdx);
             }
             catch (e) {
                 console.error(e);
@@ -125,64 +74,6 @@ class BaseSuite {
                 // return this;
             }
         }
-        // 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, artifactory, 
             // afterAllProxy
@@ -221,7 +112,9 @@ class BaseSuite {
 }
 exports.BaseSuite = BaseSuite;
 class BaseGiven {
-    constructor(name, features, whens, thens, givenCB, initialValues) {
+    constructor(name, features, whens, thens, givenCB, initialValues
+    // key: string
+    ) {
         this.name = name;
         this.features = features;
         this.whens = whens;
@@ -229,11 +122,15 @@ class BaseGiven {
         this.givenCB = givenCB;
         this.initialValues = initialValues;
     }
-    beforeAll(store, artifactory) {
+    beforeAll(store, 
+    // 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()),
@@ -246,30 +143,34 @@ class BaseGiven {
         return store;
     }
     async give(subject, key, testResourceConfiguration, tester, artifactory, tLog, pm, suiteNdx) {
+        this.key = key;
+        tLog(`\n ${this.key}`);
         tLog(`\n Given: ${this.name}`);
-        const givenArtifactory = (fPath, value) => artifactory(`given-${key}/${fPath}`, value);
+        const givenArtifactory = (fPath, value) => artifactory(`given-${this.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);
+                        return (fp, contents) => target[prop](`suite-${suiteNdx}/given-${this.key}/when/beforeEach/${fp}`, contents);
                     }
                     if (prop === "customScreenShot") {
-                        return (opts) => target.customScreenShot(Object.assign(Object.assign({}, opts), { 
-                            // path: `${filepath}/${opts.path}`,
-                            path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}` }));
+                        return (opts) => target.customScreenShot(Object.assign(Object.assign({}, opts), { path: `suite-${suiteNdx}/given-${this.key}/when/beforeEach/${opts.path}` }));
                     }
                     return Reflect.get(...arguments);
                 },
             });
-            this.store = await this.givenThat(subject, testResourceConfiguration, givenArtifactory, this.givenCB, beforeEachProxy);
-            // console.log("mark6", this.store);
+            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);
             for (const [whenNdx, whenStep] of this.whens.entries()) {
-                await whenStep.test(this.store, testResourceConfiguration, tLog, pm, `suite-${suiteNdx}/given-${key}/when/${whenNdx}`);
+                await whenStep.test(this.store, testResourceConfiguration, tLog, pm, `suite-${suiteNdx}/given-${this.key}/when/${whenNdx}`);
             }
             for (const [thenNdx, thenStep] of this.thens.entries()) {
-                const t = await thenStep.test(this.store, testResourceConfiguration, tLog, pm, `suite-${suiteNdx}/given-${key}/then-${thenNdx}`);
+                const t = await thenStep.test(this.store, testResourceConfiguration, tLog, pm, `suite-${suiteNdx}/given-${this.key}/then-${thenNdx}`);
                 tester(t);
             }
         }
@@ -285,79 +186,15 @@ class BaseGiven {
                 const afterEachProxy = new Proxy(pm, {
                     get(target, prop, receiver) {
                         if (prop === "customScreenShot") {
-                            return (opts) => target.customScreenShot(Object.assign(Object.assign({}, opts), { path: `suite-${suiteNdx}/given-${key}/afterEach/${opts.path}` }));
+                            return (opts) => target.customScreenShot(Object.assign(Object.assign({}, opts), { path: `suite-${suiteNdx}/given-${this.key}/afterEach/${opts.path}` }));
                         }
                         if (prop === "writeFileSync") {
-                            return (fp, contents) => target[prop](`suite-${suiteNdx}/given-${key}/afterEach/${fp}`, contents);
+                            return (fp, contents) => target[prop](`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, givenArtifactory, 
+                await this.afterEach(this.store, this.key, givenArtifactory, 
                 // pm
                 afterEachProxy);
             }
@@ -515,62 +352,6 @@ class BaseThen {
                     if (prop === "writeFileSync") {
                         return (fp, contents) => 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/dist/common/src/lib/basebuilder.js

@@ -14,21 +14,11 @@ class BaseBuilder {
         this.checkOverides = checkOverides;
         this.testSpecification = testSpecification;
         this.specs = testSpecification(this.Suites(), this.Given(), this.When(), this.Then(), this.Check());
-        // const f = this.specs[0].features;
         this.testJobs = this.specs.map((suite) => {
             const suiteRunner = (suite) => async (puppetMaster, tLog) => {
-                // const puppeteerBrowser = await puppetMaster.startPuppeteer(
-                //   {
-                //     browserWSEndpoint:
-                //       puppetMaster.testResourceConfiguration.browserWSEndpoint,
-                //   },
-                //   puppetMaster.testResourceConfiguration.fs
-                // );
                 const x = await suite.run(input, puppetMaster.testResourceConfiguration, (fPath, value) => puppetMaster.testArtiFactoryfileWriter(tLog, (p) => {
                     this.artifacts.push(p);
                 })(puppetMaster.testResourceConfiguration.fs + "/" + fPath, value), tLog, puppetMaster);
-                // await puppetMaster.browser.disconnect();
-                // puppeteerBrowser.close();
                 return x;
             };
             const runner = suiteRunner(suite);
@@ -62,7 +52,7 @@ class BaseBuilder {
                     //   );
                     // }
                     puppetMaster.writeFileSync(`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,
                         artifacts: this.artifacts || [],

package/dist/common/src/lib/classBuilder.js

@@ -10,7 +10,7 @@ class ClassBuilder extends basebuilder_js_1.BaseBuilder {
             };
             return a;
         }, {});
-        const classyGivens = Object.entries(testImplementation.givens).reduce((a, [key, givEn]) => {
+        const classyGivens = Object.entries(testImplementation.givens).reduce((a, [key, g]) => {
             a[key] = (features, whens, thens, givEn) => {
                 return new givenKlasser.prototype.constructor(key, features, whens, thens, testImplementation.givens[key], givEn);
             };

package/dist/common/src/lib/core.js

@@ -4,28 +4,10 @@ const index_js_1 = require("./index.js");
 const abstractBase_js_1 = require("./abstractBase.js");
 const classBuilder_js_1 = require("./classBuilder.js");
 class Testeranto extends classBuilder_js_1.ClassBuilder {
-    constructor(input, testSpecification, testImplementation, testResourceRequirement = index_js_1.defaultTestResourceRequirement, testInterface) {
+    constructor(input, testSpecification, testImplementation, testResourceRequirement = index_js_1.defaultTestResourceRequirement, testInterface, uberCatcher) {
         const fullTestInterface = (0, index_js_1.DefaultTestInterface)(testInterface);
         super(testImplementation, testSpecification, input, class extends abstractBase_js_1.BaseSuite {
             afterAll(store, artifactory, 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, value) => {
                     artifactory(`afterAll4-${this.name}/${fPath}`, value);
                 }, pm);
@@ -38,10 +20,12 @@ class Testeranto extends classBuilder_js_1.ClassBuilder {
                     (async (input, artifactory, tr, pm) => input))(s, this.testResourceConfiguration, artifactory, pm);
             }
         }, class Given extends abstractBase_js_1.BaseGiven {
-            async givenThat(subject, testResource, artifactory, initializer, pm) {
-                return fullTestInterface.beforeEach(subject, initializer, (fPath, value) => 
-                // TODO does not work?
-                artifactory(`beforeEach/${fPath}`, value), testResource, this.initialValues, pm);
+            constructor() {
+                super(...arguments);
+                this.uberCatcher = uberCatcher;
+            }
+            async givenThat(subject, testResource, artifactory, initializer, initialValues, pm) {
+                return fullTestInterface.beforeEach(subject, initializer, artifactory, testResource, initialValues, pm);
             }
             afterEach(store, key, artifactory, pm) {
                 return new Promise((res) => res(fullTestInterface.afterEach(store, key, (fPath, value) => artifactory(`after/${fPath}`, value), pm)));
@@ -111,9 +95,7 @@ class Testeranto extends classBuilder_js_1.ClassBuilder {
                 // TODO does not work?
                 artifactory(`afterEach2-${this.name}/${fPath}`, value), pm)));
             }
-        }, testResourceRequirement
-        // puppetMaster
-        );
+        }, testResourceRequirement);
     }
 }
 exports.default = Testeranto;

package/dist/common/{build-tests.js → src/run-tests.js}

@@ -1,5 +1,4 @@
 "use strict";
-// import { ITProject } from "./src/Project.js";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -27,12 +26,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-// import Project from "./testeranto.js";
+const Puppeteer_js_1 = __importDefault(require("./Puppeteer.js"));
 const process_1 = __importDefault(require("process"));
-const Project_1 = require("./src/Project");
-// import { ITProject } from "testeranto/src/Project";
-// process.chdir(__dirname);
-// import Puppeteer from "./src/Puppeteer.js";
-console.log(process_1.default.argv);
-const Project = await Promise.resolve().then(() => __importStar(require(process_1.default.argv[2])));
-exports.default = new Project_1.ITProject(Project);
+if (!process_1.default.argv[2]) {
+    console.log("You didn't pass a config file");
+    process_1.default.exit(-1);
+}
+else {
+    Promise.resolve().then(() => __importStar(require(process_1.default.cwd() + "/" + process_1.default.argv[2]))).then((module) => {
+        (0, Puppeteer_js_1.default)(module.default);
+    });
+}