testeranto 0.70.0 → 0.73.0

package/dist/module/Web.js

@@ -1,52 +1,33 @@
+import { PM_Web } from "./PM/web";
 import Testeranto from "./lib/core.js";
 import { defaultTestResourceRequirement, } from "./lib/index.js";
-// const remote = require("@electron/remote");
-// import remote from "@electron/remote";
-// const electron = require("electron");
-// const remote =
-//   process.type === "browser" ? electron : require("@electron/remote");
 class WebTesteranto extends Testeranto {
     constructor(input, testSpecification, testImplementation, testResourceRequirement, testInterface) {
-        super(input, testSpecification, testImplementation, testResourceRequirement, window.NodeWriter, testInterface);
-        const testResourceArg = decodeURIComponent(new URLSearchParams(location.search).get("requesting") || "");
-        try {
-            const partialTestResource = JSON.parse(testResourceArg);
-            this.receiveTestResourceConfig(this.testJobs[0], partialTestResource);
-        }
-        catch (e) {
-            console.error(e);
-            // process.exit(-1);
-        }
-        const requesting = new URLSearchParams(location.search).get("requesting");
-        if (requesting) {
-            const testResourceArg = decodeURIComponent(requesting);
-            try {
-                const partialTestResource = JSON.parse(testResourceArg);
-                console.log("initial test resource", partialTestResource);
-                this.receiveTestResourceConfig(this.testJobs[0], partialTestResource);
-            }
-            catch (e) {
-                console.error(e);
-                // process.exit(-1);
-            }
-        }
+        super(input, testSpecification, testImplementation, testResourceRequirement, testInterface);
     }
-    async receiveTestResourceConfig(t, partialTestResource) {
-        const { failed, artifacts, logPromise } = await t.receiveTestResourceConfig(partialTestResource, {
-            browser: await window.browser,
-            ipc: window.ipcRenderer,
-        });
+    async receiveTestResourceConfig(partialTestResource) {
+        const t = partialTestResource; //JSON.parse(partialTestResource);
+        const pm = new PM_Web(t);
+        const { failed, artifacts, logPromise } = await this.testJobs[0].receiveTestResourceConfig(pm);
         console.log("test is done, awaiting test result write to fs");
-        Promise.all([...artifacts, logPromise]).then(async () => {
-            // we can't close the window becuase we might be taking a screenshot
-            // window.close();
-            // console.log(
-            //   "(window as any).browser",
-            //   JSON.stringify(await (window as any).browser)
-            // );
-            // var currentWindow = (await (window as any).browser).getCurrentWindow();
-            // currentWindow.close();
-        });
+        pm.customclose();
+        // Promise.all([...artifacts, logPromise]).then(async () => {
+        //   console.log("hello world");
+        //   pm.customclose();
+        //   // we can't close the window becuase we might be taking a screenshot
+        //   // window.close();
+        //   // console.log(
+        //   //   "(window as any).browser",
+        //   //   JSON.stringify(await (window as any).browser)
+        //   // );
+        //   // var currentWindow = (await (window as any).browser).getCurrentWindow();
+        //   // window.close();
+        //   // var customWindow = window.open("", "_blank", "");
+        //   // customWindow.close();
+        //   // this.puppetMaster.browser.page
+        //   // window["customclose"]();
+        //   // console.log("goodbye", window["customclose"]());
+        // });
     }
 }
 export default async (input, testSpecification, testImplementation, testInterface, testResourceRequirement = defaultTestResourceRequirement) => {

package/dist/module/esbuildConfigs/web.js

@@ -14,7 +14,6 @@ export default (config, entryPoints) => {
             "features.test.ts",
             // "url",
             "react",
-            "electron",
             "path",
             "fs",
             "stream",
@@ -29,6 +28,9 @@ export default (config, entryPoints) => {
             "zlib",
             "crypto",
             "https",
+            "util",
+            "process",
+            "dns",
         ], platform: "browser", entryPoints: [...entryPoints], plugins: [
             ...(config.webPlugins || []),
             {

package/dist/module/lib/abstractBase.js

@@ -13,45 +13,114 @@ export class BaseSuite {
             fails: this.fails,
         };
     }
-    setup(s, artifactory, tr, utils) {
+    setup(s, artifactory, tr, pm) {
         return new Promise((res) => res(s));
     }
     assertThat(t) {
-        // console.log("base assertThat")
         return t;
     }
-    async run(input, testResourceConfiguration, artifactory, tLog, utils) {
+    afterAll(store, artifactory, pm) {
+        return store;
+    }
+    async run(input, testResourceConfiguration, artifactory, tLog, pm) {
         this.testResourceConfiguration = testResourceConfiguration;
-        tLog("test resources: ", testResourceConfiguration);
+        tLog("test resources: ", JSON.stringify(testResourceConfiguration));
         const suiteArtifactory = (fPath, value) => artifactory(`suite-${this.index}-${this.name}/${fPath}`, value);
-        const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, utils);
+        console.log("\nSuite:", this.index, this.name);
         tLog("\nSuite:", this.index, this.name);
-        for (const k of Object.keys(this.givens)) {
-            const giver = this.givens[k];
+        const sNdx = this.index;
+        const sName = this.name;
+        for (const [gNdx, g] of Object.entries(this.givens)) {
+            const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, pm);
+            const giver = this.givens[gNdx];
             try {
-                this.store = await giver.give(subject, k, testResourceConfiguration, this.assertThat, suiteArtifactory, tLog, utils);
+                this.store = await giver.give(subject, gNdx, testResourceConfiguration, this.assertThat, suiteArtifactory, tLog, pm, sNdx);
             }
             catch (e) {
                 console.error(e);
                 this.fails.push(giver);
-                return this;
+                // return this;
             }
         }
-        for (const [ndx, thater] of this.checks.entries()) {
-            await thater.check(subject, thater.name, testResourceConfiguration, this.assertThat, suiteArtifactory, tLog, utils);
+        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) => {
+                                                            // console.log(
+                                                            //   "custom-screenshot-MARK-afterAllProxy",
+                                                            //   // arguments,
+                                                            //   // x,
+                                                            //   window["custom-screenshot"].toString()
+                                                            // );
+                                                            return await window["custom-screenshot"](Object.assign(Object.assign({}, x), { path: `${testResourceConfiguration.fs}/suite-${sNdx}/afterAll` +
+                                                                    "/" +
+                                                                    x.path }));
+                                                        };
+                                                    }
+                                                    // 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);
+            },
+        });
+        // pm.browser
+        try {
+            this.afterAll(this.store, artifactory, afterAllProxy);
         }
-        // @TODO fix me
-        for (const k of Object.keys(this.givens)) {
-            const giver = this.givens[k];
-            try {
-                giver.afterAll(this.store, artifactory, utils);
-            }
-            catch (e) {
-                console.error(e);
-                this.fails.push(giver);
-                return this;
-            }
+        catch (e) {
+            console.error(e);
+            // this.fails.push(this);
+            // return this;
         }
+        // for (const [ndx, thater] of this.checks.entries()) {
+        //   await thater.check(
+        //     subject,
+        //     thater.name,
+        //     testResourceConfiguration,
+        //     this.assertThat,
+        //     suiteArtifactory,
+        //     tLog,
+        //     pm
+        //   );
+        // }
+        // @TODO fix me
+        // for (const k of Object.keys(this.givens)) {
+        //   const giver = this.givens[k];
+        //   try {
+        //     giver.afterAll(this.store, artifactory, pm);
+        //   } catch (e) {
+        //     console.error(e);
+        //     this.fails.push(giver);
+        //     return this;
+        //   }
+        // }
         ////////////////
         return this;
     }
@@ -68,32 +137,39 @@ export class BaseGiven {
     beforeAll(store, artifactory) {
         return store;
     }
-    afterAll(store, artifactory, utils) {
-        return store;
-    }
     toObj() {
         return {
             name: this.name,
             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,
             features: this.features,
         };
     }
-    async afterEach(store, key, artifactory, utils) {
+    async afterEach(store, key, artifactory, pm) {
         return store;
     }
-    async give(subject, key, testResourceConfiguration, tester, artifactory, tLog, utils) {
+    async give(subject, key, testResourceConfiguration, tester, artifactory, tLog, pm, suiteNdx) {
         tLog(`\n Given: ${this.name}`);
         const givenArtifactory = (fPath, value) => artifactory(`given-${key}/${fPath}`, value);
         try {
-            this.store = await this.givenThat(subject, testResourceConfiguration, givenArtifactory, this.givenCB);
             // tLog(`\n Given this.store`, this.store);
-            for (const whenStep of this.whens) {
-                await whenStep.test(this.store, testResourceConfiguration, tLog, utils);
+            const beforeEachProxy = new Proxy(pm, {
+                get(target, prop, receiver) {
+                    if (prop === "writeFileSync") {
+                        console.log("beforeEachProx", arguments, target[prop]);
+                        return (fp, contents) => target[prop](`suite-${suiteNdx}/given-${key}/when/beforeEach/${fp}`, contents);
+                    }
+                    return Reflect.get(...arguments);
+                },
+            });
+            this.store = await this.givenThat(subject, testResourceConfiguration, givenArtifactory, this.givenCB, beforeEachProxy);
+            for (const [whenNdx, whenStep] of this.whens.entries()) {
+                await whenStep.test(this.store, testResourceConfiguration, tLog, pm, `suite-${suiteNdx}/given-${key}/when/${whenNdx}`);
             }
             for (const thenStep of this.thens) {
-                const t = await thenStep.test(this.store, testResourceConfiguration, tLog, utils);
+                const t = await thenStep.test(this.store, testResourceConfiguration, tLog, pm);
                 tester(t);
             }
         }
@@ -105,7 +181,66 @@ export class BaseGiven {
         }
         finally {
             try {
-                await this.afterEach(this.store, key, givenArtifactory, utils);
+                // const afterEachProxy = new Proxy(pm, {
+                //   get(target, prop, receiver) {
+                //     if (prop === "writeFileSync") {
+                //       console.log("afterEachProxy", arguments, target[prop]);
+                //       return (fp, contents) =>
+                //         // target[prop](`${key}/andWhen/${fp}`, contents);
+                //         target[prop](`${key}/afterEach/${fp}`, contents);
+                //     }
+                //     return Reflect.get(...arguments);
+                //   },
+                // });
+                // await this.afterEach(this.store, key, givenArtifactory, afterEachProxy);
+                // await this.afterEach(this.store, key, givenArtifactory, pm);
+                const afterEachProxy = new Proxy(pm, {
+                    get(target, prop, receiver) {
+                        if (prop === "writeFileSync") {
+                            return (fp, contents) => target[prop](`suite-${suiteNdx}/given-${key}/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) => {
+                                                                    // console.log(
+                                                                    //   "custom-screenshot-MARK-afterEachProxy",
+                                                                    //   window["custom-screenshot"].toString()
+                                                                    // );
+                                                                    return await window["custom-screenshot"](Object.assign(Object.assign({}, x), { path: `${testResourceConfiguration.fs}/suite-${suiteNdx}/given-${key}/afterEach` +
+                                                                            "/" +
+                                                                            x.path }));
+                                                                };
+                                                            }
+                                                            // 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);
+                    },
+                });
+                await this.afterEach(this.store, key, givenArtifactory, afterEachProxy);
             }
             catch (e) {
                 console.error("afterEach failed! no error will be recorded!", e);
@@ -125,10 +260,22 @@ export class BaseWhen {
             error: this.error,
         };
     }
-    async test(store, testResourceConfiguration, tLog, utils) {
+    async test(store, testResourceConfiguration, tLog, pm, key) {
         tLog(" When:", this.name);
+        const name = this.name;
+        const andWhenProxy = new Proxy(pm, {
+            get(target, prop, receiver) {
+                if (prop === "writeFileSync") {
+                    console.log("andWhenProxy", arguments, target[prop]);
+                    return (fp, contents) => 
+                    // target[prop](`${key}/andWhen/${fp}`, contents);
+                    target[prop](`${key}/andWhen/${fp}`, contents);
+                }
+                return Reflect.get(...arguments);
+            },
+        });
         try {
-            return await this.andWhen(store, this.whenCB, testResourceConfiguration);
+            return await this.andWhen(store, this.whenCB, testResourceConfiguration, andWhenProxy);
         }
         catch (e) {
             this.error = true;
@@ -140,6 +287,7 @@ export class BaseThen {
     constructor(name, thenCB) {
         this.name = name;
         this.thenCB = thenCB;
+        this.error = false;
     }
     toObj() {
         return {
@@ -147,7 +295,7 @@ export class BaseThen {
             error: this.error,
         };
     }
-    async test(store, testResourceConfiguration, tLog, utils) {
+    async test(store, testResourceConfiguration, tLog, pm) {
         tLog(" Then:", this.name);
         try {
             const x = await this.butThen(store, this.thenCB, testResourceConfiguration);
@@ -155,7 +303,7 @@ export class BaseThen {
         }
         catch (e) {
             console.log("test failed", e);
-            this.error = true;
+            this.error = e.message;
             throw e;
         }
     }
@@ -168,25 +316,25 @@ export class BaseCheck {
         this.whens = whens;
         this.thens = thens;
     }
-    async afterEach(store, key, cb, utils) {
+    async afterEach(store, key, cb, pm) {
         return;
     }
-    async check(subject, key, testResourceConfiguration, tester, artifactory, tLog, utils) {
+    async check(subject, key, testResourceConfiguration, tester, artifactory, tLog, pm) {
         tLog(`\n Check: ${this.name}`);
         const store = await this.checkThat(subject, testResourceConfiguration, artifactory);
         await this.checkCB(Object.entries(this.whens).reduce((a, [key, when]) => {
             a[key] = async (payload) => {
-                return await when(payload, testResourceConfiguration).test(store, testResourceConfiguration, tLog, utils);
+                return await when(payload, testResourceConfiguration).test(store, testResourceConfiguration, tLog, pm, "x");
             };
             return a;
         }, {}), Object.entries(this.thens).reduce((a, [key, then]) => {
             a[key] = async (payload) => {
-                const t = await then(payload, testResourceConfiguration).test(store, testResourceConfiguration, tLog, utils);
+                const t = await then(payload, testResourceConfiguration).test(store, testResourceConfiguration, tLog, pm);
                 tester(t);
             };
             return a;
         }, {}));
-        await this.afterEach(store, key, () => { }, utils);
+        await this.afterEach(store, key, () => { }, pm);
         return;
     }
 }

package/dist/module/lib/basebuilder.js

@@ -1,5 +1,7 @@
 export class BaseBuilder {
-    constructor(input, suitesOverrides, givenOverides, whenOverides, thenOverides, checkOverides, logWriter, testResourceRequirement, testSpecification) {
+    constructor(input, suitesOverrides, givenOverides, whenOverides, thenOverides, checkOverides, testResourceRequirement, testSpecification
+    // puppetMaster: PM
+    ) {
         this.input = input;
         this.artifacts = [];
         this.artifacts = [];
@@ -10,47 +12,72 @@ export class BaseBuilder {
         this.thenOverides = thenOverides;
         this.checkOverides = checkOverides;
         this.testSpecification = testSpecification;
+        // this.puppetMaster = puppetMaster;
         this.specs = testSpecification(this.Suites(), this.Given(), this.When(), this.Then(), this.Check());
-        const suiteRunner = (suite, utils) => async (testResourceConfiguration, tLog, utils) => {
-            return await suite.run(input, testResourceConfiguration, (fPath, value) => logWriter.testArtiFactoryfileWriter(tLog, (p) => {
-                this.artifacts.push(p);
-            })(testResourceConfiguration.fs + "/" + fPath, value), tLog, utils);
-        };
-        this.testJobs = this.specs.map((suite, utils) => {
-            const runner = suiteRunner(suite, utils);
+        this.testJobs = this.specs.map((suite) => {
+            const suiteRunner = (suite) => async (
+            // testResourceConfiguration: ITTestResourceConfiguration,
+            puppetMaster, tLog) => {
+                await puppetMaster.startPuppeteer({
+                    browserWSEndpoint: puppetMaster.testResourceConfiguration.browserWSEndpoint,
+                }, puppetMaster.testResourceConfiguration.fs);
+                return await suite.run(input, puppetMaster.testResourceConfiguration, (fPath, value) => puppetMaster.testArtiFactoryfileWriter(tLog, (p) => {
+                    this.artifacts.push(p);
+                })(puppetMaster.testResourceConfiguration.fs + "/" + fPath, value), tLog, puppetMaster);
+            };
+            const runner = suiteRunner(suite);
             return {
                 test: suite,
-                testResourceRequirement,
+                // testResourceRequirement,
                 toObj: () => {
                     return suite.toObj();
                 },
                 runner,
-                receiveTestResourceConfig: async function (testResourceConfiguration = {
-                    name: "",
-                    fs: ".",
-                    ports: [],
-                    scheduled: false,
-                }, y) {
-                    console.log(`testResourceConfiguration ${JSON.stringify(testResourceConfiguration, null, 2)}`);
-                    // await logWriter.mkdirSync(testResourceConfiguration.fs);
-                    //  if (!fs.existsSync(destFolder)) {
-                    //    fs.mkdirSync(destFolder, { recursive: true });
+                receiveTestResourceConfig: async function (
+                // testResourceConfiguration = {
+                //   name: "",
+                //   fs: ".",
+                //   ports: [],
+                //   browserWSEndpoint: "",
+                // },
+                puppetMaster) {
+                    // console.log(
+                    //   `testResourceConfiguration! ${JSON.stringify(
+                    //     testResourceConfiguration,
+                    //     null,
+                    //     2
+                    //   )}`
+                    // );
+                    // console.log("puppetMaster", puppetMaster);
+                    await puppetMaster
+                        .mkdirSync();
+                    //  if (!puppetMaster.existsSync(destFolder)) {
+                    //    puppetMaster.mkdirSync(destFolder, { recursive: true });
                     //  }
-                    logWriter.writeFileSync(`${testResourceConfiguration.fs}/tests.json`, JSON.stringify(this.toObj(), null, 2));
-                    const logFilePath = `${testResourceConfiguration.fs}/log.txt`;
-                    const access = await logWriter.createWriteStream(logFilePath);
-                    const tLog = (...l) => access.write(`${l.toString()}\n`);
-                    const suiteDone = await runner(testResourceConfiguration, tLog, y);
+                    // puppetMaster.writeFileSync(
+                    //   // puppetMaster.testResourceConfiguration.fs + `/tests.json`,
+                    //   `tests.json`,
+                    //   JSON.stringify(this.toObj(), null, 2)
+                    // );
+                    const logFilePath = "log.txt";
+                    // puppetMaster.testResourceConfiguration.fs + `/log.txt`;
+                    const access = await puppetMaster.createWriteStream(logFilePath);
+                    // console.log("access", access);
+                    const tLog = (...l) => {
+                        // access.write(`${l.toString()}\n`);
+                        // console.log("tLog", l);
+                        puppetMaster.write(access, `${l.toString()}\n`);
+                    };
+                    const suiteDone = await runner(puppetMaster, tLog);
                     const logPromise = new Promise((res, rej) => {
-                        access.on("finish", () => {
-                            res(true);
-                        });
+                        puppetMaster.end(access);
+                        res(true);
                     });
-                    access.end();
                     const numberOfFailures = Object.keys(suiteDone.givens).filter((k) => {
                         return suiteDone.givens[k].error;
                     }).length;
-                    logWriter.writeFileSync(`${testResourceConfiguration.fs}/exitcode`, numberOfFailures.toString());
+                    puppetMaster.writeFileSync(`exitcode`, numberOfFailures.toString());
+                    puppetMaster.writeFileSync(`tests.json`, JSON.stringify(this.toObj(), null, 2));
                     console.log(`exiting gracefully with ${numberOfFailures} failures.`);
                     return {
                         failed: numberOfFailures,

package/dist/module/lib/classBuilder.js

@@ -1,6 +1,8 @@
 import { BaseBuilder } from "./basebuilder.js";
 export class ClassBuilder extends BaseBuilder {
-    constructor(testImplementation, testSpecification, input, suiteKlasser, givenKlasser, whenKlasser, thenKlasser, checkKlasser, testResourceRequirement, logWriter) {
+    constructor(testImplementation, testSpecification, input, suiteKlasser, givenKlasser, whenKlasser, thenKlasser, checkKlasser, testResourceRequirement
+    // puppetMaster: PM
+    ) {
         const classySuites = Object.entries(testImplementation.suites).reduce((a, [key], index) => {
             a[key] = (somestring, givens, checks) => {
                 return new suiteKlasser.prototype.constructor(somestring, index, givens, checks);
@@ -31,6 +33,8 @@ export class ClassBuilder extends BaseBuilder {
             };
             return a;
         }, {});
-        super(input, classySuites, classyGivens, classyWhens, classyThens, classyChecks, logWriter, testResourceRequirement, testSpecification);
+        super(input, classySuites, classyGivens, classyWhens, classyThens, classyChecks, testResourceRequirement, testSpecification
+        // puppetMaster
+        );
     }
 }