@sprucelabs/spruce-test-fixtures 66.0.19 → 66.0.21

package/build/tests/fixtures/LocationFixture.js

@@ -7,19 +7,19 @@ class LocationFixture {
     constructor(options) {
         this.locationCounter = 0;
         this.people = options.people;
-        this.orgs = options.organizations;
+        this.organizations = options.organizations;
         this.roles = options.roles;
     }
     async seedDemoLocation(values) {
         const { client } = await this.people.loginAsDemoPerson(values?.phone ?? undefined);
         let { organizationId: orgId, ...rest } = values ?? {};
         if (!orgId) {
-            const last = await this.orgs.getNewestOrganization(values?.phone ?? undefined);
+            const last = await this.organizations.getNewestOrganization(values?.phone ?? undefined);
             if (last) {
                 orgId = last.id;
             }
             else {
-                const org = await this.orgs.seedDemoOrganization({
+                const org = await this.organizations.seedDemoOrganization({
                     name: 'Org to support seed location',
                     phone: values?.phone ?? undefined,
                 });
@@ -64,7 +64,7 @@ class LocationFixture {
     async getNewestLocation(organizationId) {
         const { client } = await this.people.loginAsDemoPerson();
         if (!organizationId) {
-            const org = await this.orgs.getNewestOrganization();
+            const org = await this.organizations.getNewestOrganization();
             test_utils_1.assert.isTruthy(org, `You gotta @seed('locations', 1) before you can get the newest location.`);
             organizationId = org.id;
         }
@@ -84,7 +84,7 @@ class LocationFixture {
     async listLocations(organizationId) {
         const { client } = await this.people.loginAsDemoPerson();
         if (!organizationId) {
-            const org = await this.orgs.getNewestOrganization();
+            const org = await this.organizations.getNewestOrganization();
             if (!org) {
                 throw new Error(`You have to @seed('organizations',1) before you can list locations.`);
             }

package/build/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/tests/fixtures/MercuryFixture.js

@@ -61,33 +61,49 @@ class MercuryFixture {
         this.clientPromises.push(promise);
         return promise;
     }
+    static clearContractCache() {
+        this.contractsByCwd = {};
+    }
     static setDefaultContractToLocalEventsIfExist(cwd) {
-        if (MercuryFixture.shouldAutoImportContracts &&
-            spruce_skill_utils_1.diskUtil.doesBuiltHashSprucePathExist(cwd)) {
-            try {
-                const combinedContract = spruce_event_utils_1.eventDiskUtil.resolveCombinedEventsContractFile(cwd);
-                let contracts = require(combinedContract).default;
-                if (MercuryFixture.shouldMixinCoreEventContractWhenImportingLocal) {
-                    contracts = [...contracts, ...mercury_core_events_1.coreEventContracts];
-                }
-                const combined = spruce_event_utils_1.eventContractUtil.unifyContracts(contracts);
-                if (combined) {
-                    MercuryFixture.setDefaultContract(combined);
-                }
+        if (cwd in this.contractsByCwd) {
+            MercuryFixture.setDefaultContract(this.contractsByCwd[cwd]);
+            return;
+        }
+        let contract;
+        const shouldImport = MercuryFixture.shouldAutoImportContracts &&
+            spruce_skill_utils_1.diskUtil.doesBuiltHashSprucePathExist(cwd);
+        if (shouldImport) {
+            contract = this.loadEventContract(cwd);
+        }
+        else {
+            contract = mercury_core_events_1.coreEventContracts[0];
+        }
+        this.contractsByCwd[cwd] = contract;
+        if (contract) {
+            MercuryFixture.setDefaultContract(contract);
+        }
+    }
+    static loadEventContract(cwd) {
+        let contract;
+        try {
+            const combinedContract = spruce_event_utils_1.eventDiskUtil.resolveCombinedEventsContractFile(cwd);
+            let contracts = require(combinedContract).default;
+            if (this.shouldMixinCoreEventContractWhenImportingLocal) {
+                contracts = [...contracts, ...mercury_core_events_1.coreEventContracts];
+            }
+            contract = spruce_event_utils_1.eventContractUtil.unifyContracts(contracts);
+        }
+        catch (err) {
+            //since we default to the
+            if (err.options?.code === 'EVENT_CONTRACTS_NOT_SYNCED') {
+                contract = mercury_core_events_1.coreEventContracts[0];
             }
-            catch (err) {
-                //since we default to the
-                if (err.options?.code === 'EVENT_CONTRACTS_NOT_SYNCED') {
-                    MercuryFixture.setDefaultContract(mercury_core_events_1.coreEventContracts[0]);
-                    return;
-                }
+            else {
                 throw new Error('Mixing in local event contracts failed. Original error:\n\n' +
                     err.stack);
             }
         }
-        else {
-            MercuryFixture.setDefaultContract(mercury_core_events_1.coreEventContracts[0]);
-        }
+        return contract;
     }
     static setDefaultContract(contract) {
         //@ts-ignore
@@ -127,8 +143,7 @@ class MercuryFixture {
         }
         this.setDefaultContractToLocalEventsIfExist(cwd);
         try {
-            const auth = spruce_skill_utils_1.AuthService.Auth(cwd);
-            const namespace = auth.getCurrentSkill()?.slug;
+            const namespace = this.getCurrentSkillsNamespace(cwd);
             if (namespace) {
                 mercury_client_1.MercuryTestClient.setNamespacesThatMustBeHandledLocally([
                     namespace,
@@ -137,6 +152,14 @@ class MercuryFixture {
         }
         catch { }
     }
+    static getCurrentSkillsNamespace(cwd) {
+        if (!(cwd in this.namespacesByCwd)) {
+            const auth = spruce_skill_utils_1.AuthService.Auth(cwd);
+            const namespace = auth.getCurrentSkill()?.slug;
+            this.namespacesByCwd[cwd] = namespace;
+        }
+        return this.namespacesByCwd[cwd];
+    }
     static setShouldRequireLocalListeners(shouldRequireLocal) {
         this.shouldRequireLocalListeners = shouldRequireLocal;
         mercury_client_1.MercuryTestClient.setShouldRequireLocalListeners(shouldRequireLocal);
@@ -152,4 +175,6 @@ MercuryFixture.shouldAutoImportContracts = true;
 MercuryFixture.shouldMixinCoreEventContractWhenImportingLocal = false;
 MercuryFixture.shouldAutomaticallyClearDefaultClient = true;
 MercuryFixture.shouldRequireLocalListeners = true;
+MercuryFixture.contractsByCwd = {};
+MercuryFixture.namespacesByCwd = {};
 exports.default = MercuryFixture;

package/build/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/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/tests/fixtures/PersonFixture.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const schema_1 = require("@sprucelabs/schema");
 const dotenv_1 = __importDefault(require("dotenv"));
 const generateRandomName_1 = __importDefault(require("./generateRandomName"));
+const MercuryFixture_1 = __importDefault(require("./MercuryFixture"));
 dotenv_1.default.config();
 class PersonFixture {
     constructor(options) {
@@ -33,10 +34,21 @@ class PersonFixture {
         return { ...person, ...values };
     }
     async loginAsDemoPerson(phone) {
-        if (this.lastLoggedIn &&
-            (!phone ||
-                (0, schema_1.formatPhoneNumber)(phone) === this.lastLoggedIn.person.phone)) {
-            return this.lastLoggedIn;
+        let phoneFormated = phone ? (0, schema_1.formatPhoneNumber)(phone) : undefined;
+        const defaultClient = MercuryFixture_1.default.getDefaultClient();
+        const isDefaultClient = defaultClient &&
+            (!phone || defaultClient?.auth?.person?.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 = (await this.connectToApi({
             shouldReUseClient: !phone,
@@ -74,8 +86,10 @@ 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 };
     }
     async destroy() { }
 }

package/build/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/tests/fixtures/RoleFixture.js

@@ -5,12 +5,12 @@ const spruce_event_utils_1 = require("@sprucelabs/spruce-event-utils");
 const test_utils_1 = require("@sprucelabs/test-utils");
 class RoleFixture {
     constructor(options) {
-        this.personFixture = options.people;
+        this.people = options.people;
         this.getNewestOrgHandler = options.getNewestOrg;
     }
     async listRoles(options) {
         let { organizationId, locationId, personId, phone, shouldIncludeMetaRoles, } = options ?? {};
-        const { client } = await this.personFixture.loginAsDemoPerson(phone);
+        const { client } = await this.people.loginAsDemoPerson(phone);
         if (!organizationId && !locationId) {
             const latest = await this.getNewestOrgHandler();
             organizationId = latest?.id;
@@ -38,7 +38,7 @@ class RoleFixture {
     }
     async addRoleToPerson(options) {
         const { personId, organizationId, locationId, roleBase, phone } = options;
-        const { client } = await this.personFixture.loginAsDemoPerson(phone);
+        const { client } = await this.people.loginAsDemoPerson(phone);
         const match = await this.getFirstRoleWithBase({
             organizationId,
             phone,
@@ -62,7 +62,7 @@ class RoleFixture {
     }
     async removeRoleFromPerson(options) {
         const { phone, organizationId: orgId, personId, roleBase, locationId, } = options;
-        const { client } = await this.personFixture.loginAsDemoPerson(phone);
+        const { client } = await this.people.loginAsDemoPerson(phone);
         const role = await this.getFirstRoleWithBase({
             phone,
             base: roleBase,

package/build/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/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/tests/fixtures/SkillFixture.js

@@ -6,11 +6,11 @@ class SkillFixture {
         this.skills = [];
         this.skillCounter = process.pid;
         this.connectToApi = options.connectToApi;
-        this.personFixture = options.personFixture;
+        this.people = options.people;
     }
     async seedDemoSkill(options) {
         const { creatorPhone, ...values } = options ?? {};
-        const { client } = await this.personFixture.loginAsDemoPerson(creatorPhone);
+        const { client } = await this.people.loginAsDemoPerson(creatorPhone);
         const [{ skill }] = await client.emitAndFlattenResponses('register-skill::v2020_12_25', {
             payload: {
                 slug: this.generateSkillSlug(),

package/build/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/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/tests/fixtures/ViewFixture.js

@@ -25,7 +25,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 =
@@ -33,18 +33,22 @@ class ViewFixture {
         this.controllerMap = options?.controllerMap;
         this.namespace = namespace;
         this.proxyDecorator = proxyDecorator;
-        this.orgs = fixtureFactory.Fixture('organization', {
-            people: this.people,
-        });
+        this.organizations =
+            orgs ??
+                fixtureFactory.Fixture('organization', {
+                    people: this.people,
+                });
         this.permissions = permissions;
         if (!ViewFixture.device) {
             ViewFixture.device = new heartwood_view_controllers_1.SpyDevice();
         }
         this.locale = new calendar_utils_1.LocaleImpl();
-        this.locations = fixtureFactory.Fixture('location', {
-            people: this.people,
-            organizations: this.orgs,
-        });
+        this.locations =
+            locations ??
+                fixtureFactory.Fixture('location', {
+                    people: this.people,
+                    organizations: this.organizations,
+                });
     }
     addPlugin(name, plugin) {
         this.getFactory().addPlugin(name, plugin);
@@ -246,7 +250,7 @@ class ViewFixture {
     getScope() {
         if (!ViewFixture.scope) {
             ViewFixture.scope = new SpyScope_1.default({
-                organizationFixture: this.orgs,
+                organizationFixture: this.organizations,
                 locationFixture: this.locations,
             });
         }

package/package.json

@@ -13,7 +13,7 @@
       "@sprucelabs/spruce-test-fixtures"
     ]
   },
-  "version": "66.0.19",
+  "version": "66.0.21",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -52,7 +52,7 @@
     "lint": "eslint --cache '**/*.ts'",
     "rebuild": "cd .. && yarn rebuild",
     "resolve-paths.lint": "yarn run build.resolve-paths ; yarn run lint",
-    "test": "jest",
+    "test": "jest --detectOpenHandles --forceExit --verbose",
     "post.watch.build": "yarn run build.copy-files && yarn run build.resolve-paths",
     "spruce.upgrade": "spruce upgrade",
     "watch.build.dev": "tsc-watch --sourceMap --onCompilationComplete 'yarn run post.watch.build'",
@@ -61,45 +61,45 @@
     "lint.tsc": "tsc -p . --noEmit"
   },
   "dependencies": {
-    "@sprucelabs/data-stores": "^28.5.57",
-    "@sprucelabs/error": "^6.0.577",
-    "@sprucelabs/heartwood-view-controllers": "^117.2.4",
-    "@sprucelabs/mercury-client": "^42.0.733",
-    "@sprucelabs/mercury-core-events": "^26.0.8",
-    "@sprucelabs/mercury-event-emitter": "^42.0.733",
-    "@sprucelabs/schema": "^31.0.44",
-    "@sprucelabs/spruce-core-schemas": "^40.1.634",
-    "@sprucelabs/spruce-event-utils": "^40.2.32",
-    "@sprucelabs/spruce-permission-utils": "^12.0.27",
-    "@sprucelabs/spruce-skill-booter": "^66.0.19",
-    "@sprucelabs/spruce-skill-utils": "^31.2.47",
-    "@sprucelabs/test-utils": "^5.3.3",
+    "@sprucelabs/data-stores": "^28.5.63",
+    "@sprucelabs/error": "^6.0.580",
+    "@sprucelabs/heartwood-view-controllers": "^117.2.8",
+    "@sprucelabs/mercury-client": "^42.0.734",
+    "@sprucelabs/mercury-core-events": "^26.0.15",
+    "@sprucelabs/mercury-event-emitter": "^42.0.734",
+    "@sprucelabs/schema": "^31.0.52",
+    "@sprucelabs/spruce-core-schemas": "^40.1.641",
+    "@sprucelabs/spruce-event-utils": "^40.2.38",
+    "@sprucelabs/spruce-permission-utils": "^12.0.33",
+    "@sprucelabs/spruce-skill-booter": "^66.0.21",
+    "@sprucelabs/spruce-skill-utils": "^31.2.55",
+    "@sprucelabs/test-utils": "^5.5.11",
     "dotenv": "^16.4.7",
     "unique-names-generator": "^4.7.1"
   },
   "devDependencies": {
-    "@sprucelabs/esm-postbuild": "^6.0.547",
-    "@sprucelabs/jest-json-reporter": "^8.0.578",
-    "@sprucelabs/mercury-types": "^47.2.28",
-    "@sprucelabs/resolve-path-aliases": "^2.0.531",
+    "@sprucelabs/esm-postbuild": "^6.0.549",
+    "@sprucelabs/jest-json-reporter": "^8.0.581",
+    "@sprucelabs/mercury-types": "^47.2.34",
+    "@sprucelabs/resolve-path-aliases": "^2.0.533",
     "@sprucelabs/semantic-release": "^5.0.2",
-    "@sprucelabs/test": "^9.0.71",
+    "@sprucelabs/test": "^9.0.73",
     "@types/node": "17.0.5",
     "calendar-utils": "^0.11.0",
     "chokidar-cli": "^3.0.0",
-    "eslint": "^9.20.1",
+    "eslint": "^9.21.0",
     "eslint-config-spruce": "^11.2.26",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
-    "prettier": "^3.5.1",
+    "prettier": "^3.5.2",
     "ts-node": "^10.9.2",
     "tsc-watch": "^6.2.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.7.3"
   },
   "jest": {
-    "maxWorkers": 2,
-    "testTimeout": 60000,
+    "maxWorkers": 1,
+    "testTimeout": 1200000,
     "testEnvironment": "node",
     "testPathIgnorePatterns": [
       "<rootDir>/tmp/",
@@ -114,5 +114,5 @@
       "^#spruce/(.*)$": "<rootDir>/build/.spruce/$1"
     }
   },
-  "gitHead": "55aae81e59a9d3667a65b8dc233a2f55324403d8"
+  "gitHead": "41fa5f59edf353050ca0dbabd950dc0f23ee7651"
 }