testeranto 0.125.3 → 0.129.0

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCheck = exports.BaseThen = exports.BaseWhen = exports.BaseGiven = exports.BaseSuite = void 0;
+const pmProxy_js_1 = require("./pmProxy.js");
 class BaseSuite {
     constructor(name, index, givens = {}, checks = []) {
         this.name = name;
@@ -46,22 +47,8 @@ class BaseSuite {
         // console.log("\nSuite:", this.index, this.name);
         tLog("\nSuite:", this.index, this.name);
         const sNdx = this.index;
-        const sName = this.name;
-        const beforeAllProxy = new Proxy(pm, {
-            get(target, prop, receiver) {
-                if (prop === "customScreenShot") {
-                    return (opts, p) => target.customScreenShot(Object.assign(Object.assign({}, opts), { 
-                        // path: `${filepath}/${opts.path}`,
-                        path: `suite-${sNdx}/beforeAll/${opts.path}` }), p);
-                }
-                if (prop === "writeFileSync") {
-                    return (fp, contents) => target[prop](`suite-${sNdx}/beforeAll/${fp}`, contents);
-                }
-                /* @ts-ignore:next-line */
-                return Reflect.get(...arguments);
-            },
-        });
-        const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, beforeAllProxy);
+        // const sName = this.name;
+        const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, (0, pmProxy_js_1.beforeAllProxy)(pm, sNdx.toString()));
         for (const [gKey, g] of Object.entries(this.givens)) {
             const giver = this.givens[gKey];
             try {
@@ -79,9 +66,7 @@ class BaseSuite {
             await thater.check(subject, thater.name, testResourceConfiguration, this.assertThat, suiteArtifactory, tLog, pm);
         }
         try {
-            this.afterAll(this.store, artifactory, 
-            // afterAllProxy
-            pm);
+            this.afterAll(this.store, artifactory, (0, pmProxy_js_1.afterAllProxy)(pm, sNdx.toString()));
         }
         catch (e) {
             console.error(e);
@@ -135,30 +120,16 @@ class BaseGiven {
         tLog(`\n ${this.key}`);
         tLog(`\n Given: ${this.name}`);
         const givenArtifactory = (fPath, value) => artifactory(`given-${key}/${fPath}`, value);
-        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(Object.assign(Object.assign({}, opts), { path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}` }), p);
-                }
-                if (prop === "screencast") {
-                    return (opts, p) => target.screencast(Object.assign(Object.assign({}, opts), { path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}` }), p);
-                }
-                /* @ts-ignore:next-line */
-                return Reflect.get(...arguments);
-            },
-        });
         this.uberCatcher((e) => {
             console.error(e);
             this.error = e.error;
             tLog(e.stack);
         });
         try {
-            this.store = await this.givenThat(subject, testResourceConfiguration, givenArtifactory, this.givenCB, this.initialValues, beforeEachProxy);
+            this.store = await this.givenThat(subject, testResourceConfiguration, givenArtifactory, this.givenCB, this.initialValues, (0, pmProxy_js_1.beforeEachProxy)(pm, suiteNdx.toString()));
         }
         catch (e) {
+            console.error("failure 4 ", e);
             this.error = e;
             throw e;
         }
@@ -169,37 +140,25 @@ class BaseGiven {
             }
             for (const [thenNdx, thenStep] of this.thens.entries()) {
                 const t = await thenStep.test(this.store, testResourceConfiguration, tLog, pm, `suite-${suiteNdx}/given-${key}/then-${thenNdx}`);
-                tester(t);
+                return tester(t);
+                // ((t) => {
+                //   return tester(t);
+                // })();
             }
         }
         catch (e) {
-            // this.error = e;
             this.failed = true;
             tLog(e.stack);
             throw e;
         }
         finally {
             try {
-                const afterEachProxy = new Proxy(pm, {
-                    get(target, prop, receiver) {
-                        if (prop === "customScreenShot") {
-                            return (opts, p) => target.customScreenShot(Object.assign(Object.assign({}, opts), { path: `suite-${suiteNdx}/given-${key}/afterEach/${opts.path}` }), p);
-                        }
-                        if (prop === "writeFileSync") {
-                            return (fp, contents) => target[prop](`suite-${suiteNdx}/given-${key}/afterEach/${fp}`, contents);
-                        }
-                        /* @ts-ignore:next-line */
-                        return Reflect.get(...arguments);
-                    },
-                });
-                await this.afterEach(this.store, this.key, givenArtifactory, 
-                // pm
-                afterEachProxy);
+                await this.afterEach(this.store, this.key, givenArtifactory, (0, pmProxy_js_1.afterEachProxy)(pm, suiteNdx.toString(), key));
             }
             catch (e) {
+                console.error("afterEach failed!", e);
                 this.failed = e;
                 throw e;
-                // console.error("afterEach failed!", e);
                 // this.error = e.message;
             }
         }
