@sprucelabs/spruce-test-fixtures 66.0.20 → 66.0.22

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

@@ -25,7 +25,7 @@ class LocationFixture {
     constructor(options) {
         this.locationCounter = 0;
         this.people = options.people;
-        this.orgs = options.organizations;
+        this.organizations = options.organizations;
         this.roles = options.roles;
     }
     seedDemoLocation(values) {
@@ -34,12 +34,12 @@ class LocationFixture {
             const { client } = yield this.people.loginAsDemoPerson((_a = values === null || values === void 0 ? void 0 : values.phone) !== null && _a !== void 0 ? _a : undefined);
             let _d = values !== null && values !== void 0 ? values : {}, { organizationId: orgId } = _d, rest = __rest(_d, ["organizationId"]);
             if (!orgId) {
-                const last = yield this.orgs.getNewestOrganization((_b = values === null || values === void 0 ? void 0 : values.phone) !== null && _b !== void 0 ? _b : undefined);
+                const last = yield this.organizations.getNewestOrganization((_b = values === null || values === void 0 ? void 0 : values.phone) !== null && _b !== void 0 ? _b : undefined);
                 if (last) {
                     orgId = last.id;
                 }
                 else {
-                    const org = yield this.orgs.seedDemoOrganization({
+                    const org = yield this.organizations.seedDemoOrganization({
                         name: 'Org to support seed location',
                         phone: (_c = values === null || values === void 0 ? void 0 : values.phone) !== null && _c !== void 0 ? _c : undefined,
                     });
@@ -83,7 +83,7 @@ class LocationFixture {
             var _a;
             const { client } = yield this.people.loginAsDemoPerson();
             if (!organizationId) {
-                const org = yield this.orgs.getNewestOrganization();
+                const org = yield this.organizations.getNewestOrganization();
                 assert.isTruthy(org, `You gotta @seed('locations', 1) before you can get the newest location.`);
                 organizationId = org.id;
             }
@@ -105,7 +105,7 @@ class LocationFixture {
         return __awaiter(this, void 0, void 0, function* () {
             const { client } = yield this.people.loginAsDemoPerson();
             if (!organizationId) {
-                const org = yield this.orgs.getNewestOrganization();
+                const org = yield this.organizations.getNewestOrganization();
                 if (!org) {
                     throw new Error(`You have to @seed('organizations',1) before you can list locations.`);
                 }

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

@@ -10,18 +10,23 @@ export default class MercuryFixture {
     private static defaultClient?;
     private static shouldAutomaticallyClearDefaultClient;
     private static shouldRequireLocalListeners;
+    private static contractsByCwd;
+    private static namespacesByCwd;
     static setDefaultClient(client: MercuryClient): void;
     static clearDefaultClient(): void;
     static getDefaultClient(): MercuryClient | undefined;
     static setShouldAutomaticallyClearDefaultClient(shouldClear: boolean): void;
     constructor(cwd: string);
     connectToApi(options?: TestConnectionOptions): Promise<MercuryClient>;
+    static clearContractCache(): void;
     static setDefaultContractToLocalEventsIfExist(cwd: string): void;
+    private static loadEventContract;
     private static setDefaultContract;
     getConnectFactory(): TestConnectFactory;
     destroy(): Promise<void>;
     static beforeAll(): void;
     static beforeEach(cwd: string): Promise<void>;
+    private static getCurrentSkillsNamespace;
     static setShouldRequireLocalListeners(shouldRequireLocal: boolean): void;
     static setShouldMixinCoreEventContractsWhenImportingLocal(shouldMixin: boolean): void;
     static setShouldAutoImportContracts(shouldImport: boolean): void;

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

@@ -71,34 +71,50 @@ class MercuryFixture {
             return promise;
         });
     }
+    static clearContractCache() {
+        this.contractsByCwd = {};
+    }
     static setDefaultContractToLocalEventsIfExist(cwd) {
+        if (cwd in this.contractsByCwd) {
+            MercuryFixture.setDefaultContract(this.contractsByCwd[cwd]);
+            return;
+        }
+        let contract;
+        const shouldImport = MercuryFixture.shouldAutoImportContracts &&
+            diskUtil.doesBuiltHashSprucePathExist(cwd);
+        if (shouldImport) {
+            contract = this.loadEventContract(cwd);
+        }
+        else {
+            contract = coreEventContracts[0];
+        }
+        this.contractsByCwd[cwd] = contract;
+        if (contract) {
+            MercuryFixture.setDefaultContract(contract);
+        }
+    }
+    static loadEventContract(cwd) {
         var _a;
-        if (MercuryFixture.shouldAutoImportContracts &&
-            diskUtil.doesBuiltHashSprucePathExist(cwd)) {
-            try {
-                const combinedContract = eventDiskUtil.resolveCombinedEventsContractFile(cwd);
-                let contracts = require(combinedContract).default;
-                if (MercuryFixture.shouldMixinCoreEventContractWhenImportingLocal) {
-                    contracts = [...contracts, ...coreEventContracts];
-                }
-                const combined = eventContractUtil.unifyContracts(contracts);
-                if (combined) {
-                    MercuryFixture.setDefaultContract(combined);
-                }
+        let contract;
+        try {
+            const combinedContract = eventDiskUtil.resolveCombinedEventsContractFile(cwd);
+            let contracts = require(combinedContract).default;
+            if (this.shouldMixinCoreEventContractWhenImportingLocal) {
+                contracts = [...contracts, ...coreEventContracts];
             }
-            catch (err) {
-                //since we default to the
-                if (((_a = err.options) === null || _a === void 0 ? void 0 : _a.code) === 'EVENT_CONTRACTS_NOT_SYNCED') {
-                    MercuryFixture.setDefaultContract(coreEventContracts[0]);
-                    return;
-                }
+            contract = eventContractUtil.unifyContracts(contracts);
+        }
+        catch (err) {
+            //since we default to the
+            if (((_a = err.options) === null || _a === void 0 ? void 0 : _a.code) === 'EVENT_CONTRACTS_NOT_SYNCED') {
+                contract = coreEventContracts[0];
+            }
+            else {
                 throw new Error('Mixing in local event contracts failed. Original error:\n\n' +
                     err.stack);
             }
         }
-        else {
-            MercuryFixture.setDefaultContract(coreEventContracts[0]);
-        }
+        return contract;
     }
     static setDefaultContract(contract) {
         var _a;
@@ -129,7 +145,6 @@ class MercuryFixture {
     }
     static beforeEach(cwd) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
             if (this.originalHost) {
                 process.env.HOST = this.originalHost;
             }
@@ -144,17 +159,25 @@ class MercuryFixture {
             }
             this.setDefaultContractToLocalEventsIfExist(cwd);
             try {
-                const auth = AuthService.Auth(cwd);
-                const namespace = (_a = auth.getCurrentSkill()) === null || _a === void 0 ? void 0 : _a.slug;
+                const namespace = this.getCurrentSkillsNamespace(cwd);
                 if (namespace) {
                     MercuryTestClient.setNamespacesThatMustBeHandledLocally([
                         namespace,
                     ]);
                 }
             }
-            catch (_b) { }
+            catch (_a) { }
         });
     }
+    static getCurrentSkillsNamespace(cwd) {
+        var _a;
+        if (!(cwd in this.namespacesByCwd)) {
+            const auth = AuthService.Auth(cwd);
+            const namespace = (_a = auth.getCurrentSkill()) === null || _a === void 0 ? void 0 : _a.slug;
+            this.namespacesByCwd[cwd] = namespace;
+        }
+        return this.namespacesByCwd[cwd];
+    }
     static setShouldRequireLocalListeners(shouldRequireLocal) {
         this.shouldRequireLocalListeners = shouldRequireLocal;
         MercuryTestClient.setShouldRequireLocalListeners(shouldRequireLocal);
@@ -170,4 +193,6 @@ MercuryFixture.shouldAutoImportContracts = true;
 MercuryFixture.shouldMixinCoreEventContractWhenImportingLocal = false;
 MercuryFixture.shouldAutomaticallyClearDefaultClient = true;
 MercuryFixture.shouldRequireLocalListeners = true;
+MercuryFixture.contractsByCwd = {};
+MercuryFixture.namespacesByCwd = {};
 export default MercuryFixture;

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

@@ -14,12 +14,12 @@ export default class OrganizationFixture {
     seedDemoOrganization(values?: Partial<Omit<SpruceSchemas.Mercury.v2020_12_25.CreateOrgEmitPayload, 'slug'>> & {
         phone?: string;
         slug?: string;
-    }): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false>>, "id" | "address" | "name" | "dateCreated" | "dateDeleted" | "isPublic" | "slug">>;
-    getOrganizationById(id: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false>>, "id" | "address" | "name" | "dateCreated" | "dateDeleted" | "isPublic" | "slug">>;
+    }): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false>>, "id" | "address" | "dateCreated" | "name" | "slug" | "dateDeleted" | "isPublic">>;
+    getOrganizationById(id: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false>>, "id" | "address" | "dateCreated" | "name" | "slug" | "dateDeleted" | "isPublic">>;
     updateOrganization(id: string, values: SpruceSchemas.Mercury.v2020_12_25.UpdateOrgEmitPayload & {
         phone?: string;
     }): Promise<void>;
-    getNewestOrganization(phone?: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false>>, "id" | "address" | "name" | "dateCreated" | "dateDeleted" | "isPublic" | "slug"> | null>;
+    getNewestOrganization(phone?: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false>>, "id" | "address" | "dateCreated" | "name" | "slug" | "dateDeleted" | "isPublic"> | null>;
     private generateOrgSlug;
     installSkill(skillId: string, orgId: string, shouldNotifySkillOfInstall?: boolean): Promise<void>;
     isPartOfOrg(options: {
@@ -46,6 +46,6 @@ export default class OrganizationFixture {
         shouldNotifySkillOfInstall?: boolean;
     }): Promise<void>;
     deleteAllOrganizations(phone?: string): Promise<void>;
-    listOrganizations(phone?: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false>>, "id" | "address" | "name" | "dateCreated" | "dateDeleted" | "isPublic" | "slug">[]>;
+    listOrganizations(phone?: string): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false>>, "id" | "address" | "dateCreated" | "name" | "slug" | "dateDeleted" | "isPublic">[]>;
     destroy(): Promise<void>;
 }

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

@@ -7,7 +7,7 @@ type ClientPromise = ReturnType<Factory>;
 type Client = ClientPromise extends PromiseLike<infer C> ? C : ClientPromise;
 export default class PersonFixture {
     private connectToApi;
-    private lastLoggedIn?;
+    private firstLoggedIn?;
     constructor(options: {
         connectToApi: Factory;
     });
@@ -18,7 +18,7 @@ export default class PersonFixture {
         roleBases?: string[];
         roleIds?: string[];
         shouldIncludePrivateFields?: boolean;
-    }): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Mercury.v2020_12_25.ListPersonSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Mercury.v2020_12_25.ListPersonSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Mercury.v2020_12_25.ListPersonSchema, false>>, "id" | "phone" | "roleIds" | "firstName" | "lastName" | "casualName" | "timezone" | "username" | "avatar" | "dateCreated" | "dateUpdated" | "dateScrambled" | "macAddress">[]>;
+    }): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Mercury.v2020_12_25.ListPersonSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Mercury.v2020_12_25.ListPersonSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Mercury.v2020_12_25.ListPersonSchema, false>>, "id" | "phone" | "firstName" | "lastName" | "casualName" | "timezone" | "username" | "avatar" | "dateCreated" | "dateUpdated" | "dateScrambled" | "macAddress" | "roleIds">[]>;
     generateRandomName(client: MercuryClient): Promise<{
         firstName: string;
         lastName: string;

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

@@ -21,6 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { formatPhoneNumber, SchemaError } from '@sprucelabs/schema';
 import dotenv from 'dotenv';
 import generateRandomName from './generateRandomName.js';
+import MercuryFixture from './MercuryFixture.js';
 dotenv.config();
 export default class PersonFixture {
     constructor(options) {
@@ -51,16 +52,27 @@ export default class PersonFixture {
     }
     loginAsDemoPerson(phone) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            if (this.lastLoggedIn &&
-                (!phone ||
-                    formatPhoneNumber(phone) === this.lastLoggedIn.person.phone)) {
-                return this.lastLoggedIn;
+            var _a, _b, _c, _d, _e;
+            let phoneFormated = phone ? formatPhoneNumber(phone) : undefined;
+            const defaultClient = MercuryFixture.getDefaultClient();
+            const isDefaultClient = defaultClient &&
+                (!phone || ((_b = (_a = defaultClient === null || defaultClient === void 0 ? void 0 : defaultClient.auth) === null || _a === void 0 ? void 0 : _a.person) === null || _b === void 0 ? void 0 : _b.phone) === phoneFormated);
+            if (isDefaultClient) {
+                return {
+                    client: defaultClient,
+                    person: defaultClient.auth.person,
+                    token: defaultClient.auth.token,
+                };
+            }
+            const isFirstLoggedIn = this.firstLoggedIn &&
+                (!phone || phoneFormated === this.firstLoggedIn.person.phone);
+            if (isFirstLoggedIn) {
+                return this.firstLoggedIn;
             }
             const client = (yield this.connectToApi({
                 shouldReUseClient: !phone,
             }));
-            if ((_a = client.auth) === null || _a === void 0 ? void 0 : _a.person) {
+            if ((_c = client.auth) === null || _c === void 0 ? void 0 : _c.person) {
                 return {
                     client,
                     person: client.auth.person,
@@ -77,7 +89,7 @@ export default class PersonFixture {
             }
             const formattedPhone = formatPhoneNumber(p);
             //@ts-ignore
-            if (((_c = (_b = client.auth) === null || _b === void 0 ? void 0 : _b.person) === null || _c === void 0 ? void 0 : _c.phone) === formattedPhone) {
+            if (((_e = (_d = client.auth) === null || _d === void 0 ? void 0 : _d.person) === null || _e === void 0 ? void 0 : _e.phone) === formattedPhone) {
                 return {
                     client,
                     person: client.auth.person,
@@ -93,8 +105,10 @@ export default class PersonFixture {
             });
             //@ts-ignore
             client.auth = { person, token };
-            this.lastLoggedIn = { person, client, token };
-            return this.lastLoggedIn;
+            if (!this.firstLoggedIn) {
+                this.firstLoggedIn = { person, client, token };
+            }
+            return { person, client, token };
         });
     }
     destroy() {

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

@@ -2,7 +2,7 @@ import { SpruceSchemas } from '@sprucelabs/mercury-types';
 import PersonFixture from './PersonFixture';
 type GetNewestOrgHandler = () => Promise<SpruceSchemas.Spruce.v2020_07_22.Organization | null>;
 export default class RoleFixture {
-    private personFixture;
+    private people;
     private getNewestOrgHandler;
     constructor(options: {
         people: PersonFixture;
@@ -14,7 +14,7 @@ export default class RoleFixture {
         personId?: string;
         phone?: string;
         shouldIncludeMetaRoles?: boolean;
-    }): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false>>, "id" | "name" | "description" | "organizationId" | "target" | "dateCreated" | "base" | "dateDeleted" | "isPublic" | "isMeta">[]>;
+    }): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false>>, "id" | "organizationId" | "target" | "dateCreated" | "name" | "description" | "dateDeleted" | "isPublic" | "base" | "isMeta">[]>;
     addRoleToPerson(options: {
         personId: string;
         organizationId: string;
@@ -34,11 +34,11 @@ export default class RoleFixture {
         organizationId: string;
         base: string;
         phone?: string;
-    }): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false>>, "id" | "name" | "description" | "organizationId" | "target" | "dateCreated" | "base" | "dateDeleted" | "isPublic" | "isMeta">>;
+    }): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false>>, "id" | "organizationId" | "target" | "dateCreated" | "name" | "description" | "dateDeleted" | "isPublic" | "base" | "isMeta">>;
     getFirstRoleWithBase(options: {
         organizationId: string;
         base: string;
         phone?: string;
-    }): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false>>, "id" | "name" | "description" | "organizationId" | "target" | "dateCreated" | "base" | "dateDeleted" | "isPublic" | "isMeta">>;
+    }): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Mercury.v2020_12_25.ListRoleSchema, false>>, "id" | "organizationId" | "target" | "dateCreated" | "name" | "description" | "dateDeleted" | "isPublic" | "base" | "isMeta">>;
 }
 export {};

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

@@ -12,13 +12,13 @@ import { eventResponseUtil } from '@sprucelabs/spruce-event-utils';
 import { assert } from '@sprucelabs/test-utils';
 export default class RoleFixture {
     constructor(options) {
-        this.personFixture = options.people;
+        this.people = options.people;
         this.getNewestOrgHandler = options.getNewestOrg;
     }
     listRoles(options) {
         return __awaiter(this, void 0, void 0, function* () {
             let { organizationId, locationId, personId, phone, shouldIncludeMetaRoles, } = options !== null && options !== void 0 ? options : {};
-            const { client } = yield this.personFixture.loginAsDemoPerson(phone);
+            const { client } = yield this.people.loginAsDemoPerson(phone);
             if (!organizationId && !locationId) {
                 const latest = yield this.getNewestOrgHandler();
                 organizationId = latest === null || latest === void 0 ? void 0 : latest.id;
@@ -48,7 +48,7 @@ export default class RoleFixture {
     addRoleToPerson(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { personId, organizationId, locationId, roleBase, phone } = options;
-            const { client } = yield this.personFixture.loginAsDemoPerson(phone);
+            const { client } = yield this.people.loginAsDemoPerson(phone);
             const match = yield this.getFirstRoleWithBase({
                 organizationId,
                 phone,
@@ -74,7 +74,7 @@ export default class RoleFixture {
     removeRoleFromPerson(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const { phone, organizationId: orgId, personId, roleBase, locationId, } = options;
-            const { client } = yield this.personFixture.loginAsDemoPerson(phone);
+            const { client } = yield this.people.loginAsDemoPerson(phone);
             const role = yield this.getFirstRoleWithBase({
                 phone,
                 base: roleBase,

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

@@ -2,18 +2,6 @@ import { SpruceSchemas } from '@sprucelabs/mercury-types';
 import LocationFixture from './LocationFixture';
 import OrganizationFixture from './OrganizationFixture';
 import PersonFixture from './PersonFixture';
-type Person = SpruceSchemas.Spruce.v2020_07_22.Person;
-export interface SeedLocationOptions {
-    totalLocations: number;
-    organizationId?: string;
-    phone?: string;
-    totalGuests?: number;
-    totalTeammates?: number;
-    totalManagers?: number;
-    totalOwners?: number;
-    totalGroupManagers?: number;
-    startingPhone?: string;
-}
 export default class SeedFixture {
     private organizations;
     private locations;
@@ -49,7 +37,7 @@ export default class SeedFixture {
         managers: Person[];
         groupManagers: Person[];
         owners: Person[];
-        locations: Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "name" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "dateDeleted" | "isPublic" | "slug" | "num">[];
+        locations: Pick<import("@sprucelabs/schema").SchemaStaticValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "name" | "slug" | "dateDeleted" | "num" | "isPublic">[];
     }>;
     seedPeople(options: Omit<SeedLocationOptions, 'totalLocations'> & {
         locationId?: string;
@@ -64,4 +52,16 @@ export default class SeedFixture {
     private seedPeopleWithRole;
     resetAccount(phone?: string): Promise<void>;
 }
+type Person = SpruceSchemas.Spruce.v2020_07_22.Person;
+export interface SeedLocationOptions {
+    totalLocations: number;
+    organizationId?: string;
+    phone?: string;
+    totalGuests?: number;
+    totalTeammates?: number;
+    totalManagers?: number;
+    totalOwners?: number;
+    totalGroupManagers?: number;
+    startingPhone?: string;
+}
 export {};

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

@@ -11,12 +11,12 @@ export interface SeedDemoSkillValues {
     creatorPhone?: string;
 }
 export default class SkillFixture {
-    private personFixture;
+    private people;
     private connectToApi;
     private skills;
     private skillCounter;
     constructor(options: {
-        personFixture: PersonFixture;
+        people: PersonFixture;
         connectToApi: Factory;
     });
     seedDemoSkill(options?: SeedDemoSkillValues): Promise<SpruceSchemas.Spruce.v2020_07_22.Skill>;

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

@@ -24,12 +24,12 @@ export default class SkillFixture {
         this.skills = [];
         this.skillCounter = process.pid;
         this.connectToApi = options.connectToApi;
-        this.personFixture = options.personFixture;
+        this.people = options.people;
     }
     seedDemoSkill(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const _a = options !== null && options !== void 0 ? options : {}, { creatorPhone } = _a, values = __rest(_a, ["creatorPhone"]);
-            const { client } = yield this.personFixture.loginAsDemoPerson(creatorPhone);
+            const { client } = yield this.people.loginAsDemoPerson(creatorPhone);
             const [{ skill }] = yield client.emitAndFlattenResponses('register-skill::v2020_12_25', {
                 payload: Object.assign({ slug: this.generateSkillSlug(), name: this.generateSkillName() }, values),
             });

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

@@ -12,12 +12,12 @@ export default class SpyScope implements Scope {
         organizationFixture: OrganizationFixture;
         locationFixture: LocationFixture;
     });
-    getCurrentOrganization(): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false>>, "id" | "address" | "name" | "dateCreated" | "dateDeleted" | "isPublic" | "slug"> | null>;
+    getCurrentOrganization(): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.OrganizationSchema, false>>, "id" | "address" | "dateCreated" | "name" | "slug" | "dateDeleted" | "isPublic"> | null>;
     private assertScopedByOrg;
     setCurrentOrganization(id: string | null): void;
     setFlags(flags: ScopeFlag[]): void;
     getFlags(): ScopeFlag[];
-    getCurrentLocation(): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "name" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "dateDeleted" | "isPublic" | "slug" | "num"> | null>;
+    getCurrentLocation(): Promise<Pick<import("@sprucelabs/schema").SchemaStaticValues<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false, import("@sprucelabs/schema").SchemaOptionalFieldNames<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.LocationSchema>, import("@sprucelabs/schema").StaticSchemaAllValues<import("@sprucelabs/heartwood-view-controllers").SpruceSchemas.Spruce.v2020_07_22.LocationSchema, false>>, "id" | "address" | "phone" | "organizationId" | "timezone" | "dateCreated" | "dateUpdated" | "name" | "slug" | "dateDeleted" | "num" | "isPublic"> | null>;
     private assertScopedToCurrentLocation;
     setCurrentLocation(id: string | null): void;
     clearSession(): void;

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

@@ -9,6 +9,8 @@ import { ArgsFromSvc } from '../../types/view.types';
 import TestRouter from '../routers/TestRouter';
 import SpyViewControllerFactory from '../SpyViewControllerFactory';
 import FixtureFactory from './FixtureFactory';
+import LocationFixture from './LocationFixture';
+import OrganizationFixture from './OrganizationFixture';
 import PermissionFixture from './PermissionFixture';
 import PersonFixture from './PersonFixture';
 import SpyAuthenticator from './SpyAuthenticator';
@@ -22,13 +24,13 @@ export default class ViewFixture {
     private static scope?;
     private static shouldAutomaticallyResetAuthenticator;
     private static viewClient?;
+    protected people: PersonFixture;
+    protected organizations: OrganizationFixture;
+    protected locations: LocationFixture;
     protected vcDir: string;
     private controllerMap?;
     private connectToApi;
     private namespace;
-    private people;
-    private orgs;
-    private locations;
     private proxyDecorator;
     private locale;
     private permissions;
@@ -38,6 +40,8 @@ export default class ViewFixture {
     constructor(options: {
         connectToApi: Factory;
         people: PersonFixture;
+        organizations?: OrganizationFixture;
+        locations?: LocationFixture;
         fixtureFactory: FixtureFactory;
         vcDir?: string;
         cwd?: string;

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

@@ -29,7 +29,7 @@ class ViewFixture {
         this.shouldAutomaticallyResetAuthenticator = shouldReset;
     }
     constructor(options) {
-        const { connectToApi, people, fixtureFactory, vcDir, cwd, namespace, proxyDecorator, permissions, } = options;
+        const { connectToApi, people, organizations: orgs, locations, fixtureFactory, vcDir, cwd, namespace, proxyDecorator, permissions, } = options;
         this.connectToApi = connectToApi;
         this.people = people;
         this.vcDir =
@@ -37,18 +37,20 @@ class ViewFixture {
         this.controllerMap = options === null || options === void 0 ? void 0 : options.controllerMap;
         this.namespace = namespace;
         this.proxyDecorator = proxyDecorator;
-        this.orgs = fixtureFactory.Fixture('organization', {
-            people: this.people,
-        });
+        this.organizations =
+            orgs !== null && orgs !== void 0 ? orgs : fixtureFactory.Fixture('organization', {
+                people: this.people,
+            });
         this.permissions = permissions;
         if (!ViewFixture.device) {
             ViewFixture.device = new SpyDevice();
         }
         this.locale = new LocaleImpl();
-        this.locations = fixtureFactory.Fixture('location', {
-            people: this.people,
-            organizations: this.orgs,
-        });
+        this.locations =
+            locations !== null && locations !== void 0 ? locations : fixtureFactory.Fixture('location', {
+                people: this.people,
+                organizations: this.organizations,
+            });
     }
     addPlugin(name, plugin) {
         this.getFactory().addPlugin(name, plugin);
@@ -256,7 +258,7 @@ class ViewFixture {
     getScope() {
         if (!ViewFixture.scope) {
             ViewFixture.scope = new SpyScope({
-                organizationFixture: this.orgs,
+                organizationFixture: this.organizations,
                 locationFixture: this.locations,
             });
         }