testeranto 0.172.0 → 0.177.0

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

@@ -17,53 +17,53 @@ const baseProxy = function (pm, mappings) {
         },
     });
 };
-const butThenProxy = (pm, filepath) => {
+const butThenProxy = (pm, filepath, addArtifact) => {
     return baseProxy(pm, [
         [
             "screencast",
             (opts, p) => {
-                var _a;
                 const path = `${filepath}/butThen/${opts.path}`;
-                console.log(`[Proxy] Captured artifact path for butThen:`, path);
-                if ((_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.addArtifact) {
-                    pm.currentStep.addArtifact(path);
-                }
-                else {
-                    console.warn('No currentStep or addArtifact method found');
-                }
+                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,
                 ];
             },
         ],
-        ["createWriteStream", (fp) => {
-                var _a;
+        [
+            "createWriteStream",
+            (fp) => {
                 const path = `${filepath}/butThen/${fp}`;
-                console.log(`[Proxy] Captured artifact path for butThen:`, path);
-                if ((_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.addArtifact) {
-                    pm.currentStep.addArtifact(path);
-                }
-                else {
-                    console.warn('No currentStep or addArtifact method found');
-                }
+                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,
@@ -73,186 +73,200 @@ const butThenProxy = (pm, filepath) => {
     ]);
 };
 exports.butThenProxy = butThenProxy;
-const andWhenProxy = (pm, filepath) => baseProxy(pm, [
-    [
-        "screencast",
-        (opts, p) => {
-            var _a, _b;
-            const path = `${filepath}/andWhen/${opts.path}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [
-                Object.assign(Object.assign({}, opts), { path }),
-                p,
-            ];
-        },
-    ],
-    ["createWriteStream", (fp) => {
-            var _a, _b;
-            const path = `${filepath}/andWhen/${fp}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [path];
-        }],
-    ["writeFileSync", (fp, contents) => {
-            var _a, _b;
-            const path = `${filepath}/andWhen/${fp}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [path, contents];
-        }],
-    [
-        "customScreenShot",
-        (opts, p) => {
-            var _a, _b;
-            const path = `${filepath}/andWhen/${opts.path}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [
-                Object.assign(Object.assign({}, 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) => {
-            var _a, _b;
-            const path = `suite-${suite}/given-${given}/afterEach/${opts.path}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [
-                Object.assign(Object.assign({}, opts), { path }),
-                p,
-            ];
-        },
-    ],
-    ["createWriteStream", (fp) => {
-            var _a, _b;
-            const path = `suite-${suite}/afterEach/${fp}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [path];
-        }],
-    [
-        "writeFileSync",
-        (fp, contents) => {
-            var _a, _b;
-            const path = `suite-${suite}/given-${given}/afterEach/${fp}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [path, contents];
-        },
-    ],
-    [
-        "customScreenShot",
-        (opts, p) => {
-            var _a, _b;
-            const path = `suite-${suite}/given-${given}/afterEach/${opts.path}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [
-                Object.assign(Object.assign({}, 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) => {
-            var _a, _b;
-            const path = `suite-${suite}/beforeEach/${opts.path}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [
-                Object.assign(Object.assign({}, opts), { path }),
-                p,
-            ];
-        },
-    ],
-    [
-        "writeFileSync",
-        (fp, contents) => {
-            var _a, _b;
-            const path = `suite-${suite}/beforeEach/${fp}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [path, contents];
-        },
-    ],
-    [
-        "customScreenShot",
-        (opts, p) => {
-            var _a, _b;
-            const path = `suite-${suite}/beforeEach/${opts.path}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [
-                Object.assign(Object.assign({}, opts), { path }),
-                p,
-            ];
-        },
-    ],
-    ["createWriteStream", (fp) => {
-            var _a, _b;
-            const path = `suite-${suite}/beforeEach/${fp}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [path];
-        }],
-]);
+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) => {
-            var _a, _b;
-            const path = `suite-${suite}/beforeAll/${fp}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [path, contents];
-        },
-    ],
-    [
-        "customScreenShot",
-        (opts, p) => {
-            var _a, _b;
-            const path = `suite-${suite}/beforeAll/${opts.path}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [
-                Object.assign(Object.assign({}, opts), { path }),
-                p,
-            ];
-        },
-    ],
-    ["createWriteStream", (fp) => {
-            var _a, _b;
-            const path = `suite-${suite}/beforeAll/${fp}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [path];
-        }],
-]);
+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) => {
-            var _a, _b;
-            const path = `suite-${suite}/afterAll/${fp}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [path];
-        }],
-    [
-        "writeFileSync",
-        (fp, contents) => {
-            var _a, _b;
-            const path = `suite-${suite}/afterAll/${fp}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [path, contents];
-        },
-    ],
-    [
-        "customScreenShot",
-        (opts, p) => {
-            var _a, _b;
-            const path = `suite-${suite}/afterAll/${opts.path}`;
-            (_b = (_a = pm.currentStep) === null || _a === void 0 ? void 0 : _a.artifacts) === null || _b === void 0 ? void 0 : _b.push(path);
-            return [
-                Object.assign(Object.assign({}, 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 {

package/dist/common/testeranto.config.js

@@ -1,8 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+// TODO- this config file is horrible. I need to redo how config files are handled.
 const config = {
     projects: {
-        allTests: {
+        // staticSite: {
+        //   tests: [["src/ReportServer.test.ts/index.ts", "node", { ports: 1 }, []]],
+        //   clearScreen: false,
+        //   debugger: false,
+        //   externals: [],
+        //   featureIngestor: function (s: string): Promise<string> {
+        //     throw new Error("Function not implemented.");
+        //   },
+        //   importPlugins: [],
+        //   minify: false,
+        //   nodePlugins: [],
+        //   ports: ["3334"],
+        //   src: "",
+        //   webPlugins: [],
+        // },
+        core: {
             tests: [
                 [
                     "src/components/pure/ProjectPageView.test/index.ts",
@@ -10,36 +26,36 @@ const config = {
                     { ports: 0 },
                     [],
                 ],
-                ["src/lib/BaseSuite.test/node.test.ts", "node", { ports: 0 }, []],
-                ["src/lib/BaseSuite.test/pure.test.ts", "pure", { ports: 0 }, []],
-                ["src/lib/BaseSuite.test/web.test.ts", "web", { ports: 0 }, []],
-                ["src/Pure.test.ts", "pure", { ports: 0 }, []],
-                ["src/lib/pmProxy.test/index.ts", "node", { ports: 0 }, []],
-                ["src/lib/core.test/core.test.ts", "node", { ports: 0 }, []],
-                [
-                    "src/lib/classBuilder.test/classBuilder.test.ts",
-                    "node",
-                    { ports: 0 },
-                    [],
-                ],
-                [
-                    "src/lib/baseBuilder.test/baseBuilder.test.node.ts",
-                    "node",
-                    { ports: 0 },
-                    [],
-                ],
-                [
-                    "src/lib/baseBuilder.test/baseBuilder.test.pure.ts",
-                    "pure",
-                    { ports: 0 },
-                    [],
-                ],
-                [
-                    "src/lib/baseBuilder.test/baseBuilder.test.web.ts",
-                    "web",
-                    { ports: 0 },
-                    [],
-                ],
+                // ["src/lib/BaseSuite.test/node.test.ts", "node", { ports: 0 }, []],
+                // ["src/lib/BaseSuite.test/pure.test.ts", "pure", { ports: 0 }, []],
+                // ["src/lib/BaseSuite.test/web.test.ts", "web", { ports: 0 }, []],
+                // ["src/Pure.test.ts", "pure", { ports: 0 }, []],
+                // ["src/lib/pmProxy.test/index.ts", "node", { ports: 0 }, []],
+                // ["src/lib/core.test/core.test.ts", "node", { ports: 0 }, []],
+                // [
+                //   "src/lib/classBuilder.test/classBuilder.test.ts",
+                //   "node",
+                //   { ports: 0 },
+                //   [],
+                // ],
+                // [
+                //   "src/lib/baseBuilder.test/baseBuilder.test.node.ts",
+                //   "node",
+                //   { ports: 0 },
+                //   [],
+                // ],
+                // [
+                //   "src/lib/baseBuilder.test/baseBuilder.test.pure.ts",
+                //   "pure",
+                //   { ports: 0 },
+                //   [],
+                // ],
+                // [
+                //   "src/lib/baseBuilder.test/baseBuilder.test.web.ts",
+                //   "web",
+                //   { ports: 0 },
+                //   [],
+                // ],
                 // ["src/mothership/test.ts", "node", { ports: 0 }, []],
                 // ["./src/lib/abstractBase/index.ts", "node", { ports: 0 }, []],
                 // [
@@ -70,6 +86,5 @@ const config = {
             webPlugins: [],
         },
     },
-    reportDomain: "https://adamwong246.github.io/testeranto",
 };
 exports.default = config;