testeranto 0.114.1 → 0.125.0

package/dist/common/{esbuildConfigs → src/esbuildConfigs}/web.js

@@ -7,9 +7,9 @@ const path_1 = __importDefault(require("path"));
 const index_js_1 = __importDefault(require("./index.js"));
 const inputFilesPlugin_js_1 = __importDefault(require("./inputFilesPlugin.js"));
 const featuresPlugin_js_1 = __importDefault(require("./featuresPlugin.js"));
-exports.default = (config, entryPoints) => {
-    const { inputFilesPluginFactory, register } = (0, inputFilesPlugin_js_1.default)("web", entryPoints);
-    return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { outdir: config.outdir + "/web", alias: {
+exports.default = (config, entryPoints, testName) => {
+    const { inputFilesPluginFactory, register } = (0, inputFilesPlugin_js_1.default)("web", testName);
+    return Object.assign(Object.assign({}, (0, index_js_1.default)(config)), { outdir: `testeranto/bundles/web/${testName}`, alias: {
             react: path_1.default.resolve("./node_modules/react"),
         }, metafile: true, external: [
             "path",
@@ -34,7 +34,10 @@ exports.default = (config, entryPoints) => {
             inputFilesPluginFactory,
             {
                 name: "rebuild-notify",
-                setup(build) {
+                setup: (build) => {
+                    build.onStart(() => {
+                        console.log(`> web build starting...`);
+                    });
                     build.onEnd((result) => {
                         console.log(`> web build ended with ${result.errors.length} errors`);
                         if (result.errors.length > 0) {
@@ -45,6 +48,6 @@ exports.default = (config, entryPoints) => {
                     });
                 },
             },
-            ...(config.nodePlugins.map((p) => p(register, entryPoints)) || []),
+            ...((config.webPlugins || []).map((p) => p(register, entryPoints)) || []),
         ] });
 };

package/dist/common/src/examples/react/component/index.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassicalComponent = void 0;
+const react_1 = __importDefault(require("react"));
+class ClassicalComponent extends react_1.default.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            count: 0,
+        };
+    }
+    render() {
+        return (react_1.default.createElement("div", { style: { border: "3px solid black" } },
+            react_1.default.createElement("h1", { id: "theHeader" }, "Hello Marcus"),
+            react_1.default.createElement("pre", { id: "theProps" }, JSON.stringify(this.props)),
+            react_1.default.createElement("p", null,
+                "foo: ",
+                this.props.foo),
+            react_1.default.createElement("pre", { id: "theStat" }, JSON.stringify(this.state)),
+            react_1.default.createElement("p", null,
+                "count: ",
+                this.state.count,
+                " times"),
+            react_1.default.createElement("button", { id: "theButton", onClick: async () => {
+                    this.setState({ count: this.state.count + 1 });
+                } }, "Click")));
+    }
+}
+exports.ClassicalComponent = ClassicalComponent;
+exports.default = ClassicalComponent;

package/dist/common/src/examples/react/component/test.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.specification = void 0;
+const specification = (Suite, Given, When, Then) => {
+    return [
+        Suite.Default("a classical react component", {
+            test0: Given.AnEmptyState([`I click 4 times and the count is 3`], [
+                When.IClickTheButton(),
+                When.IClickTheButton(),
+                When.IClickTheButton(),
+                When.IClickTheHeader(),
+                // When.IClickTheButton(),
+            ], [
+                Then.ThePropsIs({ foo: "bar", children: [] }),
+                Then.TheStatusIs({ count: 3 }),
+            ]),
+            test1: Given.AnEmptyState([`Count is 1 by default`], [When.IClickTheButton()], [
+                Then.ThePropsIs({ foo: "bar", children: [] }),
+                Then.TheStatusIs({ count: 1 }),
+            ]),
+            test2: Given.AnEmptyState([`0`], [
+                When.IClickTheButton(),
+                When.IClickTheButton(),
+                When.IClickTheButton(),
+                When.IClickTheButton(),
+                When.IClickTheButton(),
+                When.IClickTheButton(),
+                When.IClickTheButton(),
+                When.IClickTheButton(),
+                When.IClickTheButton(),
+            ], [Then.TheStatusIs({ count: 9 })]),
+            test3: Given.AnEmptyState([`0`], [When.IClickTheButton(), When.IClickTheButton()], [Then.TheStatusIs({ count: 2 })]),
+        }, []),
+    ];
+};
+exports.specification = specification;

package/dist/common/src/init-docs.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Init_1 = __importDefault(require("./Init"));
+console.log("Initializing a testeranto project");
+(0, Init_1.default)();
+console.log("testeranto project initialized");

package/dist/common/{lib → src/lib}/abstractBase.js

@@ -7,7 +7,7 @@ class BaseSuite {
         this.index = index;
         this.givens = givens;
         this.checks = checks;
-        this.fails = [];
+        this.fails = 0;
     }
     features() {
         const features = Object.keys(this.givens)
@@ -16,18 +16,17 @@ class BaseSuite {
             .filter((value, index, array) => {
             return array.indexOf(value) === index;
         });
-        // .reduce((mm, lm) => {
-        //   mm[lm] = lm;
-        //   return mm;
-        // }, {});
         return features || [];
     }
     toObj() {
         const givens = Object.keys(this.givens).map((k) => this.givens[k].toObj());
+        const checks = Object.keys(this.checks).map((k) => this.checks[k].toObj());
         return {
             name: this.name,
             givens,
+            checks,
             fails: this.fails,
+            failed: this.failed,
             features: this.features(),
         };
     }
@@ -35,46 +34,50 @@ class BaseSuite {
         return new Promise((res) => res(s));
     }
     assertThat(t) {
-        return t;
+        return !!t;
     }
     afterAll(store, artifactory, pm) {
         return store;
     }
     async run(input, testResourceConfiguration, artifactory, tLog, pm) {
         this.testResourceConfiguration = testResourceConfiguration;
-        tLog("test resources: ", JSON.stringify(testResourceConfiguration));
+        // 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);
         const sNdx = this.index;
         const sName = this.name;
+        const beforeAllProxy = new Proxy(pm, {
+            get(target, prop, receiver) {
+                if (prop === "customScreenShot") {
+                    return (opts, p) => target.customScreenShot(Object.assign(Object.assign({}, opts), { 
+                        // path: `${filepath}/${opts.path}`,
+                        path: `suite-${sNdx}/beforeAll/${opts.path}` }), p);
+                }
+                if (prop === "writeFileSync") {
+                    return (fp, contents) => target[prop](`suite-${sNdx}/beforeAll/${fp}`, contents);
+                }
+                /* @ts-ignore:next-line */
+                return Reflect.get(...arguments);
+            },
+        });
+        const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, beforeAllProxy);
         for (const [gKey, g] of Object.entries(this.givens)) {
-            // console.log("gKey", gKey);
-            const beforeAllProxy = new Proxy(pm, {
-                get(target, prop, receiver) {
-                    if (prop === "customScreenShot") {
-                        return (opts, p) => target.customScreenShot(Object.assign(Object.assign({}, opts), { 
-                            // path: `${filepath}/${opts.path}`,
-                            path: `suite-${sNdx}/beforeAll/${opts.path}` }), p);
-                    }
-                    if (prop === "writeFileSync") {
-                        return (fp, contents) => target[prop](`suite-${sNdx}/beforeAll/${fp}`, contents);
-                    }
-                    /* @ts-ignore:next-line */
-                    return Reflect.get(...arguments);
-                },
-            });
-            const subject = await this.setup(input, suiteArtifactory, testResourceConfiguration, beforeAllProxy);
             const giver = this.givens[gKey];
             try {
                 this.store = await giver.give(subject, gKey, testResourceConfiguration, this.assertThat, suiteArtifactory, tLog, pm, sNdx);
             }
             catch (e) {
-                console.error(e);
-                this.fails.push(giver);
+                this.failed = true;
+                this.fails = this.fails + 1;
+                // console.error(e);
+                // this.fails.push(giver);
                 // return this;
             }
         }
+        for (const [ndx, thater] of this.checks.entries()) {
+            await thater.check(subject, thater.name, testResourceConfiguration, this.assertThat, suiteArtifactory, tLog, pm);
+        }
         try {
             this.afterAll(this.store, artifactory, 
             // afterAllProxy
@@ -85,17 +88,6 @@ class BaseSuite {
             // this.fails.push(this);
             // return this;
         }
-        // for (const [ndx, thater] of this.checks.entries()) {
-        //   await thater.check(
-        //     subject,
-        //     thater.name,
-        //     testResourceConfiguration,
-        //     this.assertThat,
-        //     suiteArtifactory,
-        //     tLog,
-        //     pm
-        //   );
-        // }
         // @TODO fix me
         // for (const k of Object.keys(this.givens)) {
         //   const giver = this.givens[k];
@@ -113,9 +105,7 @@ class BaseSuite {
 }
 exports.BaseSuite = BaseSuite;
 class BaseGiven {
-    constructor(name, features, whens, thens, givenCB, initialValues
-    // key: string
-    ) {
+    constructor(name, features, whens, thens, givenCB, initialValues) {
         this.name = name;
         this.features = features;
         this.whens = whens;
@@ -123,10 +113,7 @@ class BaseGiven {
         this.givenCB = givenCB;
         this.initialValues = initialValues;
     }
-    beforeAll(store, 
-    // artifactory: ITestArtifactory
-    // subject,
-    initializer, artifactory, testResource, initialValues, pm) {
+    beforeAll(store) {
         return store;
     }
     toObj() {
@@ -136,7 +123,7 @@ class BaseGiven {
             whens: this.whens.map((w) => w.toObj()),
             thens: this.thens.map((t) => t.toObj()),
             error: this.error ? [this.error, this.error.stack] : null,
-            // fail: this.fail ? [this.fail] : false,
+            failed: this.failed,
             features: this.features,
         };
     }
@@ -148,29 +135,35 @@ class BaseGiven {
         tLog(`\n ${this.key}`);
         tLog(`\n Given: ${this.name}`);
         const givenArtifactory = (fPath, value) => artifactory(`given-${key}/${fPath}`, value);
+        const beforeEachProxy = new Proxy(pm, {
+            get(target, prop, receiver) {
+                if (prop === "writeFileSync") {
+                    return (fp, contents) => target[prop](`suite-${suiteNdx}/given-${key}/when/beforeEach/${fp}`, contents);
+                }
+                if (prop === "customScreenShot") {
+                    return (opts, p) => target.customScreenShot(Object.assign(Object.assign({}, opts), { path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}` }), p);
+                }
+                if (prop === "screencast") {
+                    return (opts, p) => target.screencast(Object.assign(Object.assign({}, opts), { path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}` }), p);
+                }
+                /* @ts-ignore:next-line */
+                return Reflect.get(...arguments);
+            },
+        });
+        this.uberCatcher((e) => {
+            console.error(e);
+            this.error = e.error;
+            tLog(e.stack);
+        });
         try {
-            // tLog(`\n Given this.store`, this.store);
-            const beforeEachProxy = new Proxy(pm, {
-                get(target, prop, receiver) {
-                    if (prop === "writeFileSync") {
-                        return (fp, contents) => target[prop](`suite-${suiteNdx}/given-${key}/when/beforeEach/${fp}`, contents);
-                    }
-                    if (prop === "customScreenShot") {
-                        return (opts, p) => target.customScreenShot(Object.assign(Object.assign({}, opts), { path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}` }), p);
-                    }
-                    if (prop === "screencast") {
-                        return (opts, p) => target.screencast(Object.assign(Object.assign({}, opts), { path: `suite-${suiteNdx}/given-${key}/when/beforeEach/${opts.path}` }), p);
-                    }
-                    /* @ts-ignore:next-line */
-                    return Reflect.get(...arguments);
-                },
-            });
-            this.uberCatcher((e) => {
-                console.error(e);
-                this.error = e.error;
-                tLog(e.stack);
-            });
             this.store = await this.givenThat(subject, testResourceConfiguration, givenArtifactory, this.givenCB, this.initialValues, beforeEachProxy);
+        }
+        catch (e) {
+            this.error = e;
+            throw e;
+        }
+        try {
+            // tLog(`\n Given this.store`, this.store);
             for (const [whenNdx, whenStep] of this.whens.entries()) {
                 await whenStep.test(this.store, testResourceConfiguration, tLog, pm, `suite-${suiteNdx}/given-${key}/when/${whenNdx}`);
             }
@@ -180,11 +173,10 @@ class BaseGiven {
             }
         }
         catch (e) {
-            console.error(e);
-            this.error = e;
+            // this.error = e;
+            this.failed = true;
             tLog(e.stack);
-            // tLog("\u0007"); // bell
-            // throw e;
+            throw e;
         }
         finally {
             try {
@@ -205,7 +197,10 @@ class BaseGiven {
                 afterEachProxy);
             }
             catch (e) {
-                console.error("afterEach failed! no error will be recorded!", e);
+                this.failed = e;
+                throw e;
+                // console.error("afterEach failed!", e);
+                // this.error = e.message;
             }
         }
         return this.store;
@@ -225,7 +220,6 @@ class BaseWhen {
     }
     async test(store, testResourceConfiguration, tLog, pm, filepath) {
         tLog(" When:", this.name);
-        const name = this.name;
         const andWhenProxy = new Proxy(pm, {
             get(target, prop, receiver) {
                 if (prop === "customScreenShot") {
@@ -269,7 +263,17 @@ class BaseThen {
         };
     }
     async test(store, testResourceConfiguration, tLog, pm, filepath) {
-        tLog(" Then:", this.name);
+        this.go = async (s) => {
+            tLog(" Then!!!:", this.name);
+            try {
+                await this.thenCB(s);
+            }
+            catch (e) {
+                console.log("test failed 1", e);
+                this.error = e;
+                throw e;
+            }
+        };
         try {
             const butThenProxy = new Proxy(pm, {
                 get(target, prop, receiver) {
@@ -283,46 +287,46 @@ class BaseThen {
                     return Reflect.get(...arguments);
                 },
             });
-            return this.butThen(store, this.thenCB, testResourceConfiguration, butThenProxy).catch((e) => {
-                this.error = true;
+            return this.butThen(store, this.go, testResourceConfiguration, butThenProxy).catch((e) => {
+                this.error = e;
                 throw e;
             });
         }
         catch (e) {
-            console.log("test failed", e);
-            this.error = e.message;
+            console.log("test failed 2", e);
+            this.error = e;
             throw e;
         }
     }
+    check() { }
 }
 exports.BaseThen = BaseThen;
 class BaseCheck {
-    constructor(name, features, checkCB, whens, thens) {
+    constructor(name, features, checker, x, checkCB) {
         this.name = name;
         this.features = features;
         this.checkCB = checkCB;
-        this.whens = whens;
-        this.thens = thens;
+        this.checker = checker;
     }
-    async afterEach(store, key, cb, pm) {
-        return;
+    toObj() {
+        return {
+            key: this.key,
+            name: this.name,
+            functionAsString: this.checkCB.toString(),
+            features: this.features,
+        };
+    }
+    async afterEach(store, key, artifactory, pm) {
+        return store;
+    }
+    beforeAll(store) {
+        return store;
     }
     async check(subject, key, testResourceConfiguration, tester, artifactory, tLog, pm) {
+        this.key = key;
         tLog(`\n Check: ${this.name}`);
-        const store = await this.checkThat(subject, testResourceConfiguration, artifactory, pm);
-        await this.checkCB(Object.entries(this.whens).reduce((a, [key, when]) => {
-            a[key] = async (payload) => {
-                return await when(payload, testResourceConfiguration).test(store, testResourceConfiguration, tLog, pm, "x");
-            };
-            return a;
-        }, {}), Object.entries(this.thens).reduce((a, [key, then]) => {
-            a[key] = async (payload) => {
-                const t = await then(payload, testResourceConfiguration).test(store, testResourceConfiguration, tLog, pm);
-                tester(t);
-            };
-            return a;
-        }, {}));
-        await this.afterEach(store, key, () => { }, pm);
+        this.store = await this.checkThat(subject, testResourceConfiguration, artifactory, this.checkCB, this.initialValues, pm);
+        await this.checker(this.store, pm);
         return;
     }
 }

package/dist/common/{lib → src/lib}/basebuilder.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseBuilder = void 0;
 class BaseBuilder {
     constructor(input, suitesOverrides, givenOverides, whenOverides, thenOverides, checkOverides, testResourceRequirement, testSpecification) {
-        this.input = input;
         this.artifacts = [];
         this.artifacts = [];
         this.testResourceRequirement = testResourceRequirement;
@@ -29,23 +28,22 @@ class BaseBuilder {
                 },
                 runner,
                 receiveTestResourceConfig: async function (puppetMaster) {
+                    const start = await puppetMaster.start();
                     const logFilePath = "log.txt";
                     const access = await puppetMaster.createWriteStream(logFilePath);
-                    const tLog = (...l) => {
-                        puppetMaster.write(access, `${l.toString()}\n`);
+                    const tLog = async (...l) => {
+                        const x = await puppetMaster.write(access, `${l.toString()}\n`);
+                        // console.log("x", x);
                     };
                     const suiteDone = await runner(puppetMaster, tLog);
-                    const logPromise = new Promise((res, rej) => {
-                        puppetMaster.end(access);
+                    const logPromise = new Promise(async (res, rej) => {
+                        await puppetMaster.end(access);
                         res(true);
                     });
-                    const numberOfFailures = Object.keys(suiteDone.givens).filter((k) => {
-                        return suiteDone.givens[k].error;
-                    }).length;
-                    puppetMaster.writeFileSync(`bdd_errors.txt`, numberOfFailures.toString());
-                    const o = this.toObj();
-                    puppetMaster.writeFileSync(`littleBoard.html`, `
-            <!DOCTYPE html>
+                    const fails = suiteDone.fails;
+                    const b = await puppetMaster.writeFileSync(`bdd_errors.txt`, fails.toString());
+                    await puppetMaster.writeFileSync(`littleBoard.html`, `
+<!DOCTYPE html>
 <html lang="en">
 
 <head>
@@ -55,19 +53,19 @@ class BaseBuilder {
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="author" content="" />
 
-  <link rel="stylesheet" href="/kokomoBay/docs/TestReport.css" />
-  <script src="/kokomoBay/docs/TestReport.js"></script>
+  <link rel="stylesheet" href="/kokomoBay/testeranto/TestReport.css" />
+  <script src="/kokomoBay/testeranto/TestReport.js"></script>
 
 </head>
 
-  <body>
-    <h1>Test report</h1>
-            <div id="root"/>
-  </body>
+<body>
+  <div id="root"/>
+</body>
             `);
-                    puppetMaster.writeFileSync(`tests.json`, JSON.stringify(this.toObj(), null, 2));
+                    await puppetMaster.writeFileSync(`tests.json`, JSON.stringify(this.toObj(), null, 2));
                     return {
-                        failed: numberOfFailures,
+                        failed: fails > 0,
+                        fails,
                         artifacts: this.artifacts || [],
                         logPromise,
                         features: suiteDone.features(),
@@ -76,6 +74,12 @@ class BaseBuilder {
             };
         });
     }
+    // testsJson() {
+    //   puppetMaster.writeFileSync(
+    //     `tests.json`,
+    //     JSON.stringify({ features: suiteDone.features() }, null, 2)
+    //   );
+    // }
     Specs() {
         return this.specs;
     }

package/dist/common/{lib → src/lib}/classBuilder.js

@@ -11,8 +11,11 @@ class ClassBuilder extends basebuilder_js_1.BaseBuilder {
             return a;
         }, {});
         const classyGivens = Object.entries(testImplementation.givens).reduce((a, [key, g]) => {
-            a[key] = (features, whens, thens, givEn) => {
-                return new givenKlasser.prototype.constructor(key, features, whens, thens, testImplementation.givens[key], givEn);
+            a[key] = (features, whens, thens) => {
+                // console.log("givEn", givEn.toString());
+                return new givenKlasser.prototype.constructor(key, features, whens, thens, testImplementation.givens[key]
+                // givEn
+                );
             };
             return a;
         }, {});
@@ -28,9 +31,9 @@ class ClassBuilder extends basebuilder_js_1.BaseBuilder {
             };
             return a;
         }, {});
-        const classyChecks = Object.entries(testImplementation.checks).reduce((a, [key, z]) => {
-            a[key] = (somestring, features, callback) => {
-                return new checkKlasser.prototype.constructor(somestring, features, callback, classyWhens, classyThens);
+        const classyChecks = Object.entries(testImplementation.checks).reduce((a, [key, chEck]) => {
+            a[key] = (name, features, checker) => {
+                return new checkKlasser.prototype.constructor(key, features, chEck, checker);
             };
             return a;
         }, {});

package/dist/common/{lib → src/lib}/core.js

@@ -8,16 +8,10 @@ class Testeranto extends classBuilder_js_1.ClassBuilder {
         const fullTestInterface = (0, index_js_1.DefaultTestInterface)(testInterface);
         super(testImplementation, testSpecification, input, class extends abstractBase_js_1.BaseSuite {
             afterAll(store, artifactory, pm) {
-                return fullTestInterface.afterAll(store, 
-                // (fPath: string, value: unknown) =>
-                //   // TODO does not work?
-                //   {
-                //     artifactory(`afterAll4-${this.name}/${fPath}`, value);
-                //   },
-                pm);
+                return fullTestInterface.afterAll(store, pm);
             }
             assertThat(t) {
-                fullTestInterface.assertThis(t);
+                return fullTestInterface.assertThis(t);
             }
             async setup(s, artifactory, tr, pm) {
                 return (fullTestInterface.beforeAll ||
@@ -31,15 +25,10 @@ class Testeranto extends classBuilder_js_1.ClassBuilder {
                 this.uberCatcher = uberCatcher;
             }
             async givenThat(subject, testResource, artifactory, initializer, initialValues, pm) {
-                return fullTestInterface.beforeEach(subject, initializer, 
-                // artifactory,
-                testResource, initialValues, pm);
+                return fullTestInterface.beforeEach(subject, initializer, testResource, initialValues, pm);
             }
             afterEach(store, key, artifactory, pm) {
-                return new Promise((res) => res(fullTestInterface.afterEach(store, key, 
-                // (fPath: string, value: unknown) =>
-                //   artifactory(`after/${fPath}`, value),
-                pm)));
+                return new Promise((res) => res(fullTestInterface.afterEach(store, key, pm)));
             }
         }, class When extends abstractBase_js_1.BaseWhen {
             async andWhen(store, whenCB, testResource, pm) {
@@ -49,20 +38,6 @@ class Testeranto extends classBuilder_js_1.ClassBuilder {
                 catch (e) {
                     throw e;
                 }
-                // return fullTestInterface
-                //   .andWhen(store, whenCB, testResource, pm)
-                //   .catch((e) => {
-                //     throw e;
-                //   });
-                // return new Promise((res, rej) => {
-                //   fullTestInterface.andWhen(store, whenCB, testResource, pm);
-                // });
-                // return await fullTestInterface.andWhen(
-                //   store,
-                //   whenCB,
-                //   testResource,
-                //   pm
-                // );
             }
         }, class Then extends abstractBase_js_1.BaseThen {
             async butThen(store, thenCB, testResource, pm) {
@@ -74,42 +49,17 @@ class Testeranto extends classBuilder_js_1.ClassBuilder {
                     console.log(" ERROR ", e);
                     throw e;
                 });
-                // try {
-                //   console.log("mark 4");
-                //   return await fullTestInterface.butThen(
-                //     store,
-                //     thenCB,
-                //     testResource,
-                //     pm
-                //   );
-                // } catch (e) {
-                //   console.log("mar123");
-                //   throw e;
-                // }
-                // return await fullTestInterface.butThen(
-                //   store,
-                //   thenCB,
-                //   testResourceConfiguration,
-                //   pm
-                // );
             }
         }, class Check extends abstractBase_js_1.BaseCheck {
-            constructor(name, features, checkCallback, whens, thens, initialValues) {
-                super(name, features, checkCallback, whens, thens);
-                this.initialValues = initialValues;
+            constructor(name, features, checkCallback, x, i, c) {
+                super(name, features, checkCallback, x, c);
+                this.initialValues = i;
             }
-            async checkThat(subject, testResourceConfiguration, artifactory, pm) {
-                return fullTestInterface.beforeEach(subject, this.initialValues, 
-                // (fPath: string, value: unknown) =>
-                //   artifactory(`before/${fPath}`, value),
-                testResourceConfiguration, this.initialValues, pm);
+            async checkThat(subject, testResourceConfiguration, artifactory, initializer, initialValues, pm) {
+                return fullTestInterface.beforeEach(subject, initializer, testResourceConfiguration, initialValues, pm);
             }
             afterEach(store, key, artifactory, pm) {
-                return new Promise((res) => res(fullTestInterface.afterEach(store, key, 
-                // (fPath: string, value: unknown) =>
-                //   // TODO does not work?
-                //   artifactory(`afterEach2-${this.name}/${fPath}`, value),
-                pm)));
+                return new Promise((res) => res(fullTestInterface.afterEach(store, key, pm)));
             }
         }, testResourceRequirement);
     }