@sprucelabs/test-utils 5.3.2 → 5.3.4

package/build/AbstractSpruceTest.d.ts

@@ -7,11 +7,10 @@ export default class AbstractSpruceTest {
     protected static resolvePath(...filePath: string[]): string;
     protected static wait(ms?: number): Promise<unknown>;
     protected static log(...args: any[]): void;
+    protected cwd: string;
     protected wait(ms?: number): Promise<unknown>;
     protected log(...args: any[]): void;
-    protected cwd: string;
-    protected beforeAll(): Promise<void>;
-    protected afterAll(): Promise<void>;
+    protected resolvePath(...filePath: string[]): string;
     protected beforeEach(): Promise<void>;
     protected afterEach(): Promise<void>;
 }

package/build/AbstractSpruceTest.js

@@ -5,6 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 class AbstractSpruceTest {
+    constructor() {
+        //instance declariations
+        this.cwd = process.cwd();
+    }
     static async beforeAll() {
         this.cwd = process.cwd();
     }
@@ -30,21 +34,30 @@ class AbstractSpruceTest {
             setTimeout(() => resolve(true), ms);
         });
     }
-    //instance declariations
     static log(...args) {
         const str = args.map((a) => `${a}`).join(' ');
         process.stderr.write(str);
     }
     async wait(ms = 1000) {
-        return AbstractSpruceTest.wait(ms);
+        return new Promise((resolve) => {
+            setTimeout(() => resolve(true), ms);
+        });
     }
     log(...args) {
-        AbstractSpruceTest.log(...args);
+        const str = args.map((a) => `${a}`).join(' ');
+        process.stderr.write(str);
     }
-    async beforeAll() {
-        this.cwd = process.cwd();
+    resolvePath(...filePath) {
+        const cwd = this.cwd;
+        let builtPath = path_1.default.join(...filePath);
+        if (builtPath[0] !== '/') {
+            if (builtPath.substr(0, 2) === './') {
+                builtPath = builtPath.substr(1);
+            }
+            builtPath = path_1.default.join(cwd, builtPath);
+        }
+        return builtPath;
     }
-    async afterAll() { }
     async beforeEach() { }
     async afterEach() { }
 }

package/build/decorators.js

@@ -12,17 +12,20 @@ class Test {
     }
 }
 /** Hooks up before, after, etc. */
-function hookupTestClass(target) {
+function hookupTestClass(target, h) {
     if (target.__isTestingHookedUp) {
         return;
     }
-    target.__isTestingHookedUp = true;
-    const hooks = ['beforeAll', 'beforeEach', 'afterAll', 'afterEach'];
+    target.__isTestingHookedUp = !h;
+    const hooks = h ?? ['beforeAll', 'beforeEach', 'afterAll', 'afterEach'];
     hooks.forEach((hook) => {
         // Have they defined a hook
         if (!target[hook]) {
             return;
         }
+        if (Test.ActiveTestClass && !h && hook === 'beforeAll') {
+            throw new Error(`beforeAll() and afterAll() must be static`);
+        }
         // @ts-ignore
         if (global[hook]) {
             // @ts-ignore
@@ -54,7 +57,7 @@ function suite() {
     return function (Target) {
         Test.ActiveTestClass = Target;
         // Test.activeTest.__isTestingHookedUp = false
-        // hookupTestClass(Test.activeTest)
+        hookupTestClass(Target, ['beforeAll', 'afterAll']);
     };
 }
 /** Only decorator */

package/build/esm/AbstractSpruceTest.d.ts

@@ -7,11 +7,10 @@ export default class AbstractSpruceTest {
     protected static resolvePath(...filePath: string[]): string;
     protected static wait(ms?: number): Promise<unknown>;
     protected static log(...args: any[]): void;
+    protected cwd: string;
     protected wait(ms?: number): Promise<unknown>;
     protected log(...args: any[]): void;
-    protected cwd: string;
-    protected beforeAll(): Promise<void>;
-    protected afterAll(): Promise<void>;
+    protected resolvePath(...filePath: string[]): string;
     protected beforeEach(): Promise<void>;
     protected afterEach(): Promise<void>;
 }

package/build/esm/AbstractSpruceTest.js

@@ -1,5 +1,9 @@
 import path from 'path';
 export default class AbstractSpruceTest {
+    constructor() {
+        //instance declariations
+        this.cwd = process.cwd();
+    }
     static async beforeAll() {
         this.cwd = process.cwd();
     }
@@ -25,21 +29,30 @@ export default class AbstractSpruceTest {
             setTimeout(() => resolve(true), ms);
         });
     }
-    //instance declariations
     static log(...args) {
         const str = args.map((a) => `${a}`).join(' ');
         process.stderr.write(str);
     }
     async wait(ms = 1000) {
-        return AbstractSpruceTest.wait(ms);
+        return new Promise((resolve) => {
+            setTimeout(() => resolve(true), ms);
+        });
     }
     log(...args) {
-        AbstractSpruceTest.log(...args);
+        const str = args.map((a) => `${a}`).join(' ');
+        process.stderr.write(str);
     }
-    async beforeAll() {
-        this.cwd = process.cwd();
+    resolvePath(...filePath) {
+        const cwd = this.cwd;
+        let builtPath = path.join(...filePath);
+        if (builtPath[0] !== '/') {
+            if (builtPath.substr(0, 2) === './') {
+                builtPath = builtPath.substr(1);
+            }
+            builtPath = path.join(cwd, builtPath);
+        }
+        return builtPath;
     }
-    async afterAll() { }
     async beforeEach() { }
     async afterEach() { }
 }

package/build/esm/decorators.js

@@ -8,17 +8,20 @@ class Test {
     }
 }
 /** Hooks up before, after, etc. */
-function hookupTestClass(target) {
+function hookupTestClass(target, h) {
     if (target.__isTestingHookedUp) {
         return;
     }
-    target.__isTestingHookedUp = true;
-    const hooks = ['beforeAll', 'beforeEach', 'afterAll', 'afterEach'];
+    target.__isTestingHookedUp = !h;
+    const hooks = h !== null && h !== void 0 ? h : ['beforeAll', 'beforeEach', 'afterAll', 'afterEach'];
     hooks.forEach((hook) => {
         // Have they defined a hook
         if (!target[hook]) {
             return;
         }
+        if (Test.ActiveTestClass && !h && hook === 'beforeAll') {
+            throw new Error(`beforeAll() and afterAll() must be static`);
+        }
         // @ts-ignore
         if (global[hook]) {
             // @ts-ignore
@@ -50,7 +53,7 @@ export function suite() {
     return function (Target) {
         Test.ActiveTestClass = Target;
         // Test.activeTest.__isTestingHookedUp = false
-        // hookupTestClass(Test.activeTest)
+        hookupTestClass(Target, ['beforeAll', 'afterAll']);
     };
 }
 /** Only decorator */

package/package.json

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