testeranto 0.189.0 → 0.197.0

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

@@ -5,7 +5,7 @@ export const implementation = {
         Default: "BaseBuilder test suite",
     },
     givens: {
-        "the default BaseBuilder": () => {
+        "the default BaseBuilder": () => () => {
             return new MockBaseBuilder({}, // input
             {}, // suitesOverrides
             {}, // givenOverrides
@@ -15,19 +15,19 @@ export const implementation = {
             () => [] // testSpecification
             );
         },
-        "a BaseBuilder with TestInput": (input) => {
+        "a BaseBuilder with TestInput": (input) => () => {
             return new MockBaseBuilder(input, {}, {}, {}, {}, { ports: [] }, () => []);
         },
-        "a BaseBuilder with Test Resource Requirements": (requirements) => {
+        "a BaseBuilder with Test Resource Requirements": (requirements) => () => {
             return new MockBaseBuilder({}, {}, {}, {}, {}, requirements, () => []);
         },
     },
     whens: {
-        addArtifact: (artifact) => (builder) => {
+        addArtifact: (artifact) => (builder, utils) => {
             builder.artifacts.push(artifact);
             return builder;
         },
-        setTestJobs: (jobs) => (builder) => {
+        setTestJobs: (jobs) => (builder, utils) => {
             builder.testJobs = jobs;
             return builder;
         },
@@ -56,13 +56,13 @@ export const implementation = {
             });
             return builder;
         },
-        "it generates TestSpecifications": () => (builder) => {
+        "it generates TestSpecifications": () => (builder, utils) => {
             if (!Array.isArray(builder.specs)) {
                 throw new Error("Specs were not generated");
             }
             return builder;
         },
-        "it creates jobs": () => (builder) => {
+        "it creates jobs": () => (builder, utils) => {
             if (!Array.isArray(builder.testJobs)) {
                 throw new Error("Test jobs were not created");
             }
@@ -76,31 +76,31 @@ export const implementation = {
             utils.writeFileSync("artifact_test.txt", "test");
             return builder;
         },
-        resourceRequirementsSet: () => (builder) => {
+        resourceRequirementsSet: () => (builder, utils) => {
             if (!builder.testResourceRequirement) {
                 throw new Error("Resource requirements not set");
             }
             return builder;
         },
-        suitesOverridesConfigured: () => (builder) => {
+        suitesOverridesConfigured: () => (builder, utils) => {
             if (!builder.suitesOverrides) {
                 throw new Error("Suites overrides not configured");
             }
             return builder;
         },
-        givensOverridesConfigured: () => (builder) => {
+        givensOverridesConfigured: () => (builder, utils) => {
             if (!builder.givenOverides) {
                 throw new Error("Givens overrides not configured");
             }
             return builder;
         },
-        whensOverridesConfigured: () => (builder) => {
+        whensOverridesConfigured: () => (builder, utils) => {
             if (!builder.whenOverides) {
                 throw new Error("Whens overrides not configured");
             }
             return builder;
         },
-        thensOverridesConfigured: () => (builder) => {
+        thensOverridesConfigured: () => (builder, utils) => {
             if (!builder.thenOverides) {
                 throw new Error("Thens overrides not configured");
             }

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

@@ -33,17 +33,13 @@ export class BaseBuilder {
                 },
                 runner,
                 receiveTestResourceConfig: async function (puppetMaster) {
-                    // deprecated?
                     const tLog = async (...l) => {
                         //
                     };
                     try {
                         const suiteDone = await runner(puppetMaster, tLog);
                         const fails = suiteDone.fails;
-                        await puppetMaster.writeFileSync([
-                            `tests.json`,
-                            JSON.stringify(this.toObj(), null, 2),
-                        ]);
+                        await puppetMaster.writeFileSync(`tests.json`, JSON.stringify(this.toObj(), null, 2), "test");
                         return {
                             failed: fails > 0,
                             fails,
@@ -60,10 +56,6 @@ export class BaseBuilder {
                             features: [],
                         };
                     }
-                    // const logPromise = new Promise(async (res) => {
-                    //   await puppetMaster.end(access);
-                    //   res(true);
-                    // });
                 },
             };
         });

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

@@ -17,13 +17,13 @@ export class ClassBuilder extends BaseBuilder {
         }, {});
         const classyWhens = Object.entries(testImplementation.whens).reduce((a, [key, whEn]) => {
             a[key] = (...payload) => {
-                return new whenKlasser.prototype.constructor(`${whEn.name}: ${payload && payload.toString()}`, whEn(...payload));
+                return new whenKlasser.prototype.constructor(`${key}: ${payload && payload.toString()}`, whEn(...payload));
             };
             return a;
         }, {});
         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, ...x));
+            a[key] = (...args) => {
+                return new thenKlasser.prototype.constructor(`${key}: ${args && args.toString()}`, thEn(...args));
             };
             return a;
         }, {});

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

@@ -15,10 +15,8 @@ export default class TesterantoCore extends ClassBuilder {
                 return fullAdapter.assertThis(t);
             }
             async setup(s, artifactory, tr, pm) {
-                return (fullAdapter.beforeAll ||
-                    (async (input, artifactory, tr, pm) => input))(s, this.testResourceConfiguration, 
-                // artifactory,
-                pm);
+                var _a, _b;
+                return (_b = (_a = fullAdapter.beforeAll) === null || _a === void 0 ? void 0 : _a.call(fullAdapter, s, tr, pm)) !== null && _b !== void 0 ? _b : s;
             }
         }, class Given extends BaseGiven {
             constructor() {
@@ -29,7 +27,7 @@ export default class TesterantoCore extends ClassBuilder {
                 return fullAdapter.beforeEach(subject, initializer, testResource, initialValues, pm);
             }
             afterEach(store, key, artifactory, pm) {
-                return new Promise((res) => res(fullAdapter.afterEach(store, key, pm)));
+                return Promise.resolve(fullAdapter.afterEach(store, key, pm));
             }
         }, class When extends BaseWhen {
             async andWhen(store, whenCB, testResource, pm) {

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

@@ -1,28 +1,25 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unused-vars */
 export const BaseAdapter = () => ({
-    beforeAll: async (s) => s,
-    beforeEach: async function (subject, initialValues, x, testResource, pm) {
+    beforeAll: async (input, testResource, pm) => {
+        return input;
+    },
+    beforeEach: async function (subject, initializer, testResource, initialValues, pm) {
         return subject;
     },
-    afterEach: async (s) => s,
-    afterAll: (store) => undefined,
-    butThen: async (store, thenCb) => {
-        return thenCb(store);
+    afterEach: async (store, key, pm) => Promise.resolve(store),
+    afterAll: (store, pm) => undefined,
+    butThen: async (store, thenCb, testResource, pm) => {
+        return thenCb(store, pm);
     },
     andWhen: async (store, whenCB, testResource, pm) => {
-        try {
-            await whenCB(store, testResource, pm);
-        }
-        catch (error) {
-            console.error("Error in andWhen:", error);
-            throw error; // Re-throw to maintain test failure
-        }
+        return whenCB(store, pm);
     },
     assertThis: (x) => x,
 });
 export const DefaultAdapter = (p) => {
-    return Object.assign(Object.assign({}, BaseAdapter), p);
+    const base = BaseAdapter();
+    return Object.assign(Object.assign({}, base), p);
 };
 export const defaultTestResourceRequirement = {
     ports: 0,

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

@@ -7,10 +7,16 @@ const baseProxy = function (pm, mappings) {
                 const method = mapping[0];
                 const arger = mapping[1];
                 if (prop === method) {
-                    return (...x) => target[prop](arger(...x));
+                    return (...x) => {
+                        // Add debug logging
+                        const modifiedArgs = arger(...x);
+                        return target[prop](...modifiedArgs);
+                    };
                 }
             }
-            return (...x) => target[prop](...x);
+            return (...x) => {
+                return target[prop](...x);
+            };
         },
     });
 };
@@ -50,10 +56,27 @@ export const butThenProxy = (pm, filepath, addArtifact) => {
         ],
         [
             "writeFileSync",
-            (fp, contents) => {
+            (fp, contents, testName) => {
+                console.log(`[DEBUG] butThenProxy writeFileSync: fp="${fp}" (type: ${typeof fp}), contents="${contents}" (type: ${typeof contents}), testName="${testName}" (type: ${typeof testName})`);
+                // Check if fp is being treated as individual characters
+                if (typeof fp !== "string") {
+                    console.log(`[ERROR] fp is not a string:`, fp);
+                    // If fp is not a string, try to handle it
+                    if (Array.isArray(fp)) {
+                        // If it's an array, join it back into a string
+                        fp = fp.join("");
+                        console.log(`[DEBUG] Converted array to string: "${fp}"`);
+                    }
+                    else {
+                        // For other cases, convert to string
+                        fp = String(fp);
+                        console.log(`[DEBUG] Converted to string: "${fp}"`);
+                    }
+                }
                 const path = `${filepath}/butThen/${fp}`;
+                console.log(`[DEBUG] Generated path: "${path}"`);
                 addArtifact(path);
-                return [path, contents];
+                return [path, contents, testName];
             },
         ],
         [
@@ -92,10 +115,10 @@ export const andWhenProxy = (pm, filepath, addArtifact) => {
         ],
         [
             "writeFileSync",
-            (fp, contents) => {
+            (fp, contents, testName) => {
                 const path = `${filepath}/andWhen/${fp}`;
                 addArtifact(path);
-                return [path, contents];
+                return [path, contents, testName];
             },
         ],
         [
@@ -135,10 +158,10 @@ export const afterEachProxy = (pm, suite, given, addArtifact) => {
         ],
         [
             "writeFileSync",
-            (fp, contents) => {
+            (fp, contents, testName) => {
                 const path = `suite-${suite}/given-${given}/afterEach/${fp}`;
                 addArtifact(path);
-                return [path, contents];
+                return [path, contents, testName];
             },
         ],
         [
@@ -170,10 +193,10 @@ export const beforeEachProxy = (pm, suite, addArtifact) => {
         ],
         [
             "writeFileSync",
-            (fp, contents) => {
+            (fp, contents, testName) => {
                 const path = `suite-${suite}/beforeEach/${fp}`;
                 addArtifact(path);
-                return [path, contents];
+                return [path, contents, testName];
             },
         ],
         [
@@ -201,10 +224,10 @@ export const beforeAllProxy = (pm, suite, addArtifact) => {
     return baseProxy(pm, [
         [
             "writeFileSync",
-            (fp, contents) => {
+            (fp, contents, testName) => {
                 const path = `suite-${suite}/beforeAll/${fp}`;
                 addArtifact(path);
-                return [path, contents];
+                return [path, contents, testName];
             },
         ],
         [
@@ -240,10 +263,10 @@ export const afterAllProxy = (pm, suite, addArtifact) => {
         ],
         [
             "writeFileSync",
-            (fp, contents) => {
+            (fp, contents, testName) => {
                 const path = `suite-${suite}/afterAll/${fp}`;
                 addArtifact(path);
-                return [path, contents];
+                return [path, contents, testName];
             },
         ],
         [

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

@@ -35,7 +35,17 @@ export const testAdapter = {
             beforeEachProxy: input.butThenProxy(new MockPMBase(), theGivenString),
         };
     },
-    assertThis: (returnedFilePath, expectation) => {
-        assert.equal(returnedFilePath, expectation);
+    assertThis: (actualResult, expectedResult) => {
+        // Handle both path assertions and our new test result
+        if (typeof actualResult === 'string' && actualResult.startsWith('PASS')) {
+            assert.equal(actualResult, 'PASS', 'tests.json should be written with correct path and content');
+        }
+        else if (typeof actualResult === 'string' && actualResult.startsWith('FAIL')) {
+            // For the tests.json write test, we want to see what's actually happening
+            assert.fail(`Test failed: ${actualResult}`);
+        }
+        else {
+            assert.equal(actualResult, expectedResult);
+        }
     },
 };

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

@@ -5,25 +5,25 @@ function createPathRewriter(basePath) {
         if (!path)
             return path;
         // Normalize paths and handle edge cases
-        const normalizedPath = path.replace(/\\/g, '/');
-        const normalizedBase = basePath.replace(/\\/g, '/');
+        const normalizedPath = path.replace(/\\/g, "/");
+        const normalizedBase = basePath.replace(/\\/g, "/");
         // Handle absolute paths
-        if (normalizedPath.startsWith('/')) {
+        if (normalizedPath.startsWith("/")) {
             return `${normalizedBase}${normalizedPath}`;
         }
         // Handle parent directory references
-        if (normalizedPath.includes('../')) {
-            const parts = normalizedPath.split('/');
-            const baseParts = normalizedBase.split('/');
+        if (normalizedPath.includes("../")) {
+            const parts = normalizedPath.split("/");
+            const baseParts = normalizedBase.split("/");
             for (const part of parts) {
-                if (part === '..') {
+                if (part === "..") {
                     baseParts.pop();
                 }
-                else if (part !== '.') {
+                else if (part !== ".") {
                     baseParts.push(part);
                 }
             }
-            return baseParts.join('/');
+            return baseParts.join("/");
         }
         return `${normalizedBase}/${normalizedPath}`;
     };
@@ -39,58 +39,55 @@ export const implementation = {
     // functions have no mutations
     },
     thens: {
-        theButTheProxyReturns: (method, expectedPath) => (store) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
+        theButTheProxyReturns: (method, expectedPath) => async (store) => {
             const mockPm = new MockPMBase();
             const filepath = "test/path";
-            const rewritePath = createPathRewriter(`${filepath}/butThen`);
+            // Track the actual path that was used
             let actualPath;
-            let actualContent;
+            // Monkey patch to track the path
+            const originalWriteFileSync = mockPm.writeFileSync;
+            mockPm.writeFileSync = async (path, content, testName) => {
+                actualPath = path;
+                return originalWriteFileSync.call(mockPm, path, content, testName);
+            };
+            const originalCreateWriteStream = mockPm.createWriteStream;
+            mockPm.createWriteStream = async (path, testName) => {
+                actualPath = path;
+                return originalCreateWriteStream.call(mockPm, path, testName);
+            };
+            const originalScreencast = mockPm.screencast;
+            mockPm.screencast = async (opts, testName, page) => {
+                actualPath = opts.path;
+                return originalScreencast.call(mockPm, opts, testName, page);
+            };
+            const originalCustomScreenShot = mockPm.customScreenShot;
+            mockPm.customScreenShot = async (opts, testName, pageUid) => {
+                actualPath = opts.path;
+                return originalCustomScreenShot.call(mockPm, opts, testName, pageUid);
+            };
             try {
                 switch (method) {
                     case "writeFileSync":
-                        const content = expectedPath.includes("content")
-                            ? "test content"
-                            : "default content";
-                        butThenProxy(mockPm, filepath, {}).writeFileSync(expectedPath.includes("empty")
-                            ? ""
-                            : expectedPath.includes("nested")
-                                ? "nested/folder/test.txt"
-                                : expectedPath.includes("spaces")
-                                    ? "file with spaces.txt"
-                                    : expectedPath.includes("invalid")
-                                        ? "../invalid.txt"
-                                        : "test.txt", content);
-                        actualPath = (_a = mockPm.getLastCall("writeFileSync")) === null || _a === void 0 ? void 0 : _a.path;
-                        actualContent = (_b = mockPm.getLastCall("writeFileSync")) === null || _b === void 0 ? void 0 : _b.content;
+                        await butThenProxy(mockPm, filepath, {}).writeFileSync("test.txt", "content", "test");
                         break;
                     case "createWriteStream":
-                        butThenProxy(mockPm, filepath, {}).createWriteStream(expectedPath.includes("empty") ? "" : "stream.txt");
-                        actualPath = (_c = mockPm.getLastCall("createWriteStream")) === null || _c === void 0 ? void 0 : _c.path;
+                        await butThenProxy(mockPm, filepath, {}).createWriteStream("stream.txt", "test");
                         break;
                     case "screencast":
-                        butThenProxy(mockPm, filepath, {}).screencast({
-                            path: "screen.png",
-                            quality: 80,
-                            fullPage: true,
-                        }, "test");
-                        actualPath = (_e = (_d = mockPm.getLastCall("screencast")) === null || _d === void 0 ? void 0 : _d.opts) === null || _e === void 0 ? void 0 : _e.path;
-                        actualContent = (_f = mockPm.getLastCall("screencast")) === null || _f === void 0 ? void 0 : _f.opts;
+                        await butThenProxy(mockPm, filepath, {}).screencast({ path: "screen.png" }, "test");
                         break;
                     case "customScreenShot":
-                        butThenProxy(mockPm, filepath, {}).customScreenShot({ path: "shot.png" }, "test");
-                        actualPath = (_h = (_g = mockPm.getLastCall("customScreenShot")) === null || _g === void 0 ? void 0 : _g.opts) === null || _h === void 0 ? void 0 : _h.path;
+                        await butThenProxy(mockPm, filepath, {}).customScreenShot({ path: "shot.png" }, "test");
                         break;
                     default:
                         throw new Error(`Unknown method: ${method}`);
                 }
-                if (expectedPath === undefined) {
-                    return [undefined, undefined];
-                }
-                return [actualPath, expectedPath, actualContent];
+                // For now, just return the actual path to be asserted against expectedPath
+                // The testAdapter.assertThis will handle the comparison
+                return actualPath;
             }
             catch (error) {
-                return [error.message, expectedPath];
+                throw error;
             }
         },
         verifyContent: (expectedContent) => (result) => {
@@ -100,5 +97,38 @@ export const implementation = {
             }
             return result;
         },
+        // Test to verify tests.json is written correctly
+        verifyTestsJsonWrite: () => async (store) => {
+            const mockPm = new MockPMBase();
+            // Track the actual parameters passed to writeFileSync
+            let actualArgs;
+            const originalWriteFileSync = mockPm.writeFileSync;
+            mockPm.writeFileSync = async (...args) => {
+                actualArgs = args;
+                // Check if the first argument is being split
+                if (args[0] && typeof args[0] === "string") {
+                    console.log(`[TESTS.JSON DEBUG] First argument length: ${args[0].length}, value: "${args[0]}"`);
+                }
+                return originalWriteFileSync.apply(mockPm, args);
+            };
+            // Simulate writing tests.json through the proxy
+            // This should mimic the call in BaseBuilder: puppetMaster.writeFileSync(`tests.json`, JSON.stringify(this.toObj(), null, 2))
+            const testData = { test: "data" };
+            // const result = await butThenProxy(mockPm, "test/path", {}).writeFileSync(
+            //   "tests.json",
+            //   JSON.stringify(testData, null, 2),
+            //   "test"
+            // );
+            // Check if both path and content are correct
+            if (actualArgs &&
+                actualArgs[0] === "test/path/butThen/tests.json" &&
+                actualArgs[1] === JSON.stringify(testData, null, 2) &&
+                actualArgs[2] === "test") {
+                return "PASS";
+            }
+            else {
+                return `FAIL: args=${JSON.stringify(actualArgs)}`;
+            }
+        },
     },
 };

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

@@ -21,6 +21,9 @@ export const specification = (Suite, Given, When, Then) => [
         specialCharsTest: Given.SomeBaseString(["butThenProxy should handle special characters in paths"], [], [
             Then.theButTheProxyReturns("writeFileSync", "test/path/butThen/file with spaces.txt"),
         ], "special chars test"),
+        testsJsonTest: Given.SomeBaseString(["butThenProxy should handle tests.json correctly"], [], [
+            Then.theButTheProxyReturns("writeFileSync", "test/path/butThen/tests.json"),
+        ], "tests.json test"),
     }),
     Suite.Default("Proxy Type Coverage", {
         // Test all proxy types

package/dist/module/src/utils/api.js

@@ -1,4 +1,4 @@
-import { getLogFilesForRuntime } from "./logFiles";
+import { getLogFilesForRuntime, STANDARD_LOGS } from "./logFiles";
 export const fetchProjectData = async (projectName) => {
     const [summaryRes, configRes] = await Promise.all([
         fetch(`reports/${projectName}/summary.json`),
@@ -16,49 +16,60 @@ export const fetchTestData = async (projectName, filepath, runTime) => {
         .join(".")}/${runTime}`;
     try {
         const logFiles = getLogFilesForRuntime(runTime);
-        console.log("mark2", logFiles);
-        const [testRes, ...logRes] = await Promise.all([
-            fetch(`${basePath}/tests.json`),
-            ...logFiles.map((f) => fetch(`${basePath}/${f}`)),
-            fetch(`${basePath}/type_errors.txt`),
-            fetch(`${basePath}/lint_errors.txt`),
-        ]);
-        const logs = {
-            "tests.json": await (await fetch(`${basePath}/tests.json`)).json(),
-            "type_errors.txt": await (await fetch(`${basePath}/type_errors.txt`)).text(),
-            "lint_errors.txt": await (await fetch(`${basePath}/lint_errors.txt`)).text(),
-            "exit.log": await (await fetch(`${basePath}/exit.log`)).text(),
-        };
-        if (runTime === "node") {
-            logs["stdout.log"] = await (await fetch(`${basePath}/stdout.log`)).text();
-            logs["stderr.log"] = await (await fetch(`${basePath}/stderr.log`)).text();
-        }
-        if (runTime === "web") {
-            logs["info.log"] = await (await fetch(`${basePath}/info.log`)).text();
-            logs["error.log"] = await (await fetch(`${basePath}/error.log`)).text();
-            logs["debug.log"] = await (await fetch(`${basePath}/debug.log`)).text();
-            logs["warn.log"] = await (await fetch(`${basePath}/warn.log`)).text();
+        const logs = {};
+        // Fetch all log files in parallel
+        const logRequests = logFiles.map(async (file) => {
+            try {
+                const response = await fetch(`${basePath}/${file}`);
+                if (!response.ok)
+                    return null;
+                const content = file.endsWith('.json')
+                    ? await response.json()
+                    : await response.text();
+                return { file, content };
+            }
+            catch (err) {
+                console.error(`Failed to fetch ${file}:`, err);
+                return null;
+            }
+        });
+        // Wait for all requests and populate logs
+        const logResults = await Promise.all(logRequests);
+        logResults.forEach(result => {
+            if (result) {
+                logs[result.file] = result.content;
+            }
+        });
+        // Ensure we fetch all standard logs
+        for (const file of Object.values(STANDARD_LOGS)) {
+            if (!logs[file]) {
+                try {
+                    const response = await fetch(`${basePath}/${file}`);
+                    if (response.ok) {
+                        logs[file] = file.endsWith('.json')
+                            ? await response.json()
+                            : await response.text();
+                    }
+                }
+                catch (err) {
+                    console.error(`Failed to fetch ${file}:`, err);
+                }
+            }
         }
         // const logs = await logFiles.reduce(async (acc, file, i) => {
         //   acc[file.split(".")[0]] = await logRes[i].text();
         //   return acc;
         // }, {});
-        if (!testRes.ok) {
+        // Check if we got any logs at all
+        if (Object.keys(logs).length === 0) {
             return {
-                // testData: null,
-                logs,
-                // typeErrors: await logRes[logFiles.length].text(),
-                // lintErrors: await logRes[logFiles.length + 1].text(),
-                error: "Tests did not complete successfully. Please check the build and runtime logs for errors.",
+                logs: {},
+                error: "No test logs found. The test may not have run or the report files are missing."
             };
         }
-        console.log("mark1", logs);
         return {
-            // testData: await testRes.json(),
             logs,
-            // typeErrors: await logRes[logFiles.length].text(),
-            // lintErrors: await logRes[logFiles.length + 1].text(),
-            error: null,
+            error: null
         };
     }
     catch (err) {