testeranto 0.173.0 → 0.177.0

package/src/lib/pmProxy.ts

@@ -8,9 +8,14 @@ export type IProxyBase = (
   mappings: [string, (...x: any) => any][]
 ) => IPM;
 
-export type IProxy = (pm: IPM, filepath: string) => IPM;
-export type IProxyAfterEach = (pm: IPM, suite: string, given: string) => IPM;
-export type IProxyBeforeEach = (pm: IPM, suite: string) => IPM;
+export type IProxy = (pm: IPM, filepath: string, step: any) => IPM;
+export type IProxyAfterEach = (
+  pm: IPM,
+  suite: string,
+  given: string,
+  step: any
+) => IPM;
+export type IProxyBeforeEach = (pm: IPM, suite: string, step: any) => IPM;
 
 export type IProxiedFunctions =
   | "screencast"
@@ -38,13 +43,31 @@ const baseProxy: IProxyBase = function (
   });
 };
 
-export const butThenProxy: IProxy = (pm: IPM, filepath: string) => {
+export const butThenProxy: IProxy = (
+  pm: IPM,
+  filepath: string,
+  addArtifact
+) => {
   return baseProxy(pm, [
     [
       "screencast",
       (opts, p) => {
         const path = `${filepath}/butThen/${opts.path}`;
-        (pm as any).currentStep?.artifacts?.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 [
           {
             ...opts,
@@ -54,30 +77,27 @@ export const butThenProxy: IProxy = (pm: IPM, filepath: string) => {
         ];
       },
     ],
-
     [
       "createWriteStream",
       (fp) => {
         const path = `${filepath}/butThen/${fp}`;
-        (pm as any).currentStep?.artifacts?.push(path);
+        addArtifact(path);
         return [path];
       },
     ],
-
     [
       "writeFileSync",
       (fp, contents) => {
         const path = `${filepath}/butThen/${fp}`;
-        (pm as any).currentStep?.artifacts?.push(path);
+        addArtifact(path);
         return [path, contents];
       },
     ],
-
     [
       "customScreenShot",
       (opts, p) => {
         const path = `${filepath}/butThen/${opts.path}`;
-        (pm as any).currentStep?.artifacts?.push(path);
+        addArtifact(path);
         return [
           {
             ...opts,
@@ -90,146 +110,258 @@ export const butThenProxy: IProxy = (pm: IPM, filepath: string) => {
   ]);
 };
 
-export const andWhenProxy: IProxy = (pm: IPM, filepath: string) =>
-  baseProxy(pm, [
+export const andWhenProxy: IProxy = (
+  pm: IPM,
+  filepath: string,
+  addArtifact
+) => {
+  return baseProxy(pm, [
     [
       "screencast",
-      (opts, p) => [
-        {
-          ...opts,
-          path: `${filepath}/andWhen/${opts.path}`,
-        },
-        p,
-      ],
+      (opts, p) => {
+        const path = `${filepath}/andWhen/${opts.path}`;
+        addArtifact(path);
+        return [
+          {
+            ...opts,
+            path,
+          },
+          p,
+        ];
+      },
     ],
 
-    ["createWriteStream", (fp) => [`${filepath}/andWhen/${fp}`]],
+    [
+      "createWriteStream",
+      (fp) => {
+        const path = `${filepath}/andWhen/${fp}`;
+        addArtifact(path);
+        return [path];
+      },
+    ],
 
-    ["writeFileSync", (fp, contents) => [`${filepath}/andWhen${fp}`, contents]],
+    [
+      "writeFileSync",
+      (fp, contents) => {
+        const path = `${filepath}/andWhen/${fp}`;
+        addArtifact(path);
+        return [path, contents];
+      },
+    ],
 
     [
       "customScreenShot",
-      (opts, p) => [
-        {
-          ...opts,
-          path: `${filepath}/andWhen${opts.path}`,
-        },
-        p,
-      ],
+      (opts, p) => {
+        const path = `${filepath}/andWhen/${opts.path}`;
+        // console.log("STEP2", JSON.stringify(step));
+        addArtifact(path);
+        return [
+          {
+            ...opts,
+            path,
+          },
+          p,
+        ];
+      },
     ],
   ]);
+};
 
 export const afterEachProxy: IProxyAfterEach = (
   pm: IPM,
   suite: string,
-  given: string
-): IPM =>
-  baseProxy(pm, [
+  given: string,
+  addArtifact
+): IPM => {
+  return baseProxy(pm, [
     [
       "screencast",
-      (opts, p) => [
-        {
-          ...opts,
-          path: `suite-${suite}/given-${given}/afterEach/${opts.path}`,
-        },
-        p,
-      ],
+      (opts, p) => {
+        const path = `suite-${suite}/given-${given}/afterEach/${opts.path}`;
+        addArtifact(path);
+        return [
+          {
+            ...opts,
+            path,
+          },
+          p,
+        ];
+      },
     ],
 
-    ["createWriteStream", (fp) => [`suite-${suite}/afterEach/${fp}`]],
+    [
+      "createWriteStream",
+      (fp) => {
+        const path = `suite-${suite}/afterEach/${fp}`;
+        addArtifact(path);
+        return [path];
+      },
+    ],
     [
       "writeFileSync",
-      (fp, contents) => [
-        `suite-${suite}/given-${given}/afterEach/${fp}`,
-        contents,
-      ],
+      (fp, contents) => {
+        const path = `suite-${suite}/given-${given}/afterEach/${fp}`;
+        addArtifact(path);
+        return [path, contents];
+      },
     ],
 
     [
       "customScreenShot",
-      (opts, p) => [
-        {
-          ...opts,
-          path: `suite-${suite}/given-${given}/afterEach/${opts.path}`,
-        },
-        p,
-      ],
+      (opts, p) => {
+        const path = `suite-${suite}/given-${given}/afterEach/${opts.path}`;
+        addArtifact(path);
+        // console.log("STEP3", JSON.stringify(step));
+        return [
+          {
+            ...opts,
+            path,
+          },
+          p,
+        ];
+      },
     ],
   ]);
+};
 
 export const beforeEachProxy: IProxyBeforeEach = (
   pm: IPM,
-  suite: string
-): IPM =>
-  baseProxy(pm, [
+  suite: string,
+  addArtifact
+): IPM => {
+  return baseProxy(pm, [
     [
       "screencast",
-      (opts, p) => [
-        {
-          ...opts,
-          path: `suite-${suite}/beforeEach/${opts.path}`,
-        },
-        p,
-      ],
+      (opts, p) => {
+        const path = `suite-${suite}/beforeEach/${opts.path}`;
+        addArtifact(path);
+
+        return [
+          {
+            ...opts,
+            path,
+          },
+          p,
+        ];
+      },
     ],
 
     [
       "writeFileSync",
-      (fp, contents) => [`suite-${suite}/beforeEach/${fp}`, contents],
+      (fp, contents) => {
+        const path = `suite-${suite}/beforeEach/${fp}`;
+        addArtifact(path);
+        return [path, contents];
+      },
     ],
 
     [
       "customScreenShot",
-      (opts, p) => [
-        {
-          ...opts,
-          path: `suite-${suite}/beforeEach/${opts.path}`,
-        },
-        p,
-      ],
+      (opts, p) => {
+        const path = `suite-${suite}/beforeEach/${opts.path}`;
+        addArtifact(path);
+        return [
+          {
+            ...opts,
+            path,
+          },
+          p,
+        ];
+      },
     ],
 
-    ["createWriteStream", (fp) => [`suite-${suite}/beforeEach/${fp}`]],
+    [
+      "createWriteStream",
+      (fp) => {
+        const path = `suite-${suite}/beforeEach/${fp}`;
+        addArtifact(path);
+        return [path];
+      },
+    ],
   ]);
+};
 
-export const beforeAllProxy: IProxy = (pm: IPM, suite: string): IPM =>
-  baseProxy(pm, [
+export const beforeAllProxy: IProxy = (
+  pm: IPM,
+  suite: string,
+  addArtifact
+): IPM => {
+  return baseProxy(pm, [
     [
       "writeFileSync",
-      (fp, contents) => [`suite-${suite}/beforeAll/${fp}`, contents],
+      (fp, contents) => {
+        const path = `suite-${suite}/beforeAll/${fp}`;
+        addArtifact(path);
+
+        return [path, contents];
+      },
     ],
 
     [
       "customScreenShot",
-      (opts, p) => [
-        {
-          ...opts,
-          path: `suite-${suite}/beforeAll/${opts.path}`,
-        },
-        p,
-      ],
+      (opts, p) => {
+        const path = `suite-${suite}/beforeAll/${opts.path}`;
+        addArtifact(path);
+        return [
+          {
+            ...opts,
+            path,
+          },
+          p,
+        ];
+      },
     ],
 
-    ["createWriteStream", (fp) => [`suite-${suite}/beforeAll/${fp}`]],
+    [
+      "createWriteStream",
+      (fp) => {
+        const path = `suite-${suite}/beforeAll/${fp}`;
+        addArtifact(path);
+        return [path];
+      },
+    ],
   ]);
+};
 
-export const afterAllProxy: IProxy = (pm: IPM, suite: string): IPM =>
-  baseProxy(pm, [
-    ["createWriteStream", (fp) => [`suite-${suite}/afterAll/${fp}`]],
+export const afterAllProxy: IProxy = (
+  pm: IPM,
+  suite: string,
+  addArtifact
+): IPM => {
+  return baseProxy(pm, [
+    [
+      "createWriteStream",
+      (fp) => {
+        const path = `suite-${suite}/afterAll/${fp}`;
+        addArtifact(path);
+        return [path];
+      },
+    ],
 
     [
       "writeFileSync",
-      (fp, contents) => [`suite-${suite}/afterAll/${fp}`, contents],
+      (fp, contents) => {
+        const path = `suite-${suite}/afterAll/${fp}`;
+        console.log("MARK10");
+        addArtifact(path);
+        return [path, contents];
+      },
     ],
 
     [
       "customScreenShot",
-      (opts, p) => [
-        {
-          ...opts,
-          path: `suite-${suite}/afterAll/${opts.path}`,
-        },
-        p,
-      ],
+      (opts, p) => {
+        const path = `suite-${suite}/afterAll/${opts.path}`;
+        addArtifact(path);
+        console.log("MARK9");
+        return [
+          {
+            ...opts,
+            path,
+          },
+          p,
+        ];
+      },
     ],
   ]);
+};