@sprucelabs/spruce-test-fixtures 44.2.0 → 44.2.3

package/build/esm/tests/decorators/fake.js

@@ -81,13 +81,15 @@ fake.login = (phone = '555-000-0000') => {
     MercuryClientFactory.setIsTestMode(true);
     seed.disableResettingTestClient();
     return function (TestClass, shouldPassHookCalls = true) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!(TestClass.prototype instanceof AbstractSpruceFixtureTest)) {
             testLog.warn(`@fake.login() is attached to an incompatible test class (${TestClass.name}). You can safely remove it or have your test class extend AbstractSpruceFixtureTest.`);
             return;
         }
         const Class = TestClass;
         const beforeEach = (_a = Class.beforeEach) === null || _a === void 0 ? void 0 : _a.bind(Class);
+        const beforeAll = (_b = Class.beforeAll) === null || _b === void 0 ? void 0 : _b.bind(Class);
+        const afterEach = (_c = Class.afterEach) === null || _c === void 0 ? void 0 : _c.bind(Class);
         if (shouldPassHookCalls) {
             const old = MercuryFixture.beforeEach.bind(MercuryFixture);
             MercuryFixture.beforeEach = (...args) => __awaiter(this, void 0, void 0, function* () {
@@ -97,7 +99,6 @@ fake.login = (phone = '555-000-0000') => {
                 MercuryFixture.setDefaultClient(Class.fakedOwnerClient);
             });
         }
-        const beforeAll = (_b = Class.beforeAll) === null || _b === void 0 ? void 0 : _b.bind(Class);
         Class.beforeAll = () => __awaiter(this, void 0, void 0, function* () {
             yield (beforeAll === null || beforeAll === void 0 ? void 0 : beforeAll());
             resetFakes(Class);
@@ -105,6 +106,10 @@ fake.login = (phone = '555-000-0000') => {
             yield login(Class, phone);
             MercuryFixture.setDefaultClient(Class.fakedOwnerClient);
         });
+        Class.afterEach = () => __awaiter(this, void 0, void 0, function* () {
+            yield setupFakes(Class);
+            yield (afterEach === null || afterEach === void 0 ? void 0 : afterEach());
+        });
         Class.beforeEach = () => __awaiter(this, void 0, void 0, function* () {
             yield fakeAuthenticationEvents(Class);
             resetFakes(Class);
@@ -187,7 +192,7 @@ function fakeAddRole(Class) {
 }
 function addPersonAsRoleToLocationOrOrg(options) {
     const { Class, roleId, person, organizationId, locationId } = options;
-    const role = Class.fakedRoles.find((r) => r.id === roleId);
+    const role = getRoleById(Class, roleId);
     const key = roleBaseToLocalFakedProp(role.base);
     //@ts-ignore
     assert.isTruthy(Class[key], `Could not find property ${key}`);
@@ -203,6 +208,11 @@ function addPersonAsRoleToLocationOrOrg(options) {
         locationId,
     });
 }
+function getRoleById(Class, roleId) {
+    const role = Class.fakedRoles.find((r) => r.id === roleId);
+    assert.isTruthy(role, `Could not load faked role with the id of ${roleId}.`);
+    return role;
+}
 function fakeGetRole(Class) {
     return __awaiter(this, void 0, void 0, function* () {
         yield eventFaker.on('get-role::v2020_12_25', ({ target }) => {
@@ -225,7 +235,7 @@ function fakeRemoveRole(Class) {
         yield eventFaker.on('remove-role::v2020_12_25', ({ payload }) => {
             var _a;
             const { personId, roleId } = payload;
-            const role = Class.fakedRoles.find((r) => r.id === roleId);
+            const role = getRoleById(Class, roleId);
             const people = Class[roleBaseToLocalFakedProp(role.base)];
             const idx = (_a = people === null || people === void 0 ? void 0 : people.findIndex((p) => p.id === personId)) !== null && _a !== void 0 ? _a : -1;
             people === null || people === void 0 ? void 0 : people.splice(idx, 1);
@@ -237,8 +247,15 @@ function fakeRemoveRole(Class) {
 function roleBaseToLocalFakedProp(base) {
     return fakeTargetToPropName((base + 's'));
 }
-function getPersonById(Class, personId) {
-    return Class.fakedPeople.find((p) => p.id === personId);
+function getPersonById(Class, personId, shouldThrowWhenNotFound = true) {
+    const person = Class.fakedPeople.find((p) => p.id === personId);
+    if (!person && shouldThrowWhenNotFound) {
+        throw new SpruceError({
+            code: 'INVALID_TARGET',
+            friendlyMessage: `I could not find a faked person with the id ${personId} you were looking.`,
+        });
+    }
+    return person;
 }
 function fakeUpdatePerson(Class) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -266,7 +283,7 @@ function fakeListRoles(Class) {
                     ((p.organizationId && p.organizationId === organizationId) ||
                         (p.locationId && p.locationId === locationId) ||
                         (!locationId && !organizationId)))
-                    .map((pr) => Class.fakedRoles.find((r) => r.id === pr.roleId));
+                    .map((pr) => getRoleById(Class, pr.roleId));
                 roles = personRoles;
             }
             else {
@@ -532,7 +549,7 @@ function fakeWhoAmI(Class) {
             if (proxyToken) {
                 personId = (_a = Class.fakedProxyTokens.find((t) => t.token === proxyToken)) === null || _a === void 0 ? void 0 : _a.personId;
             }
-            const person = getPersonById(Class, personId);
+            const person = getPersonById(Class, personId, false);
             const skill = Class.fakedSkills.find((s) => s.id === (source === null || source === void 0 ? void 0 : source.skillId));
             return {
                 auth: {

package/build/tests/decorators/fake.js

@@ -79,13 +79,15 @@ fake.login = (phone = '555-000-0000') => {
     mercury_client_1.MercuryClientFactory.setIsTestMode(true);
     seed_1.default.disableResettingTestClient();
     return function (TestClass, shouldPassHookCalls = true) {
-        var _a, _b;
+        var _a, _b, _c;
         if (!(TestClass.prototype instanceof AbstractSpruceFixtureTest_1.default)) {
             spruce_skill_utils_1.testLog.warn(`@fake.login() is attached to an incompatible test class (${TestClass.name}). You can safely remove it or have your test class extend AbstractSpruceFixtureTest.`);
             return;
         }
         const Class = TestClass;
         const beforeEach = (_a = Class.beforeEach) === null || _a === void 0 ? void 0 : _a.bind(Class);
+        const beforeAll = (_b = Class.beforeAll) === null || _b === void 0 ? void 0 : _b.bind(Class);
+        const afterEach = (_c = Class.afterEach) === null || _c === void 0 ? void 0 : _c.bind(Class);
         if (shouldPassHookCalls) {
             const old = MercuryFixture_1.default.beforeEach.bind(MercuryFixture_1.default);
             MercuryFixture_1.default.beforeEach = async (...args) => {
@@ -95,7 +97,6 @@ fake.login = (phone = '555-000-0000') => {
                 MercuryFixture_1.default.setDefaultClient(Class.fakedOwnerClient);
             };
         }
-        const beforeAll = (_b = Class.beforeAll) === null || _b === void 0 ? void 0 : _b.bind(Class);
         Class.beforeAll = async () => {
             await (beforeAll === null || beforeAll === void 0 ? void 0 : beforeAll());
             resetFakes(Class);
@@ -103,6 +104,10 @@ fake.login = (phone = '555-000-0000') => {
             await login(Class, phone);
             MercuryFixture_1.default.setDefaultClient(Class.fakedOwnerClient);
         };
+        Class.afterEach = async () => {
+            await setupFakes(Class);
+            await (afterEach === null || afterEach === void 0 ? void 0 : afterEach());
+        };
         Class.beforeEach = async () => {
             await fakeAuthenticationEvents(Class);
             resetFakes(Class);
@@ -179,7 +184,7 @@ async function fakeAddRole(Class) {
 }
 function addPersonAsRoleToLocationOrOrg(options) {
     const { Class, roleId, person, organizationId, locationId } = options;
-    const role = Class.fakedRoles.find((r) => r.id === roleId);
+    const role = getRoleById(Class, roleId);
     const key = roleBaseToLocalFakedProp(role.base);
     //@ts-ignore
     test_1.assert.isTruthy(Class[key], `Could not find property ${key}`);
@@ -195,6 +200,11 @@ function addPersonAsRoleToLocationOrOrg(options) {
         locationId,
     });
 }
+function getRoleById(Class, roleId) {
+    const role = Class.fakedRoles.find((r) => r.id === roleId);
+    test_1.assert.isTruthy(role, `Could not load faked role with the id of ${roleId}.`);
+    return role;
+}
 async function fakeGetRole(Class) {
     await eventFaker_1.default.on('get-role::v2020_12_25', ({ target }) => {
         const { roleId } = target;
@@ -214,7 +224,7 @@ async function fakeRemoveRole(Class) {
     await eventFaker_1.default.on('remove-role::v2020_12_25', ({ payload }) => {
         var _a;
         const { personId, roleId } = payload;
-        const role = Class.fakedRoles.find((r) => r.id === roleId);
+        const role = getRoleById(Class, roleId);
         const people = Class[roleBaseToLocalFakedProp(role.base)];
         const idx = (_a = people === null || people === void 0 ? void 0 : people.findIndex((p) => p.id === personId)) !== null && _a !== void 0 ? _a : -1;
         people === null || people === void 0 ? void 0 : people.splice(idx, 1);
@@ -225,8 +235,15 @@ async function fakeRemoveRole(Class) {
 function roleBaseToLocalFakedProp(base) {
     return fakeTargetToPropName((base + 's'));
 }
-function getPersonById(Class, personId) {
-    return Class.fakedPeople.find((p) => p.id === personId);
+function getPersonById(Class, personId, shouldThrowWhenNotFound = true) {
+    const person = Class.fakedPeople.find((p) => p.id === personId);
+    if (!person && shouldThrowWhenNotFound) {
+        throw new SpruceError_1.default({
+            code: 'INVALID_TARGET',
+            friendlyMessage: `I could not find a faked person with the id ${personId} you were looking.`,
+        });
+    }
+    return person;
 }
 async function fakeUpdatePerson(Class) {
     await eventFaker_1.default.on('update-person::v2020_12_25', ({ target, source, payload }) => {
@@ -251,7 +268,7 @@ async function fakeListRoles(Class) {
                 ((p.organizationId && p.organizationId === organizationId) ||
                     (p.locationId && p.locationId === locationId) ||
                     (!locationId && !organizationId)))
-                .map((pr) => Class.fakedRoles.find((r) => r.id === pr.roleId));
+                .map((pr) => getRoleById(Class, pr.roleId));
             roles = personRoles;
         }
         else {
@@ -487,7 +504,7 @@ async function fakeWhoAmI(Class) {
         if (proxyToken) {
             personId = (_a = Class.fakedProxyTokens.find((t) => t.token === proxyToken)) === null || _a === void 0 ? void 0 : _a.personId;
         }
-        const person = getPersonById(Class, personId);
+        const person = getPersonById(Class, personId, false);
         const skill = Class.fakedSkills.find((s) => s.id === (source === null || source === void 0 ? void 0 : source.skillId));
         return {
             auth: {

package/package.json

@@ -13,7 +13,7 @@
       "@sprucelabs/spruce-test-fixtures"
     ]
   },
-  "version": "44.2.0",
+  "version": "44.2.3",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -64,14 +64,14 @@
   "dependencies": {
     "@sprucelabs/data-stores": "^17.0.51",
     "@sprucelabs/error": "^5.0.487",
-    "@sprucelabs/heartwood-view-controllers": "^86.12.2",
+    "@sprucelabs/heartwood-view-controllers": "^86.12.4",
     "@sprucelabs/mercury-client": "^31.0.82",
     "@sprucelabs/mercury-core-events": "^12.0.83",
     "@sprucelabs/mercury-event-emitter": "^31.0.82",
     "@sprucelabs/schema": "^28.3.13",
     "@sprucelabs/spruce-core-schemas": "^34.2.11",
     "@sprucelabs/spruce-event-utils": "^27.0.62",
-    "@sprucelabs/spruce-skill-booter": "^44.2.0",
+    "@sprucelabs/spruce-skill-booter": "^44.2.3",
     "@sprucelabs/spruce-skill-utils": "^26.2.9",
     "dotenv": "^16.0.1",
     "unique-names-generator": "^4.7.1"
@@ -131,5 +131,5 @@
       ]
     ]
   },
-  "gitHead": "86d5ea7cbb7aa4d00c3f4ab88b69ef4e6fcdb47f"
+  "gitHead": "5f325977fbe8f98c50559a15c3310c6612ba23e4"
 }