@@ -220,33 +179,10 @@ class BaseWhen {
     }
     async test(store, testResourceConfiguration, tLog, pm, filepath) {
         tLog(" When:", this.name);
-        const andWhenProxy = new Proxy(pm, {
-            get(target, prop, receiver) {
-                if (prop === "customScreenShot") {
-                    return (opts, p) => target.customScreenShot(Object.assign(Object.assign({}, opts), { path: `${filepath}/${opts.path}` }), p);
-                }
-                if (prop === "writeFileSync") {
-                    return (fp, contents) => target[prop](`${filepath}/andWhen/${fp}`, contents);
-                }
-                /* @ts-ignore:next-line */
-                return Reflect.get(...arguments);
-            },
-        });
-        return await this.andWhen(store, this.whenCB, testResourceConfiguration, andWhenProxy).catch((e) => {
+        return await this.andWhen(store, this.whenCB, testResourceConfiguration, (0, pmProxy_js_1.andWhenProxy)(pm, filepath)).catch((e) => {
             this.error = true;
             // throw e;
         });
-        // try {
-        //   return await this.andWhen(
-        //     store,
-        //     this.whenCB,
-        //     testResourceConfiguration,
-        //     andWhenProxy
-        //   );
-        // } catch (e) {
-        //   this.error = true;
-        //   throw e;
-        // }
     }
 }
 exports.BaseWhen = BaseWhen;
@@ -263,40 +199,19 @@ class BaseThen {
         };
     }
     async test(store, testResourceConfiguration, tLog, pm, filepath) {
-        this.go = async (s) => {
+        return this.butThen(store, async (s) => {
             tLog(" Then!!!:", this.name);
-            try {
-                await this.thenCB(s);
+            if (typeof this.thenCB === "function") {
+                return await this.thenCB(s);
             }
-            catch (e) {
-                console.log("test failed 1", e);
-                this.error = e;
-                throw e;
+            else {
+                return this.thenCB;
             }
-        };
-        try {
-            const butThenProxy = new Proxy(pm, {
-                get(target, prop, receiver) {
-                    if (prop === "customScreenShot") {
-                        return (opts, p) => target.customScreenShot(Object.assign(Object.assign({}, opts), { path: `${filepath}/${opts.path}` }), p);
-                    }
-                    if (prop === "writeFileSync") {
-                        return (fp, contents) => target[prop](`${filepath}/${fp}`, contents);
-                    }
-                    /* @ts-ignore:next-line */
-                    return Reflect.get(...arguments);
-                },
-            });
-            return this.butThen(store, this.go, testResourceConfiguration, butThenProxy).catch((e) => {
-                this.error = e;
-                throw e;
-            });
-        }
-        catch (e) {
-            console.log("test failed 2", e);
+        }, testResourceConfiguration, (0, pmProxy_js_1.butThenProxy)(pm, filepath)).catch((e) => {
+            console.log("test failed 3", e);
             this.error = e;
             throw e;
-        }
+        });
     }
     check() { }
 }
@@ -312,7 +227,7 @@ class BaseCheck {
         return {
             key: this.key,
             name: this.name,
-            functionAsString: this.checkCB.toString(),
+            // functionAsString: this.checkCB.toString(),
             features: this.features,
         };
     }

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

@@ -41,27 +41,26 @@ class BaseBuilder {
                         res(true);
                     });
                     const fails = suiteDone.fails;
