testeranto 0.172.0 → 0.177.0

package/dist/module/src/components/pure/TestPageView.js

@@ -68,14 +68,18 @@ export const TestPageView = ({ route, setRoute, navigate, projectName, testName,
                     React.createElement("div", { className: "mt-3" },
                         React.createElement(Button, { variant: "outline-light", onClick: () => setRoute('logs'), className: "me-2" }, "View Runtime Logs"),
                         React.createElement(Button, { variant: "outline-light", onClick: () => navigate(`/projects/${projectName}#${runtime}`) }, "View Build Logs")))) : testData ? (React.createElement("div", { className: "test-results" }, testData.givens.map((given, i) => {
-                    var _a;
+                    var _a, _b;
                     return (React.createElement("div", { key: i, className: "mb-4 card" },
                         React.createElement("div", { className: "card-header bg-primary text-white" },
                             React.createElement("div", { className: "d-flex justify-content-between align-items-center" },
-                                React.createElement("h4", null,
-                                    "Given: ",
-                                    given.name),
-                                ((_a = given.artifacts) === null || _a === void 0 ? void 0 : _a.length) > 0 && (React.createElement("div", { className: "dropdown" },
+                                React.createElement("div", null,
+                                    React.createElement("h4", null,
+                                        "Given: ",
+                                        given.name),
+                                    ((_a = given.features) === null || _a === void 0 ? void 0 : _a.length) > 0 && (React.createElement("div", { className: "mt-1" },
+                                        React.createElement("small", null, "Features:"),
+                                        React.createElement("ul", { className: "list-unstyled" }, given.features.map((feature, fi) => (React.createElement("li", { key: fi }, feature.startsWith('http') ? (React.createElement("a", { href: feature, target: "_blank", rel: "noopener noreferrer", className: "text-white" }, new URL(feature).hostname)) : (React.createElement("span", { className: "text-white" }, feature))))))))),
+                                ((_b = given.artifacts) === null || _b === void 0 ? void 0 : _b.length) > 0 && (React.createElement("div", { className: "dropdown" },
                                     React.createElement("button", { className: "btn btn-sm btn-light dropdown-toggle", type: "button", "data-bs-toggle": "dropdown" },
                                         "Artifacts (",
                                         given.artifacts.length,
@@ -84,29 +88,37 @@ export const TestPageView = ({ route, setRoute, navigate, projectName, testName,
                                         React.createElement("a", { className: "dropdown-item", href: `/testeranto/reports/${projectName}/${testName.split('.').slice(0, -1).join('.')}/${runtime}/${artifact}`, target: "_blank", rel: "noopener noreferrer" }, artifact.split('/').pop()))))))))),
                         React.createElement("div", { className: "card-body" },
                             given.whens.map((when, j) => {
-                                var _a;
+                                var _a, _b;
                                 return (React.createElement("div", { key: `w-${j}`, className: `p-3 mb-2 ${when.error ? 'bg-danger text-white' : 'bg-success text-white'}` },
                                     React.createElement("div", { className: "d-flex justify-content-between align-items-start" },
                                         React.createElement("div", null,
-                                            React.createElement("strong", null, "When:"),
-                                            " ",
-                                            when.name,
-                                            when.error && React.createElement("pre", { className: "mt-2" }, when.error)),
-                                        ((_a = when.artifacts) === null || _a === void 0 ? void 0 : _a.length) > 0 && (React.createElement("div", { className: "ms-3" },
+                                            React.createElement("div", null,
+                                                React.createElement("strong", null, "When:"),
+                                                " ",
+                                                when.name,
+                                                ((_a = when.features) === null || _a === void 0 ? void 0 : _a.length) > 0 && (React.createElement("div", { className: "mt-2" },
+                                                    React.createElement("small", null, "Features:"),
+                                                    React.createElement("ul", { className: "list-unstyled" }, when.features.map((feature, fi) => (React.createElement("li", { key: fi }, feature.startsWith('http') ? (React.createElement("a", { href: feature, target: "_blank", rel: "noopener noreferrer" }, new URL(feature).hostname)) : (feature))))))),
+                                                when.error && React.createElement("pre", { className: "mt-2" }, when.error))),
+                                        ((_b = when.artifacts) === null || _b === void 0 ? void 0 : _b.length) > 0 && (React.createElement("div", { className: "ms-3" },
                                             React.createElement("strong", null, "Artifacts:"),
                                             React.createElement("ul", { className: "list-unstyled" }, when.artifacts.map((artifact, ai) => (React.createElement("li", { key: ai },
                                                 React.createElement("a", { href: `/testeranto/reports/${projectName}/${testName.split('.').slice(0, -1).join('.')}/${runtime}/${artifact}`, target: "_blank", className: "text-white", rel: "noopener noreferrer" }, artifact.split('/').pop()))))))))));
                             }),
                             given.thens.map((then, k) => {
-                                var _a;
+                                var _a, _b;
                                 return (React.createElement("div", { key: `t-${k}`, className: `p-3 mb-2 ${then.error ? 'bg-danger text-white' : 'bg-success text-white'}` },
                                     React.createElement("div", { className: "d-flex justify-content-between align-items-start" },
                                         React.createElement("div", null,
-                                            React.createElement("strong", null, "Then:"),
-                                            " ",
-                                            then.name,
-                                            then.error && React.createElement("pre", { className: "mt-2" }, then.error)),
-                                        ((_a = then.artifacts) === null || _a === void 0 ? void 0 : _a.length) > 0 && (React.createElement("div", { className: "ms-3" },
+                                            React.createElement("div", null,
+                                                React.createElement("strong", null, "Then:"),
+                                                " ",
+                                                then.name,
+                                                ((_a = then.features) === null || _a === void 0 ? void 0 : _a.length) > 0 && (React.createElement("div", { className: "mt-2" },
+                                                    React.createElement("small", null, "Features:"),
+                                                    React.createElement("ul", { className: "list-unstyled" }, then.features.map((feature, fi) => (React.createElement("li", { key: fi }, feature.startsWith('http') ? (React.createElement("a", { href: feature, target: "_blank", rel: "noopener noreferrer" }, new URL(feature).hostname)) : (feature))))))),
+                                                then.error && React.createElement("pre", { className: "mt-2" }, then.error))),
+                                        ((_b = then.artifacts) === null || _b === void 0 ? void 0 : _b.length) > 0 && (React.createElement("div", { className: "ms-3" },
                                             React.createElement("strong", null, "Artifacts:"),
                                             React.createElement("ul", { className: "list-unstyled" }, then.artifacts.map((artifact, ai) => (React.createElement("li", { key: ai },
                                                 React.createElement("a", { href: `/testeranto/reports/${projectName}/${testName.split('.').slice(0, -1).join('.')}/${runtime}/${artifact}`, target: "_blank", className: "text-white", rel: "noopener noreferrer" }, artifact.split('/').pop()))))))))));

package/dist/module/src/esbuildConfigs/node.js

@@ -4,9 +4,7 @@ import featuresPlugin from "./featuresPlugin";
 import rebuildPlugin from "./rebuildPlugin.js";
 export default (config, entryPoints, testName) => {
     const { inputFilesPluginFactory, register } = inputFilesPlugin("node", testName);
-    return Object.assign(Object.assign({}, baseEsBuildConfig(config)), { splitting: true, outdir: `testeranto/bundles/node/${testName}/`, 
-        // inject: [`./node_modules/testeranto/dist/cjs-shim.js`],
-        metafile: true, supported: {
+    return Object.assign(Object.assign({}, baseEsBuildConfig(config)), { splitting: true, outdir: `testeranto/bundles/node/${testName}/`, inject: [`./node_modules/testeranto/dist/cjs-shim.js`], metafile: true, supported: {
             "dynamic-import": true,
         }, define: {
             "process.env.FLUENTFFMPEG_COV": "0",

package/dist/module/src/lib/BaseSuite.js

@@ -1,17 +1,20 @@
 import { beforeAllProxy, afterAllProxy } from "./pmProxy";
 export class BaseSuite {
+    addArtifact(path) {
+        console.log("Suite addArtifact", path);
+        const normalizedPath = path.replace(/\\/g, "/"); // Normalize path separators
+        this.artifacts.push(normalizedPath);
+    }
     constructor(name, index, givens = {}) {
+        this.artifacts = [];
         const suiteName = name || "testSuite"; // Ensure name is never undefined
         if (!suiteName) {
             throw new Error("BaseSuite requires a non-empty name");
         }
-        console.log("[DEBUG] BaseSuite constructor - name:", suiteName, "index:", index);
         this.name = suiteName;
         this.index = index;
         this.givens = givens;
         this.fails = 0;
-        console.log("[DEBUG] BaseSuite initialized:", this.name, this.index);
-        console.log("[DEBUG] BaseSuite givens:", Object.keys(givens).toString());
     }
     features() {
         try {
@@ -21,11 +24,10 @@ export class BaseSuite {
                 .filter((value, index, array) => {
                 return array.indexOf(value) === index;
             });
-            console.debug("[DEBUG] Features extracted:", features.toString());
             return features || [];
         }
         catch (e) {
-            console.error("[ERROR] Failed to extract features:", e);
+            console.error("[ERROR] Failed to extract features:", JSON.stringify(e));
             return [];
         }
     }
@@ -53,10 +55,10 @@ export class BaseSuite {
         // 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);
-        tLog("\nSuite:", this.index, this.name);
+        // tLog("\nSuite:", this.index, this.name);
         const sNdx = this.index;
-        // const sName = this.name;
-        const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, beforeAllProxy(pm, sNdx.toString()));
+        const proxiedPm = beforeAllProxy(pm, sNdx.toString(), this);
+        const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, proxiedPm);
         for (const [gKey, g] of Object.entries(this.givens)) {
             const giver = this.givens[gKey];
             this.store = await giver
@@ -64,15 +66,15 @@ export class BaseSuite {
                 .catch((e) => {
                 this.failed = true;
                 this.fails = this.fails + 1;
-                // console.error("Given error 1:", e.toString());
                 throw e;
             });
         }
         try {
-            this.afterAll(this.store, artifactory, afterAllProxy(pm, sNdx.toString()));
+            const afterAllPm = afterAllProxy(pm, sNdx.toString(), this);
+            this.afterAll(this.store, artifactory, afterAllPm);
         }
         catch (e) {
-            console.error(e);
+            console.error(JSON.stringify(e));
             // this.fails.push(this);
             // return this;
         }

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

@@ -3,8 +3,9 @@
 import { afterEachProxy, andWhenProxy, beforeEachProxy, butThenProxy, } from "./pmProxy.js";
 export class BaseGiven {
     addArtifact(path) {
-        console.log(`[Artifact] Adding to ${this.constructor.name}:`, path);
-        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 = [];
@@ -25,7 +26,7 @@ export 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()),
@@ -49,15 +50,13 @@ export class BaseGiven {
             tLog(e.stack);
         });
         try {
-            const proxiedPm = beforeEachProxy(pm, suiteNdx.toString());
-            console.log(`[Given] Setting currentStep for beforeEach:`, this.name);
-            proxiedPm.currentStep = this;
+            const proxiedPm = 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);
@@ -67,9 +66,6 @@ export 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) {
@@ -79,10 +75,11 @@ export class BaseGiven {
         }
         finally {
             try {
-                await this.afterEach(this.store, this.key, givenArtifactory, afterEachProxy(pm, suiteNdx.toString(), key));
+                const proxiedPm = 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;
@@ -92,36 +89,33 @@ export class BaseGiven {
     }
 }
 export 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 = andWhenProxy(pm, filepath);
-            console.log(`[When] Setting currentStep for andWhen:`, this.name);
-            proxiedPm.currentStep = this;
+            // tLog(" When:", this.name);
+            const proxiedPm = 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) {
@@ -137,18 +131,23 @@ export 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 = butThenProxy(pm, filepath);
-        console.log(`[Then] Setting currentStep for butThen:`, this.name);
-        proxiedPm.currentStep = this;
+        const proxiedPm = butThenProxy(pm, filepath, this.addArtifact.bind(this));
         return this.butThen(store, async (s) => {
             if (typeof this.thenCB === "function") {
                 return await this.thenCB(s, proxiedPm);
@@ -156,8 +155,8 @@ export class BaseThen {
             else {
                 return this.thenCB;
             }
-        }, testResourceConfiguration, butThenProxy(pm, filepath)).catch((e) => {
-            this.error = e.toString();
+        }, testResourceConfiguration, proxiedPm).catch((e) => {
+            this.error = e.stack;
             // throw e;
         });
     }

package/dist/module/src/lib/baseBuilder.test/baseBuilder.test.implementation.js

@@ -5,7 +5,7 @@ export const implementation = {
         Default: "BaseBuilder test suite",
     },
     givens: {
-        Default: () => {
+        "the default BaseBuilder": () => {
             return new MockBaseBuilder({}, // input
             {}, // suitesOverrides
             {}, // givenOverrides
@@ -15,11 +15,11 @@ export const implementation = {
             () => [] // testSpecification
             );
         },
-        WithCustomInput: (input) => {
-            return new MockBaseBuilder(input, {}, {}, {}, {}, {}, { ports: [] });
+        "a BaseBuilder with TestInput": (input) => {
+            return new MockBaseBuilder(input, {}, {}, {}, {}, { ports: [] }, () => []);
         },
-        WithResourceRequirements: (requirements) => {
-            return new MockBaseBuilder({}, {}, {}, {}, {}, {}, requirements);
+        "a BaseBuilder with Test Resource Requirements": (requirements) => {
+            return new MockBaseBuilder({}, {}, {}, {}, {}, requirements, () => []);
         },
     },
     whens: {
@@ -33,8 +33,9 @@ export const implementation = {
         },
     },
     thens: {
-        initializedProperly: () => (builder) => {
+        "it is initialized": () => (builder, utils) => {
             var _a;
+            utils.writeFileSync("hello.txt", "world");
             if (!(builder instanceof BaseBuilder)) {
                 console.error("Builder instance:", builder);
                 throw new Error(`Builder was not properly initialized - expected BaseBuilder instance but got ${(_a = builder === null || builder === void 0 ? void 0 : builder.constructor) === null || _a === void 0 ? void 0 : _a.name}`);
@@ -55,19 +56,19 @@ export const implementation = {
             });
             return builder;
         },
-        specsGenerated: () => (builder) => {
+        "it generates TestSpecifications": () => (builder) => {
             if (!Array.isArray(builder.specs)) {
                 throw new Error("Specs were not generated");
             }
             return builder;
         },
-        jobsCreated: () => (builder) => {
+        "it creates jobs": () => (builder) => {
             if (!Array.isArray(builder.testJobs)) {
                 throw new Error("Test jobs were not created");
             }
             return builder;
         },
-        artifactsTracked: () => (builder) => {
+        "it tracks artifacts": () => (builder) => {
             if (!Array.isArray(builder.artifacts)) {
                 throw new Error("Artifacts array not initialized");
             }

package/dist/module/src/lib/baseBuilder.test/baseBuilder.test.specification.js

@@ -1,14 +1,14 @@
 export const specification = (Suite, Given, When, Then) => {
     return [
         Suite.Default("Testing BaseBuilder functionality", {
-            testInitialization: Given.Default(["BaseBuilder should initialize correctly"], [], [
-                Then.initializedProperly(),
-                Then.artifactsTracked(),
-                Then.jobsCreated(),
-                Then.specsGenerated(),
+            testInitialization: Given["the default BaseBuilder"](["BaseBuilder should initialize correctly"], [], [
+                Then["it is initialized"](),
+                Then["it tracks artifacts"](),
+                // Then["it creates jobs"](),
+                // Then["it generates TestSpecifications"](),
             ]),
-            testSpecsGeneration: Given.Default(["BaseBuilder should generate specs from test specification"], [], [Then.specsGenerated()]),
-            testJobsCreation: Given.Default(["BaseBuilder should create test jobs"], [], [Then.jobsCreated()]),
+            testSpecsGeneration: Given["the default BaseBuilder"](["BaseBuilder should generate specs from test specification"], [], [Then["it generates TestSpecifications"]()]),
+            testJobsCreation: Given["the default BaseBuilder"](["BaseBuilder should create test jobs"], [], [Then["it creates jobs"]()]),
         }),
     ];
 };

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

@@ -15,9 +15,11 @@ export 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);
@@ -36,14 +38,23 @@ export 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);
                     // });
                     const fails = suiteDone.fails;
-                    await puppetMaster.writeFileSync(`bdd_errors.txt`, fails.toString());
-                    await puppetMaster.writeFileSync(`tests.json`, JSON.stringify(this.toObj(), null, 2));
+                    await puppetMaster.writeFileSync([
+                        `bdd_errors.txt`,
+                        fails.toString(),
+                    ]);
+                    await puppetMaster.writeFileSync([
+                        `tests.json`,
+                        JSON.stringify(this.toObj(), null, 2),
+                    ]);
+                    console.log("mark13");
                     return {
                         failed: fails > 0,
                         fails,

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

@@ -26,6 +26,7 @@ export default class TesterantoCore extends 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) {