@sprucelabs/spruce-test-fixtures 44.2.14 → 44.2.17

package/build/ClientProxyDecorator.js

@@ -22,7 +22,7 @@ class ClientProxyDecorator {
         delete this.instance;
     }
     decorateEmitToPassProxyToken(client, token) {
-        const newClient = Object.assign(Object.assign({}, client), { 
+        const newClient = Object.assign(Object.assign({}, client), { proxyToken: token, 
             //@ts-ignore
             emit: async (eventName, targetAndPayload, cb) => {
                 let builtTp = await this.mixinProxyToken(token, targetAndPayload);
@@ -34,6 +34,7 @@ class ClientProxyDecorator {
                 return client.emitAndFlattenResponses(eventName, builtTp, cb);
             } });
         spruce_skill_utils_1.functionDelegationUtil.delegateFunctionCalls(newClient, client);
+        newClient.getProxyToken = () => token;
         return newClient;
     }
     async mixinProxyToken(token, targetAndPayload) {

package/build/esm/ClientProxyDecorator.js

@@ -29,7 +29,7 @@ export default class ClientProxyDecorator {
         delete this.instance;
     }
     decorateEmitToPassProxyToken(client, token) {
-        const newClient = Object.assign(Object.assign({}, client), { 
+        const newClient = Object.assign(Object.assign({}, client), { proxyToken: token, 
             //@ts-ignore
             emit: (eventName, targetAndPayload, cb) => __awaiter(this, void 0, void 0, function* () {
                 let builtTp = yield this.mixinProxyToken(token, targetAndPayload);
@@ -41,6 +41,7 @@ export default class ClientProxyDecorator {
                 return client.emitAndFlattenResponses(eventName, builtTp, cb);
             }) });
         functionDelegationUtil.delegateFunctionCalls(newClient, client);
+        newClient.getProxyToken = () => token;
         return newClient;
     }
     mixinProxyToken(token, targetAndPayload) {

package/build/esm/tests/AbstractSpruceFixtureTest.d.ts

@@ -16,7 +16,7 @@ declare type Role = SpruceSchemas.Spruce.v2020_07_22.Role;
 declare type Skill = SpruceSchemas.Spruce.v2020_07_22.Skill;
 declare type Organization = SpruceSchemas.Spruce.v2020_07_22.Organization;
 export default abstract class AbstractSpruceFixtureTest extends AbstractSkillTest {
-    static fakedOwner: Person;
+    static fakedPerson: Person;
     static fakedPeople: Person[];
     static fakedTeammates: Person[];
     static fakedOwners: Person[];

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

@@ -39,7 +39,8 @@ const strategies = {
     groupManagers: buildSeeder('groupManagers'),
     owners: buildSeeder('owners'),
 };
-function resetFakes(Class) {
+function resetFakedRecords(Class) {
+    var _a, _b, _c;
     if (shouldSkipNextReset) {
         shouldSkipNextReset = false;
         return;
@@ -54,10 +55,12 @@ function resetFakes(Class) {
     Class.fakedGroupManagers = [];
     Class.fakedGuests = [];
     Class.fakedRoles = [];
-    Class.fakedPeople = [];
+    Class.fakedPeople = ((_a = Class.fakedPeople) === null || _a === void 0 ? void 0 : _a[0]) ? [Class.fakedPeople[0]] : [];
     Class.fakedSkills = [];
-    Class.fakedTokens = [];
-    Class.fakedProxyTokens = [];
+    Class.fakedTokens = ((_b = Class.fakedTokens) === null || _b === void 0 ? void 0 : _b[0]) ? [Class.fakedTokens[0]] : [];
+    Class.fakedProxyTokens = ((_c = Class.fakedProxyTokens) === null || _c === void 0 ? void 0 : _c[0])
+        ? [Class.fakedProxyTokens[0]]
+        : [];
 }
 export default function fake(target, total) {
     assertOptions({ target, total }, ['target', 'total']);
@@ -66,7 +69,7 @@ export default function fake(target, total) {
         const Class = TestClass;
         const bound = (_b = (_a = descriptor === null || descriptor === void 0 ? void 0 : descriptor.value) === null || _a === void 0 ? void 0 : _a.bind) === null || _b === void 0 ? void 0 : _b.call(_a, Class);
         descriptor.value = (...args) => __awaiter(this, void 0, void 0, function* () {
-            assert.isTruthy(Class.fakedOwner, `You gotta @faker.login(...) before you can create fake '${target}'!`);
+            assert.isTruthy(Class.fakedPerson, `You gotta @faker.login(...) before you can create fake '${target}'!`);
             const strategy = strategies[target];
             assert.isTruthy(strategy, `Faking ${target} is not ready yet!`);
             yield (strategy === null || strategy === void 0 ? void 0 : strategy(Class, total));
@@ -77,6 +80,7 @@ export default function fake(target, total) {
 fake.login = (phone = '555-000-0000') => {
     assert.isTruthy(phone, `You need to pass a phone to 'faker.login(...)'`);
     assert.isTrue(isValidNumber(phone), `'${phone}' is not a valid phone. Try something like: 555-000-0000`);
+    MercuryFixture.setShouldAutomaticallyClearDefaultClient(false);
     MercuryTestClient.setShouldRequireLocalListeners(true);
     MercuryClientFactory.setIsTestMode(true);
     seed.disableResettingTestClient();
@@ -95,28 +99,26 @@ fake.login = (phone = '555-000-0000') => {
             MercuryFixture.beforeEach = (...args) => __awaiter(this, void 0, void 0, function* () {
                 //@ts-ignore
                 yield old(...args);
-                yield setupFakes(Class);
-                MercuryFixture.setDefaultClient(Class.fakedOwnerClient);
+                yield setupFakeListeners(Class);
             });
         }
         Class.beforeAll = () => __awaiter(this, void 0, void 0, function* () {
             yield (beforeAll === null || beforeAll === void 0 ? void 0 : beforeAll());
-            resetFakes(Class);
-            yield setupFakes(Class);
+            resetFakedRecords(Class);
+            yield setupFakeListeners(Class);
             yield login(Class, phone);
-            MercuryFixture.setDefaultClient(Class.fakedOwnerClient);
+            MercuryFixture.setDefaultClient(Class.fakedClient);
         });
         Class.afterEach = () => __awaiter(this, void 0, void 0, function* () {
-            yield setupFakes(Class);
+            yield setupFakeListeners(Class);
             yield (afterEach === null || afterEach === void 0 ? void 0 : afterEach());
         });
         Class.beforeEach = () => __awaiter(this, void 0, void 0, function* () {
-            yield fakeAuthenticationEvents(Class);
-            resetFakes(Class);
+            resetFakedRecords(Class);
+            yield setupFakeListeners(Class);
             if (!TestClass.cwd) {
                 return;
             }
-            yield login(Class, phone);
             shouldPassHookCalls && (yield (beforeEach === null || beforeEach === void 0 ? void 0 : beforeEach()));
         });
     };
@@ -129,6 +131,18 @@ fake.getPerson = () => {
     return fake.getClient().auth.person;
 };
 function login(Class, phone) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { person, client } = yield loginUsingViewsFallingBackToPeople(Class, phone);
+        if (!person.firstName) {
+            givePersonName(person);
+        }
+        //@ts-ignore
+        client.auth.person = person;
+        Class.fakedClient = client;
+        Class.fakedPerson = person;
+    });
+}
+function loginUsingViewsFallingBackToPeople(Class, phone) {
     return __awaiter(this, void 0, void 0, function* () {
         let person;
         let client;
@@ -142,13 +156,8 @@ function login(Class, phone) {
             person = p;
             client = c;
         }
-        if (!person.firstName) {
-            givePersonName(person);
-        }
-        Class.fakedPeople = [person];
-        Class.fakedOwners = [person];
-        Class.fakedOwner = person;
-        Class.fakedOwnerClient = client;
+        yield client.registerProxyToken();
+        return { person: Class.fakedPeople.find((p) => p.id === person.id), client };
     });
 }
 function givePersonName(person) {
@@ -157,7 +166,7 @@ function givePersonName(person) {
     person.firstName = names.firstName;
     person.lastName = names.lastName;
 }
-function setupFakes(Class) {
+function setupFakeListeners(Class) {
     return __awaiter(this, void 0, void 0, function* () {
         yield Promise.all([
             fakeSkillLifecycleEvents(Class),
@@ -389,7 +398,7 @@ function fakeCreateLocation(Class) {
                 addPersonAsRoleToLocationOrOrg({
                     Class,
                     roleId: role.id,
-                    person: Class.fakedOwner,
+                    person: Class.fakedPerson,
                     locationId: location.id,
                 });
             }
@@ -410,7 +419,7 @@ function fakeCreateOrganization(Class) {
                 Class,
                 organizationId: organization.id,
                 roleId: roles.find((r) => r.base === 'owner').id,
-                person: Class.fakedOwner,
+                person: Class.fakedPerson,
             });
             return {
                 organization,
@@ -441,7 +450,7 @@ function fakeSkillLifecycleEvents(Class) {
         process.env.SKILL_API_KEY = process.env.SKILL_API_KEY || generateId();
         yield eventFaker.on('register-skill::v2020_12_25', ({ payload }) => {
             var _a;
-            const skill = Object.assign(Object.assign({ apiKey: generateId(), creators: [{ personId: Class.fakedOwner.id }], dateCreated: new Date().getTime(), id: generateId() }, payload), { slug: (_a = payload.slug) !== null && _a !== void 0 ? _a : generateId() });
+            const skill = Object.assign(Object.assign({ apiKey: generateId(), creators: [{ personId: Class.fakedPerson.id }], dateCreated: new Date().getTime(), id: generateId() }, payload), { slug: (_a = payload.slug) !== null && _a !== void 0 ? _a : generateId() });
             Class.fakedSkills.unshift(skill);
             return {
                 skill,
@@ -593,8 +602,8 @@ function fakeAuthenticationEvents(Class) {
             let person = Class.fakedPeople.find((p) => p.phone === formattedPhone);
             if (!person) {
                 person =
-                    ((_a = Class.fakedOwner) === null || _a === void 0 ? void 0 : _a.phone) === formattedPhone
-                        ? Class.fakedOwner
+                    ((_a = Class.fakedPerson) === null || _a === void 0 ? void 0 : _a.phone) === formattedPhone
+                        ? Class.fakedPerson
                         : {
                             id: generateId(),
                             casualName: 'friend',
@@ -659,7 +668,7 @@ function fakeAuthenticationEvents(Class) {
             }
             const person = getPersonById(Class, match.personId);
             return {
-                type: 'anonymous',
+                type: 'authenticated',
                 auth: {
                     person,
                 },

package/build/esm/tests/fixtures/PersonFixture.js

@@ -53,7 +53,7 @@ export default class PersonFixture {
         var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.lastLoggedIn &&
-                (!phone || phone === this.lastLoggedIn.person.phone)) {
+                (!phone || formatPhoneNumber(phone) === this.lastLoggedIn.person.phone)) {
                 return this.lastLoggedIn;
             }
             const client = (yield this.connectToApi({

package/build/esm/tests/fixtures/ViewFixture.d.ts

@@ -49,7 +49,7 @@ export default class ViewFixture {
     static beforeAll(): Promise<void>;
     static beforeEach(): Promise<void>;
     private static resetMaps;
-    private static resetAuth;
+    static resetAuth(): void;
     load<Svc extends SkillViewController = SkillViewController>(vc: Pick<Svc, 'load' | 'getScope'>, args?: ArgsFromSvc<Svc>): Promise<void>;
     private assertScopeRequirementsMet;
     setScope(scope: Scope): void;

package/build/tests/AbstractSpruceFixtureTest.d.ts

@@ -16,7 +16,7 @@ declare type Role = SpruceSchemas.Spruce.v2020_07_22.Role;
 declare type Skill = SpruceSchemas.Spruce.v2020_07_22.Skill;
 declare type Organization = SpruceSchemas.Spruce.v2020_07_22.Organization;
 export default abstract class AbstractSpruceFixtureTest extends AbstractSkillTest {
-    static fakedOwner: Person;
+    static fakedPerson: Person;
     static fakedPeople: Person[];
     static fakedTeammates: Person[];
     static fakedOwners: Person[];

package/build/tests/decorators/fake.js

@@ -36,7 +36,8 @@ const strategies = {
     groupManagers: buildSeeder('groupManagers'),
     owners: buildSeeder('owners'),
 };
-function resetFakes(Class) {
+function resetFakedRecords(Class) {
+    var _a, _b, _c;
     if (shouldSkipNextReset) {
         shouldSkipNextReset = false;
         return;
@@ -51,10 +52,12 @@ function resetFakes(Class) {
     Class.fakedGroupManagers = [];
     Class.fakedGuests = [];
     Class.fakedRoles = [];
-    Class.fakedPeople = [];
+    Class.fakedPeople = ((_a = Class.fakedPeople) === null || _a === void 0 ? void 0 : _a[0]) ? [Class.fakedPeople[0]] : [];
     Class.fakedSkills = [];
-    Class.fakedTokens = [];
-    Class.fakedProxyTokens = [];
+    Class.fakedTokens = ((_b = Class.fakedTokens) === null || _b === void 0 ? void 0 : _b[0]) ? [Class.fakedTokens[0]] : [];
+    Class.fakedProxyTokens = ((_c = Class.fakedProxyTokens) === null || _c === void 0 ? void 0 : _c[0])
+        ? [Class.fakedProxyTokens[0]]
+        : [];
 }
 function fake(target, total) {
     (0, schema_1.assertOptions)({ target, total }, ['target', 'total']);
@@ -63,7 +66,7 @@ function fake(target, total) {
         const Class = TestClass;
         const bound = (_b = (_a = descriptor === null || descriptor === void 0 ? void 0 : descriptor.value) === null || _a === void 0 ? void 0 : _a.bind) === null || _b === void 0 ? void 0 : _b.call(_a, Class);
         descriptor.value = async (...args) => {
-            test_1.assert.isTruthy(Class.fakedOwner, `You gotta @faker.login(...) before you can create fake '${target}'!`);
+            test_1.assert.isTruthy(Class.fakedPerson, `You gotta @faker.login(...) before you can create fake '${target}'!`);
             const strategy = strategies[target];
             test_1.assert.isTruthy(strategy, `Faking ${target} is not ready yet!`);
             await (strategy === null || strategy === void 0 ? void 0 : strategy(Class, total));
@@ -75,6 +78,7 @@ exports.default = fake;
 fake.login = (phone = '555-000-0000') => {
     test_1.assert.isTruthy(phone, `You need to pass a phone to 'faker.login(...)'`);
     test_1.assert.isTrue((0, schema_1.isValidNumber)(phone), `'${phone}' is not a valid phone. Try something like: 555-000-0000`);
+    MercuryFixture_1.default.setShouldAutomaticallyClearDefaultClient(false);
     mercury_client_1.MercuryTestClient.setShouldRequireLocalListeners(true);
     mercury_client_1.MercuryClientFactory.setIsTestMode(true);
     seed_1.default.disableResettingTestClient();
@@ -93,28 +97,26 @@ fake.login = (phone = '555-000-0000') => {
             MercuryFixture_1.default.beforeEach = async (...args) => {
                 //@ts-ignore
                 await old(...args);
-                await setupFakes(Class);
-                MercuryFixture_1.default.setDefaultClient(Class.fakedOwnerClient);
+                await setupFakeListeners(Class);
             };
         }
         Class.beforeAll = async () => {
             await (beforeAll === null || beforeAll === void 0 ? void 0 : beforeAll());
-            resetFakes(Class);
-            await setupFakes(Class);
+            resetFakedRecords(Class);
+            await setupFakeListeners(Class);
             await login(Class, phone);
-            MercuryFixture_1.default.setDefaultClient(Class.fakedOwnerClient);
+            MercuryFixture_1.default.setDefaultClient(Class.fakedClient);
         };
         Class.afterEach = async () => {
-            await setupFakes(Class);
+            await setupFakeListeners(Class);
             await (afterEach === null || afterEach === void 0 ? void 0 : afterEach());
         };
         Class.beforeEach = async () => {
-            await fakeAuthenticationEvents(Class);
-            resetFakes(Class);
+            resetFakedRecords(Class);
+            await setupFakeListeners(Class);
             if (!TestClass.cwd) {
                 return;
             }
-            await login(Class, phone);
             shouldPassHookCalls && (await (beforeEach === null || beforeEach === void 0 ? void 0 : beforeEach()));
         };
     };
@@ -127,6 +129,16 @@ fake.getPerson = () => {
     return fake.getClient().auth.person;
 };
 async function login(Class, phone) {
+    const { person, client } = await loginUsingViewsFallingBackToPeople(Class, phone);
+    if (!person.firstName) {
+        givePersonName(person);
+    }
+    //@ts-ignore
+    client.auth.person = person;
+    Class.fakedClient = client;
+    Class.fakedPerson = person;
+}
+async function loginUsingViewsFallingBackToPeople(Class, phone) {
     let person;
     let client;
     try {
@@ -139,13 +151,8 @@ async function login(Class, phone) {
         person = p;
         client = c;
     }
-    if (!person.firstName) {
-        givePersonName(person);
-    }
-    Class.fakedPeople = [person];
-    Class.fakedOwners = [person];
-    Class.fakedOwner = person;
-    Class.fakedOwnerClient = client;
+    await client.registerProxyToken();
+    return { person: Class.fakedPeople.find((p) => p.id === person.id), client };
 }
 function givePersonName(person) {
     const names = (0, generateRandomName_1.default)();
@@ -153,7 +160,7 @@ function givePersonName(person) {
     person.firstName = names.firstName;
     person.lastName = names.lastName;
 }
-async function setupFakes(Class) {
+async function setupFakeListeners(Class) {
     await Promise.all([
         fakeSkillLifecycleEvents(Class),
         fakeGetPerson(Class),
@@ -364,7 +371,7 @@ async function fakeCreateLocation(Class) {
             addPersonAsRoleToLocationOrOrg({
                 Class,
                 roleId: role.id,
-                person: Class.fakedOwner,
+                person: Class.fakedPerson,
                 locationId: location.id,
             });
         }
@@ -383,7 +390,7 @@ async function fakeCreateOrganization(Class) {
             Class,
             organizationId: organization.id,
             roleId: roles.find((r) => r.base === 'owner').id,
-            person: Class.fakedOwner,
+            person: Class.fakedPerson,
         });
         return {
             organization,
@@ -410,7 +417,7 @@ async function fakeSkillLifecycleEvents(Class) {
     process.env.SKILL_API_KEY = process.env.SKILL_API_KEY || (0, test_utils_1.generateId)();
     await eventFaker_1.default.on('register-skill::v2020_12_25', ({ payload }) => {
         var _a;
-        const skill = Object.assign(Object.assign({ apiKey: (0, test_utils_1.generateId)(), creators: [{ personId: Class.fakedOwner.id }], dateCreated: new Date().getTime(), id: (0, test_utils_1.generateId)() }, payload), { slug: (_a = payload.slug) !== null && _a !== void 0 ? _a : (0, test_utils_1.generateId)() });
+        const skill = Object.assign(Object.assign({ apiKey: (0, test_utils_1.generateId)(), creators: [{ personId: Class.fakedPerson.id }], dateCreated: new Date().getTime(), id: (0, test_utils_1.generateId)() }, payload), { slug: (_a = payload.slug) !== null && _a !== void 0 ? _a : (0, test_utils_1.generateId)() });
         Class.fakedSkills.unshift(skill);
         return {
             skill,
@@ -544,8 +551,8 @@ async function fakeAuthenticationEvents(Class) {
         let person = Class.fakedPeople.find((p) => p.phone === formattedPhone);
         if (!person) {
             person =
-                ((_a = Class.fakedOwner) === null || _a === void 0 ? void 0 : _a.phone) === formattedPhone
-                    ? Class.fakedOwner
+                ((_a = Class.fakedPerson) === null || _a === void 0 ? void 0 : _a.phone) === formattedPhone
+                    ? Class.fakedPerson
                     : {
                         id: (0, test_utils_1.generateId)(),
                         casualName: 'friend',
@@ -610,7 +617,7 @@ async function fakeAuthenticationEvents(Class) {
         }
         const person = getPersonById(Class, match.personId);
         return {
-            type: 'anonymous',
+            type: 'authenticated',
             auth: {
                 person,
             },

package/build/tests/fixtures/PersonFixture.js

@@ -44,7 +44,7 @@ class PersonFixture {
     async loginAsDemoPerson(phone) {
         var _a, _b, _c;
         if (this.lastLoggedIn &&
-            (!phone || phone === this.lastLoggedIn.person.phone)) {
+            (!phone || (0, schema_1.formatPhoneNumber)(phone) === this.lastLoggedIn.person.phone)) {
             return this.lastLoggedIn;
         }
         const client = (await this.connectToApi({

package/build/tests/fixtures/ViewFixture.d.ts

@@ -49,7 +49,7 @@ export default class ViewFixture {
     static beforeAll(): Promise<void>;
     static beforeEach(): Promise<void>;
     private static resetMaps;
-    private static resetAuth;
+    static resetAuth(): void;
     load<Svc extends SkillViewController = SkillViewController>(vc: Pick<Svc, 'load' | 'getScope'>, args?: ArgsFromSvc<Svc>): Promise<void>;
     private assertScopeRequirementsMet;
     setScope(scope: Scope): void;

package/package.json

@@ -13,7 +13,7 @@
       "@sprucelabs/spruce-test-fixtures"
     ]
   },
-  "version": "44.2.14",
+  "version": "44.2.17",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -62,17 +62,17 @@
     "lint.tsc": "tsc -p . --noEmit"
   },
   "dependencies": {
-    "@sprucelabs/data-stores": "^17.0.59",
+    "@sprucelabs/data-stores": "^17.0.60",
     "@sprucelabs/error": "^5.0.487",
-    "@sprucelabs/heartwood-view-controllers": "^86.13.19",
-    "@sprucelabs/mercury-client": "^31.0.97",
-    "@sprucelabs/mercury-core-events": "^12.0.97",
-    "@sprucelabs/mercury-event-emitter": "^31.0.97",
+    "@sprucelabs/heartwood-view-controllers": "^86.13.21",
+    "@sprucelabs/mercury-client": "^31.0.98",
+    "@sprucelabs/mercury-core-events": "^12.0.98",
+    "@sprucelabs/mercury-event-emitter": "^31.0.98",
     "@sprucelabs/schema": "^28.3.16",
     "@sprucelabs/spruce-core-schemas": "^34.2.17",
-    "@sprucelabs/spruce-event-utils": "^27.0.72",
-    "@sprucelabs/spruce-skill-booter": "^44.2.14",
-    "@sprucelabs/spruce-skill-utils": "^26.3.7",
+    "@sprucelabs/spruce-event-utils": "^27.0.73",
+    "@sprucelabs/spruce-skill-booter": "^44.2.17",
+    "@sprucelabs/spruce-skill-utils": "^26.3.8",
     "dotenv": "^16.0.1",
     "unique-names-generator": "^4.7.1"
   },
@@ -131,5 +131,5 @@
       ]
     ]
   },
-  "gitHead": "8989101e1e2144b87c8a9a3f781bd3a60805a9ce"
+  "gitHead": "569af5fbbd75d312e13bff69ce0b88cab25a0d91"
 }