-                    const b = await puppetMaster.writeFileSync(`bdd_errors.txt`, fails.toString());
-                    await puppetMaster.writeFileSync(`littleBoard.html`, `
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta name="description" content="Webpage description goes here" />
-  <meta charset="utf-8" />
-  <title>kokomoBay - testeranto</title>
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="author" content="" />
-
-  <link rel="stylesheet" href="/kokomoBay/testeranto/TestReport.css" />
-  <script src="/kokomoBay/testeranto/TestReport.js"></script>
-
-</head>
-
-<body>
-  <div id="root"/>
-</body>
-            `);
+                    await puppetMaster.writeFileSync(`bdd_errors.txt`, fails.toString());
+                    //           await puppetMaster.writeFileSync(
+                    //             `index.html`,
+                    //             `
+                    // <!DOCTYPE html>
+                    // <html lang="en">
+                    // <head>
+                    //   <meta name="description" content="Webpage description goes here" />
+                    //   <meta charset="utf-8" />
+                    //   <title>kokomoBay - testeranto</title>
+                    //   <meta name="viewport" content="width=device-width, initial-scale=1" />
+                    //   <meta name="author" content="" />
+                    //   <link rel="stylesheet" href="/kokomoBay/testeranto/TestReport.css" />
+                    //   <script src="/kokomoBay/testeranto/TestReport.js"></script>
+                    // </head>
+                    // <body>
+                    //   <div id="root"/>
+                    // </body>
+                    //             `
+                    //           );
                     await puppetMaster.writeFileSync(`tests.json`, JSON.stringify(this.toObj(), null, 2));
                     return {
                         failed: fails > 0,

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

@@ -27,7 +27,18 @@ class ClassBuilder extends basebuilder_js_1.BaseBuilder {
         }, {});
         const classyThens = Object.entries(testImplementation.thens).reduce((a, [key, thEn]) => {
             a[key] = (expected, x) => {
-                return new thenKlasser.prototype.constructor(`${thEn.name}: ${expected && expected.toString()}`, thEn(expected));
+                return new thenKlasser.prototype.constructor(`${thEn.name}: ${expected && expected.toString()}`, 
+                // () => {
+                //   thEn(expected);
+                //   // return new Promise((res), rej) => {
+                //   // }
+                //   // try {
+                //   //   thEn(expected);
+                //   // } catch (c) {
+                //   //   console.log("mark99");
+                //   // }
+                // },
+                thEn(expected));
             };
             return a;
         }, {});

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

