testeranto 0.173.0 → 0.177.0

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

@@ -6,10 +6,9 @@ exports.BaseThen = exports.BaseWhen = exports.BaseGiven = void 0;
 const pmProxy_js_1 = require("./pmProxy.js");
 class BaseGiven {
     addArtifact(path) {
-        console.log(`[Artifact] Adding to ${this.constructor.name}:`, path);
-        // console.log("mark111");
-        // process.exit();
-        this.artifacts.push(path);
+        console.log("Given addArtifact", path);
+        const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+        this.artifacts.push(normalizedPath);
     }
     constructor(name, features, whens, thens, givenCB, initialValues) {
         this.artifacts = [];
@@ -30,7 +29,7 @@ class BaseGiven {
             whens: this.whens.map((w) => {
                 if (w && w.toObj)
                     return w.toObj();
-                console.error("w is not as expected!", w.toString());
+                console.error("w is not as expected!", JSON.stringify(w));
                 return {};
             }),
             thens: this.thens.map((t) => t.toObj()),
@@ -54,15 +53,13 @@ class BaseGiven {
             tLog(e.stack);
         });
         try {
-            const proxiedPm = (0, pmProxy_js_1.beforeEachProxy)(pm, suiteNdx.toString());
-            console.log(`[Given] Setting currentStep for beforeEach:`, this.name);
-            proxiedPm.currentStep = this;
+            const proxiedPm = (0, pmProxy_js_1.beforeEachProxy)(pm, suiteNdx.toString(), this.addArtifact.bind(this));
             this.store = await this.givenThat(subject, testResourceConfiguration, givenArtifactory, this.givenCB, this.initialValues, proxiedPm);
         }
         catch (e) {
-            console.error("Given failure: ", e.toString());
-            this.error = e;
-            throw e;
+            // console.error("Given failure: ", e.stack);
+            this.error = e.stack;
+            // throw e;
         }
         try {
             // tLog(`\n Given this.store`, this.store);
@@ -72,9 +69,6 @@ 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);
-                // ((t) => {
-                //   return tester(t);
-                // })();
             }
         }
         catch (e) {
@@ -84,10 +78,11 @@ class BaseGiven {
         }
         finally {
             try {
-                await this.afterEach(this.store, this.key, givenArtifactory, (0, pmProxy_js_1.afterEachProxy)(pm, suiteNdx.toString(), key));
+                const proxiedPm = (0, pmProxy_js_1.afterEachProxy)(pm, suiteNdx.toString(), key, this.addArtifact.bind(this));
+                // (proxiedPm as any).currentStep = this;
+                await this.afterEach(this.store, this.key, givenArtifactory, proxiedPm);
             }
             catch (e) {
-                console.error("afterEach failed!", e.toString());
                 this.failed = e;
                 throw e;
                 // this.error = e.message;
@@ -98,36 +93,33 @@ class BaseGiven {
 }
 exports.BaseGiven = BaseGiven;
 class BaseWhen {
+    addArtifact(path) {
+        console.log("When addArtifact", path);
+        const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+        this.artifacts.push(normalizedPath);
+    }
     constructor(name, whenCB) {
         this.artifacts = [];
         this.name = name;
         this.whenCB = whenCB;
     }
     toObj() {
-        console.log("toObj error", this.error);
-        if (this.error) {
-            return {
-                name: this.name,
-                error: this.error && this.error.name + this.error.stack,
-                artifacts: this.artifacts,
-            };
-        }
-        else {
-            return {
-                name: this.name,
-                artifacts: this.artifacts,
-            };
-        }
+        const obj = {
+            name: this.name,
+            error: this.error
+                ? `${this.error.name}: ${this.error.message}\n${this.error.stack}`
+                : null,
+            artifacts: this.artifacts || [],
+        };
+        console.log(`[TOOBJ] Serializing ${this.constructor.name} with artifacts:`, obj.artifacts);
+        return obj;
     }
     async test(store, testResourceConfiguration, tLog, pm, filepath) {
         try {
-            tLog(" When:", this.name);
-            console.debug("[DEBUG] Executing When step:", this.name.toString());
-            const proxiedPm = (0, pmProxy_js_1.andWhenProxy)(pm, filepath);
-            console.log(`[When] Setting currentStep for andWhen:`, this.name);
-            proxiedPm.currentStep = this;
+            // tLog(" When:", this.name);
+            const proxiedPm = (0, pmProxy_js_1.andWhenProxy)(pm, filepath, this.addArtifact.bind(this));
+            // (proxiedPm as any).currentStep = this;
             const result = await this.andWhen(store, this.whenCB, testResourceConfiguration, proxiedPm);
-            console.debug("[DEBUG] When step completed:", this.name.toString());
             return result;
         }
         catch (e) {
@@ -144,18 +136,23 @@ class BaseThen {
         this.name = name;
         this.thenCB = thenCB;
         this.error = false;
+        this.artifacts = [];
+    }
+    addArtifact(path) {
+        console.log("Then addArtifact", path);
+        const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+        this.artifacts.push(normalizedPath);
     }
     toObj() {
-        return {
+        const obj = {
             name: this.name,
             error: this.error,
             artifacts: this.artifacts,
         };
+        return obj;
     }
     async test(store, testResourceConfiguration, tLog, pm, filepath) {
-        const proxiedPm = (0, pmProxy_js_1.butThenProxy)(pm, filepath);
-        console.log(`[Then] Setting currentStep for butThen:`, this.name);
-        proxiedPm.currentStep = this;
+        const proxiedPm = (0, pmProxy_js_1.butThenProxy)(pm, filepath, this.addArtifact.bind(this));
         return this.butThen(store, async (s) => {
             if (typeof this.thenCB === "function") {
                 return await this.thenCB(s, proxiedPm);
@@ -163,8 +160,8 @@ class BaseThen {
             else {
                 return this.thenCB;
             }
-        }, testResourceConfiguration, (0, pmProxy_js_1.butThenProxy)(pm, filepath)).catch((e) => {
-            this.error = e.toString();
+        }, testResourceConfiguration, proxiedPm).catch((e) => {
+            this.error = e.stack;
             // throw e;
         });
     }

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

@@ -18,9 +18,11 @@ class BaseBuilder {
         this.specs = testSpecification(this.Suites(), this.Given(), this.When(), this.Then());
         this.testJobs = this.specs.map((suite) => {
             const suiteRunner = (suite) => async (puppetMaster, tLog) => {
+                console.log("mark17");
                 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);
+                console.log("mark18");
                 return x;
             };
             const runner = suiteRunner(suite);
@@ -39,7 +41,9 @@ class BaseBuilder {
                     const tLog = async (...l) => {
                         //
                     };
+                    console.log("mark14");
                     const suiteDone = await runner(puppetMaster, tLog);
+                    console.log("mark15");
                     // const logPromise = new Promise(async (res) => {
                     //   await puppetMaster.end(access);
                     //   res(true);
@@ -53,6 +57,7 @@ class BaseBuilder {
                         `tests.json`,
                         JSON.stringify(this.toObj(), null, 2),
                     ]);
+                    console.log("mark13");
                     return {
                         failed: fails > 0,
                         fails,

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

@@ -28,6 +28,7 @@ class TesterantoCore extends classBuilder_js_1.ClassBuilder {
                 this.uberCatcher = uberCatcher;
             }
             async givenThat(subject, testResource, artifactory, initializer, initialValues, pm) {
+                console.log("mark800");
                 return fullAdapter.beforeEach(subject, initializer, testResource, initialValues, pm);
             }
             afterEach(store, key, artifactory, pm) {

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

@@ -17,14 +17,26 @@ const baseProxy = function (pm, mappings) {
         },
     });
 };
-const butThenProxy = (pm, filepath) => {
+const butThenProxy = (pm, filepath, addArtifact) => {
     return baseProxy(pm, [
         [
             "screencast",
             (opts, p) => {
-                var _a, _b;
                 const path = `${filepath}/butThen/${opts.path}`;
-                (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
+                addArtifact(path);
+                // console.log(
+                //   `[ARTIFACT] Preparing to add to ${step.constructor.name}:`,
+                //   path
+                // );
+                // try {
+                //   console.log(
+                //     `[ARTIFACT] Successfully added to ${step.constructor.name}`
+                //   );
+                //   console.log(`[ARTIFACT] Current artifacts:`, JSON.stringify(step.artifacts));
+                // } catch (e) {
+                //   console.error(`[ARTIFACT] Failed to add ${path}:`, e);
+                //   throw e;
+                // }
                 return [
                     Object.assign(Object.assign({}, opts), { path }),
                     p,
@@ -34,27 +46,24 @@ const butThenProxy = (pm, filepath) => {
         [
             "createWriteStream",
             (fp) => {
-                var _a, _b;
                 const path = `${filepath}/butThen/${fp}`;
-                (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
+                addArtifact(path);
                 return [path];
             },
         ],
         [
             "writeFileSync",
             (fp, contents) => {
-                var _a, _b;
                 const path = `${filepath}/butThen/${fp}`;
-                (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
+                addArtifact(path);
                 return [path, contents];
             },
         ],
         [
             "customScreenShot",
             (opts, p) => {
-                var _a, _b;
                 const path = `${filepath}/butThen/${opts.path}`;
-                (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
+                addArtifact(path);
                 return [
                     Object.assign(Object.assign({}, opts), { path }),
                     p,
@@ -64,99 +73,200 @@ const butThenProxy = (pm, filepath) => {
     ]);
 };
 exports.butThenProxy = butThenProxy;
-const andWhenProxy = (pm, filepath) => baseProxy(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,
-        ],
-    ],
-]);
+const andWhenProxy = (pm, filepath, addArtifact) => {
+    return baseProxy(pm, [
+        [
+            "screencast",
+            (opts, p) => {
+                const path = `${filepath}/andWhen/${opts.path}`;
+                addArtifact(path);
+                return [
+                    Object.assign(Object.assign({}, opts), { path }),
+                    p,
+                ];
+            },
+        ],
+        [
+            "createWriteStream",
+            (fp) => {
+                const path = `${filepath}/andWhen/${fp}`;
+                addArtifact(path);
+                return [path];
+            },
+        ],
+        [
+            "writeFileSync",
+            (fp, contents) => {
+                const path = `${filepath}/andWhen/${fp}`;
+                addArtifact(path);
+                return [path, contents];
+            },
+        ],
+        [
+            "customScreenShot",
+            (opts, p) => {
+                const path = `${filepath}/andWhen/${opts.path}`;
+                // console.log("STEP2", JSON.stringify(step));
+                addArtifact(path);
+                return [
+                    Object.assign(Object.assign({}, opts), { path }),
+                    p,
+                ];
+            },
+        ],
+    ]);
+};
 exports.andWhenProxy = andWhenProxy;
-const afterEachProxy = (pm, suite, given) => baseProxy(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,
-        ],
-    ],
-]);
+const afterEachProxy = (pm, suite, given, addArtifact) => {
+    return baseProxy(pm, [
+        [
+            "screencast",
+            (opts, p) => {
+                const path = `suite-${suite}/given-${given}/afterEach/${opts.path}`;
+                addArtifact(path);
+                return [
+                    Object.assign(Object.assign({}, opts), { path }),
+                    p,
+                ];
+            },
+        ],
+        [
+            "createWriteStream",
+            (fp) => {
+                const path = `suite-${suite}/afterEach/${fp}`;
+                addArtifact(path);
+                return [path];
+            },
+        ],
+        [
+            "writeFileSync",
+            (fp, contents) => {
+                const path = `suite-${suite}/given-${given}/afterEach/${fp}`;
+                addArtifact(path);
+                return [path, contents];
+            },
+        ],
+        [
+            "customScreenShot",
+            (opts, p) => {
+                const path = `suite-${suite}/given-${given}/afterEach/${opts.path}`;
+                addArtifact(path);
+                // console.log("STEP3", JSON.stringify(step));
+                return [
+                    Object.assign(Object.assign({}, opts), { path }),
+                    p,
+                ];
+            },
+        ],
+    ]);
+};
 exports.afterEachProxy = afterEachProxy;
-const beforeEachProxy = (pm, suite) => baseProxy(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}`]],
-]);
+const beforeEachProxy = (pm, suite, addArtifact) => {
+    return baseProxy(pm, [
+        [
+            "screencast",
+            (opts, p) => {
+                const path = `suite-${suite}/beforeEach/${opts.path}`;
+                addArtifact(path);
+                return [
+                    Object.assign(Object.assign({}, opts), { path }),
+                    p,
+                ];
+            },
+        ],
+        [
+            "writeFileSync",
+            (fp, contents) => {
+                const path = `suite-${suite}/beforeEach/${fp}`;
+                addArtifact(path);
+                return [path, contents];
+            },
+        ],
+        [
+            "customScreenShot",
+            (opts, p) => {
+                const path = `suite-${suite}/beforeEach/${opts.path}`;
+                addArtifact(path);
+                return [
+                    Object.assign(Object.assign({}, opts), { path }),
+                    p,
+                ];
+            },
+        ],
+        [
+            "createWriteStream",
+            (fp) => {
+                const path = `suite-${suite}/beforeEach/${fp}`;
+                addArtifact(path);
+                return [path];
+            },
+        ],
+    ]);
+};
 exports.beforeEachProxy = beforeEachProxy;
-const beforeAllProxy = (pm, suite) => baseProxy(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}`]],
-]);
+const beforeAllProxy = (pm, suite, addArtifact) => {
+    return baseProxy(pm, [
+        [
+            "writeFileSync",
+            (fp, contents) => {
+                const path = `suite-${suite}/beforeAll/${fp}`;
+                addArtifact(path);
+                return [path, contents];
+            },
+        ],
+        [
+            "customScreenShot",
+            (opts, p) => {
+                const path = `suite-${suite}/beforeAll/${opts.path}`;
+                addArtifact(path);
+                return [
+                    Object.assign(Object.assign({}, opts), { path }),
+                    p,
+                ];
+            },
+        ],
+        [
+            "createWriteStream",
+            (fp) => {
+                const path = `suite-${suite}/beforeAll/${fp}`;
+                addArtifact(path);
+                return [path];
+            },
+        ],
+    ]);
+};
 exports.beforeAllProxy = beforeAllProxy;
-const afterAllProxy = (pm, suite) => baseProxy(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,
-        ],
-    ],
-]);
+const afterAllProxy = (pm, suite, addArtifact) => {
+    return baseProxy(pm, [
+        [
+            "createWriteStream",
+            (fp) => {
+                const path = `suite-${suite}/afterAll/${fp}`;
+                addArtifact(path);
+                return [path];
+            },
+        ],
+        [
+            "writeFileSync",
+            (fp, contents) => {
+                const path = `suite-${suite}/afterAll/${fp}`;
+                console.log("MARK10");
+                addArtifact(path);
+                return [path, contents];
+            },
+        ],
+        [
+            "customScreenShot",
+            (opts, p) => {
+                const path = `suite-${suite}/afterAll/${opts.path}`;
+                addArtifact(path);
+                console.log("MARK9");
+                return [
+                    Object.assign(Object.assign({}, opts), { path }),
+                    p,
+                ];
+            },
+        ],
+    ]);
+};
 exports.afterAllProxy = afterAllProxy;

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

@@ -18,11 +18,11 @@ exports.testAdapter = {
         // };
     },
     andWhen: async (store, whenCB, testResource, pm) => {
-        const proxiedPM = (0, pmProxy_1.andWhenProxy)(pm, "some/path");
+        const proxiedPM = (0, pmProxy_1.andWhenProxy)(pm, "some/path", store);
         return whenCB(store, proxiedPM);
     },
     butThen: async (store, thenCB, testResource, pm) => {
-        const proxiedPM = (0, pmProxy_1.butThenProxy)(pm, "some/path");
+        const proxiedPM = (0, pmProxy_1.butThenProxy)(pm, "some/path", store);
         return thenCB(store, proxiedPM);
     },
     afterEach: async (store, key, pm) => store,

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

@@ -17,7 +17,7 @@ exports.implementation = {
             var _a, _b, _c, _d, _e, _f, _g, _h;
             const mockPm = new mockPMBase_1.MockPMBase();
             const filepath = "test/path";
-            const proxiedPm = store.butThenProxy(mockPm, filepath);
+            const rewritePath = createPathRewriter(`${filepath}/butThen`);
             let actualPath;
             let actualContent;
             try {