@sprucelabs/test-utils 5.4.2 → 5.4.3

package/README.md

@@ -17,4 +17,4 @@ Spruce XP Documentation
 <br />
 <p align="center">
 <a href="https://developer.spruce.ai/#/"><img width="250" src="https://raw.githubusercontent.com/sprucelabsai/spruce-test-utils/master/docs/images/read-full-docs.png" /></a>
-</p>
+</p>

package/build/decorators.js

@@ -21,6 +21,16 @@ class SpruceTestResolver {
     }
 }
 exports.SpruceTestResolver = SpruceTestResolver;
+//recursive function to get static method by name looping up through constructor chain
+function resolveMethod(Target, name) {
+    if (Target[name]) {
+        return Target[name];
+    }
+    if (Target.constructor && Target.constructor !== Target) {
+        return resolveMethod(Target.constructor, name);
+    }
+    return null;
+}
 /** Hooks up before, after, etc. */
 function hookupTestClassToJestLifecycle(Target, h) {
     if (Target.__isTestingHookedUp) {
@@ -29,10 +39,9 @@ function hookupTestClassToJestLifecycle(Target, h) {
     Target.__isTestingHookedUp = !h;
     const hooks = h ?? ['beforeAll', 'beforeEach', 'afterAll', 'afterEach'];
     hooks.forEach((hook) => {
-        const cb = Target[hook] ?? Target?.constructor?.[hook];
+        const cb = resolveMethod(Target, hook);
         // Have they defined a hook
         if (!cb) {
-            debugger;
             return;
         }
         // @ts-ignore
@@ -48,7 +57,12 @@ function hookupTestClassToJestLifecycle(Target, h) {
                     delete SpruceTestResolver.__activeTest;
                 }
                 else {
-                    await cb.apply(Target);
+                    if (SpruceTestResolver.ActiveTestClass) {
+                        await cb.apply(Target.constructor);
+                    }
+                    else {
+                        await cb.apply(Target);
+                    }
                 }
             });
         }

package/build/esm/decorators.js

@@ -15,6 +15,16 @@ export class SpruceTestResolver {
         return this.__activeTest;
     }
 }
+//recursive function to get static method by name looping up through constructor chain
+function resolveMethod(Target, name) {
+    if (Target[name]) {
+        return Target[name];
+    }
+    if (Target.constructor && Target.constructor !== Target) {
+        return resolveMethod(Target.constructor, name);
+    }
+    return null;
+}
 /** Hooks up before, after, etc. */
 function hookupTestClassToJestLifecycle(Target, h) {
     if (Target.__isTestingHookedUp) {
@@ -23,11 +33,9 @@ function hookupTestClassToJestLifecycle(Target, h) {
     Target.__isTestingHookedUp = !h;
     const hooks = h !== null && h !== void 0 ? h : ['beforeAll', 'beforeEach', 'afterAll', 'afterEach'];
     hooks.forEach((hook) => {
-        var _a, _b;
-        const cb = (_a = Target[hook]) !== null && _a !== void 0 ? _a : (_b = Target === null || Target === void 0 ? void 0 : Target.constructor) === null || _b === void 0 ? void 0 : _b[hook];
+        const cb = resolveMethod(Target, hook);
         // Have they defined a hook
         if (!cb) {
-            debugger;
             return;
         }
         // @ts-ignore
@@ -43,7 +51,12 @@ function hookupTestClassToJestLifecycle(Target, h) {
                     delete SpruceTestResolver.__activeTest;
                 }
                 else {
-                    await cb.apply(Target);
+                    if (SpruceTestResolver.ActiveTestClass) {
+                        await cb.apply(Target.constructor);
+                    }
+                    else {
+                        await cb.apply(Target);
+                    }
                 }
             });
         }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "5.4.2",
+  "version": "5.4.3",
   "files": [
     "build"
   ],