@@ -41,14 +41,7 @@ class Testeranto extends classBuilder_js_1.ClassBuilder {
             }
         }, class Then extends abstractBase_js_1.BaseThen {
             async butThen(store, thenCB, testResource, pm) {
-                return await fullTestInterface
-                    .butThen(store, thenCB, testResource, pm)
-                    .then((v) => {
-                    return v;
-                }, (e) => {
-                    console.log(" ERROR ", e);
-                    throw e;
-                });
+                return await fullTestInterface.butThen(store, thenCB, testResource, pm);
             }
         }, class Check extends abstractBase_js_1.BaseCheck {
             constructor(name, features, checkCallback, x, i, c) {

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

@@ -9,13 +9,10 @@ exports.BaseTestInterface = {
     afterEach: async (s) => s,
     afterAll: (store) => undefined,
     butThen: async (store, thenCb) => {
-        try {
-            thenCb(store);
-        }
-        catch (e) { }
+        return thenCb(store);
     },
     andWhen: async (a) => a,
-    assertThis: () => null,
+    assertThis: (x) => null,
 };
 const DefaultTestInterface = (p) => {
     return Object.assign(Object.assign({}, exports.BaseTestInterface), p);

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

@@ -0,0 +1,294 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.afterAllProxy = exports.beforeAllProxy = exports.beforeEachProxy = exports.afterEachProxy = exports.andWhenProxy = exports.butThenProxy = void 0;
+const prxy = function (pm, mappings) {
+    return new Proxy(pm, {
+        get: (target, prop, receiver) => {
+            for (const mapping of mappings) {
+                const method = mapping[0];
+                const arger = mapping[1];
+                if (prop === method) {
+                    return (x) => target[prop](arger(x));
+                }
+            }
+            return (...x) => target[prop](...x);
+        },
+    });
+};
+const butThenProxy = (pm, filepath) => prxy(pm, [
+    [
+        "screencast",
+        (opts, p) => [
+            Object.assign(Object.assign({}, opts), { path: `${filepath}/butThen/${opts.path}` }),
+            p,
+        ],
+    ],
+    ["createWriteStream", (fp) => [`${filepath}/butThen/${fp}`]],
+    [
+        "writeFileSync",
+        (fp, contents) => [`${filepath}/butThen/${fp}`, contents],
+    ],
+    [
+        "customScreenShot",
+        (opts, p) => [
+            Object.assign(Object.assign({}, opts), { path: `${filepath}/butThen/${opts.path}` }),
+            p,
+        ],
+    ],
+]);
+exports.butThenProxy = butThenProxy;
+const andWhenProxy = (pm, filepath) => prxy(pm, [
+    [
+        "screencast",
+        (opts, p) => [
+            Object.assign(Object.assign({}, opts), { path: `${filepath}/andWhen/${opts.path}` }),
+            p,
+        ],
+    ],
+    ["createWriteStream", (fp) => [`${filepath}/andWhen/${fp}`]],
+    ["writeFileSync", (fp, contents) => [`${filepath}/andWhen${fp}`, contents]],
+    [
+        "customScreenShot",
+        (opts, p) => [
+            Object.assign(Object.assign({}, opts), { path: `${filepath}/andWhen${opts.path}` }),
+            p,
+        ],
+    ],
+]);
+exports.andWhenProxy = andWhenProxy;
+const afterEachProxy = (pm, suite, given) => prxy(pm, [
+    [
+        "screencast",
+        (opts, p) => [
+            Object.assign(Object.assign({}, opts), { path: `suite-${suite}/given-${given}/afterEach/${opts.path}` }),
+            p,
+        ],
+    ],
+    ["createWriteStream", (fp) => [`suite-${suite}/afterEach/${fp}`]],
+    [
+        "writeFileSync",
+        (fp, contents) => [
+            `suite-${suite}/given-${given}/afterEach/${fp}`,
+            contents,
+        ],
+    ],
+    [
+        "customScreenShot",
+        (opts, p) => [
+            Object.assign(Object.assign({}, opts), { path: `suite-${suite}/given-${given}/afterEach/${opts.path}` }),
+            p,
+        ],
+    ],
+]);
+exports.afterEachProxy = afterEachProxy;
+const beforeEachProxy = (pm, suite) => prxy(pm, [
+    [
+        "screencast",
+        (opts, p) => [
+            Object.assign(Object.assign({}, opts), { path: `suite-${suite}/beforeEach/${opts.path}` }),
+            p,
+        ],
+    ],
+    [
+        "writeFileSync",
+        (fp, contents) => [`suite-${suite}/beforeEach/${fp}`, contents],
+    ],
+    [
+        "customScreenShot",
+        (opts, p) => [
+            Object.assign(Object.assign({}, opts), { path: `suite-${suite}/beforeEach/${opts.path}` }),
+            p,
+        ],
+    ],
+    ["createWriteStream", (fp) => [`suite-${suite}/beforeEach/${fp}`]],
+]);
+exports.beforeEachProxy = beforeEachProxy;
+const beforeAllProxy = (pm, suite) => prxy(pm, [
+    [
+        "writeFileSync",
+        (fp, contents) => [`suite-${suite}/beforeAll/${fp}`, contents],
+    ],
+    [
+        "customScreenShot",
+        (opts, p) => [
+            Object.assign(Object.assign({}, opts), { path: `suite-${suite}/beforeAll/${opts.path}` }),
+            p,
+        ],
+    ],
+    ["createWriteStream", (fp) => [`suite-${suite}/beforeAll/${fp}`]],
+]);
+exports.beforeAllProxy = beforeAllProxy;
+const afterAllProxy = (pm, suite) => prxy(pm, [
+    ["createWriteStream", (fp) => [`suite-${suite}/afterAll/${fp}`]],
+    [
+        "writeFileSync",
+        (fp, contents) => [`suite-${suite}/afterAll/${fp}`, contents],
+    ],
+    [
+        "customScreenShot",
+        (opts, p) => [
+            Object.assign(Object.assign({}, opts), { path: `suite-${suite}/afterAll/${opts.path}` }),
+            p,
+        ],
+    ],
+]);
+exports.afterAllProxy = afterAllProxy;
+/////////////////////////////////////////////////
+// export const butThenProxy = (pm: IPM, filepath: string) => {
+//   return new Proxy(pm, {
+//     get: (target, prop, receiver) => {
+//       if (prop === "customScreenShot") {
+//         return (opts, p) =>
+//           target.customScreenShot(
+//             {
+//               ...opts,
+//               path: `${filepath}/${opts.path}`,
+//             },
+//             p
+//           );
+//       }
+//       if (prop === "writeFileSync") {
+//         return (fp, contents) => target[prop](`${filepath}/${fp}`, contents);
+//       }
+//     },
+//   });
+// };
+// export const andWhenProxy = (pm: IPM, filepath: string) => {
+//   return new Proxy(pm, {
+//     get(target, prop, receiver) {
+//       if (prop === "customScreenShot") {
+//         return (opts, p) =>
+//           target.customScreenShot(
+//             {
+//               ...opts,
+//               path: `${filepath}/${opts.path}`,
+//             },
+//             p
+//           );
+//       }
+//       if (prop === "writeFileSync") {
+//         return (fp, contents) =>
+//           target[prop](`${filepath}/andWhen/${fp}`, contents);
+//       }
+//       /* @ts-ignore:next-line */
+//       return Reflect.get(...arguments);
+//     },
+//   });
+// };
+// export const afterEachProxy = (pm: IPM, suite: string, given: string): IPM => {
+//   return new Proxy(pm, {
+//     get(target, prop, receiver) {
+//       if (prop === "customScreenShot") {
+//         return (opts, p) =>
+//           target.customScreenShot(
+//             {
+//               ...opts,
+//               path: `suite-${suite}/given-${given}/afterEach/${opts.path}`,
+//             },
+//             p
+//           );
+//       }
+//       if (prop === "writeFileSync") {
+//         return (fp, contents) =>
+//           target[prop](
+//             `suite-${suite}/given-${given}/afterEach/${fp}`,
+//             contents
+//           );
+//       }
+//       /* @ts-ignore:next-line */
+//       return Reflect.get(...arguments);
+//     },
+//   });
+// };
+// export const beforeAllProxy = (pm: IPM, suite: string): IPM => {
+//   return new Proxy(pm, {
+//     get(target, prop, receiver) {
+//       if (prop === "customScreenShot") {
+//         return (opts, p) =>
+//           target.customScreenShot(
+//             {
+//               ...opts,
+//               // path: `${filepath}/${opts.path}`,
+//               path: `suite-${suite}/beforeAll/${opts.path}`,
+//             },
+//             p
+//           );
+//       }
+//       if (prop === "writeFileSync") {
+//         return (fp, contents) =>
+//           target[prop](`suite-${suite}/beforeAll/${fp}`, contents);
+//       }
+//       /* @ts-ignore:next-line */
+//       return Reflect.get(...arguments);
+//     },
+//   });
+// };
+// export const beforeEachProxy = (pm: IPM, suite: string, given: string): IPM => {
+//   return new Proxy(pm, {
+//     get(target, prop, receiver) {
+//       // if (prop === "write") {
+//       //   return (handle, contents) =>
+//       //     target[prop](
+//       //       `suite-${suiteNdx}/given-${key}/when/beforeEach/${fp}`,
+//       //       contents
+//       //     );
+//       // }
+//       if (prop === "createWriteStream") {
+//         return (fp) =>
+//           target[prop](`suite-${suite}/given-${given}/when/beforeEach/${fp}`);
+//       }
+//       if (prop === "writeFileSync") {
+//         return (fp, contents) =>
+//           target[prop](
+//             `suite-${suite}/given-${given}/when/beforeEach/${fp}`,
+//             contents
+//           );
+//       }
+//       if (prop === "customScreenShot") {
+//         return (opts, p) =>
+//           target.customScreenShot(
+//             {
+//               ...opts,
+//               path: `suite-${suite}/given-${given}/when/beforeEach/${opts.path}`,
+//             },
+//             p
+//           );
+//       }
+//       if (prop === "screencast") {
+//         return (opts, p) =>
+//           target.screencast(
+//             {
+//               ...opts,
+//               path: `suite-${suite}/given-${given}/when/beforeEach/${opts.path}`,
+//             },
+//             p
+//           );
+//       }
+//       /* @ts-ignore:next-line */
+//       return Reflect.get(...arguments);
+//     },
+//   });
+// };
+// export const afterAllProxy = (pm: IPM, suite: string): IPM => {
+//   return new Proxy(pm, {
+//     get(target, prop, receiver) {
+//       if (prop === "customScreenShot") {
+//         return (opts, p) =>
+//           target.customScreenShot(
+//             {
+//               ...opts,
+//               // path: `${filepath}/${opts.path}`,
+//               path: `suite-${suite}/afterAll/${opts.path}`,
+//             },
+//             p
+//           );
+//       }
+//       if (prop === "writeFileSync") {
+//         return (fp, contents) =>
+//           target[prop](`suite-${suite}/afterAll/${fp}`, contents);
+//       }
+//       /* @ts-ignore:next-line */
+//       return Reflect.get(...arguments);
+//     },
+//   });
+// };