@sprucelabs/spruce-test-fixtures 52.5.4 → 52.5.6

package/build/__tests__/behavioral/{PermissionFixture.test.d.ts → permissions/FakeAuthorizer.test.d.ts}

@@ -1,10 +1,10 @@
-import AbstractSpruceFixtureTest from '../../tests/AbstractSpruceFixtureTest';
+import AbstractSpruceFixtureTest from '../../../tests/AbstractSpruceFixtureTest';
 export default class CheckingPermissionsTest extends AbstractSpruceFixtureTest {
     private static contractId;
     protected static beforeEach(): Promise<void>;
     protected static canCreateCheckingPermissions(): Promise<void>;
     protected static sharesInstances(): Promise<void>;
-    protected static viewsFixtureResetsInstance(): Promise<void>;
+    protected static permsFixtureResetsInstance(): Promise<void>;
     protected static throwsWhenMissingOnCan(): Promise<void>;
     protected static throwsWhenNotSettingResponse(): Promise<void>;
     protected static throwsWhenContractIdNotFaked(): Promise<void>;

package/build/__tests__/behavioral/{PermissionFixture.test.js → permissions/FakeAuthorizer.test.js}

@@ -11,9 +11,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const test_utils_1 = require("@sprucelabs/test-utils");
 const test_utils_2 = require("@sprucelabs/test-utils");
-const AbstractSpruceFixtureTest_1 = __importDefault(require("../../tests/AbstractSpruceFixtureTest"));
-const FakeAuthorizer_1 = __importDefault(require("../../tests/FakeAuthorizer"));
-const ViewFixture_1 = __importDefault(require("../../tests/fixtures/ViewFixture"));
+const AbstractSpruceFixtureTest_1 = __importDefault(require("../../../tests/AbstractSpruceFixtureTest"));
+const FakeAuthorizer_1 = __importDefault(require("../../../tests/FakeAuthorizer"));
+const PermissionFixture_1 = __importDefault(require("../../../tests/fixtures/PermissionFixture"));
 class CheckingPermissionsTest extends AbstractSpruceFixtureTest_1.default {
     static async beforeEach() {
         await super.beforeEach();
@@ -25,9 +25,9 @@ class CheckingPermissionsTest extends AbstractSpruceFixtureTest_1.default {
     static async sharesInstances() {
         test_utils_1.assert.isEqual(this.instance, this.instance);
     }
-    static async viewsFixtureResetsInstance() {
+    static async permsFixtureResetsInstance() {
         const instance = this.instance;
-        await ViewFixture_1.default.beforeEach();
+        PermissionFixture_1.default.beforeEach();
         test_utils_1.assert.isNotEqual(this.instance, instance);
     }
     static async throwsWhenMissingOnCan() {
@@ -70,7 +70,7 @@ class CheckingPermissionsTest extends AbstractSpruceFixtureTest_1.default {
     }
     static async fixtureAndLoadOptionsShareAuthorizer() {
         this.setupEmptyViewFixture();
-        const auth = this.views.getAuthorizer();
+        const auth = this.permissions.getAuthorizer();
         const router = this.views.getRouter();
         test_utils_1.assert.isEqual(auth, router.buildLoadOptions().authorizer);
     }
@@ -121,7 +121,7 @@ class CheckingPermissionsTest extends AbstractSpruceFixtureTest_1.default {
         this.contractId = (0, test_utils_2.generateId)();
     }
     static async assertThrowsFakeError() {
-        await test_utils_1.assert.doesThrowAsync(() => this.can(['test']), `Contract by the id '${this.contractId}'`);
+        await test_utils_1.assert.doesThrowAsync(() => this.can(['test']), `Contract with the id '${this.contractId}'`);
     }
     static fakePermissions(faked) {
         this.instance.fakePermissions({
@@ -141,7 +141,7 @@ class CheckingPermissionsTest extends AbstractSpruceFixtureTest_1.default {
         });
     }
     static get instance() {
-        return FakeAuthorizer_1.default.getInstance();
+        return this.permissions.getAuthorizer();
     }
 }
 __decorate([
@@ -152,7 +152,7 @@ __decorate([
 ], CheckingPermissionsTest, "sharesInstances", null);
 __decorate([
     (0, test_utils_1.test)()
-], CheckingPermissionsTest, "viewsFixtureResetsInstance", null);
+], CheckingPermissionsTest, "permsFixtureResetsInstance", null);
 __decorate([
     (0, test_utils_1.test)()
 ], CheckingPermissionsTest, "throwsWhenMissingOnCan", null);

package/build/__tests__/behavioral/permissions/PermissionFixture.test.d.ts

@@ -0,0 +1,5 @@
+import AbstractSpruceFixtureTest from '../../../tests/AbstractSpruceFixtureTest';
+export default class PermissionFixtureTest extends AbstractSpruceFixtureTest {
+    protected static disablesPermissionsAtStart(): Promise<void>;
+    protected static permissionFixtureShouldUseSharedInstance(): Promise<void>;
+}

package/build/__tests__/behavioral/permissions/{TestingWithPermissions.test.js → PermissionFixture.test.js}

@@ -9,18 +9,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const spruce_permission_utils_1 = require("@sprucelabs/spruce-permission-utils");
 const test_utils_1 = require("@sprucelabs/test-utils");
 const AbstractSpruceFixtureTest_1 = __importDefault(require("../../../tests/AbstractSpruceFixtureTest"));
 const fake_1 = __importDefault(require("../../../tests/decorators/fake"));
-let DisablingPermissionsInTestsTest = class DisablingPermissionsInTestsTest extends AbstractSpruceFixtureTest_1.default {
+let PermissionFixtureTest = class PermissionFixtureTest extends AbstractSpruceFixtureTest_1.default {
     static async disablesPermissionsAtStart() {
         test_utils_1.assert.isEqual(process.env.SHOULD_REGISTER_PERMISSIONS, 'false');
     }
+    static async permissionFixtureShouldUseSharedInstance() {
+        const actual = this.permissions.getAuthorizer();
+        const expected = spruce_permission_utils_1.AuthorizerFactory.getInstance();
+        test_utils_1.assert.isEqual(actual, expected);
+    }
 };
 __decorate([
     (0, test_utils_1.test)()
-], DisablingPermissionsInTestsTest, "disablesPermissionsAtStart", null);
-DisablingPermissionsInTestsTest = __decorate([
+], PermissionFixtureTest, "disablesPermissionsAtStart", null);
+__decorate([
+    (0, test_utils_1.test)()
+], PermissionFixtureTest, "permissionFixtureShouldUseSharedInstance", null);
+PermissionFixtureTest = __decorate([
     fake_1.default.login()
-], DisablingPermissionsInTestsTest);
-exports.default = DisablingPermissionsInTestsTest;
+], PermissionFixtureTest);
+exports.default = PermissionFixtureTest;

package/build/esm/__tests__/behavioral/{PermissionFixture.test.d.ts → permissions/FakeAuthorizer.test.d.ts}

@@ -1,10 +1,10 @@
-import AbstractSpruceFixtureTest from '../../tests/AbstractSpruceFixtureTest';
+import AbstractSpruceFixtureTest from '../../../tests/AbstractSpruceFixtureTest';
 export default class CheckingPermissionsTest extends AbstractSpruceFixtureTest {
     private static contractId;
     protected static beforeEach(): Promise<void>;
     protected static canCreateCheckingPermissions(): Promise<void>;
     protected static sharesInstances(): Promise<void>;
-    protected static viewsFixtureResetsInstance(): Promise<void>;
+    protected static permsFixtureResetsInstance(): Promise<void>;
     protected static throwsWhenMissingOnCan(): Promise<void>;
     protected static throwsWhenNotSettingResponse(): Promise<void>;
     protected static throwsWhenContractIdNotFaked(): Promise<void>;

package/build/esm/__tests__/behavioral/{PermissionFixture.test.js → permissions/FakeAuthorizer.test.js}

@@ -15,9 +15,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { test, assert } from '@sprucelabs/test-utils';
 import { errorAssert, generateId } from '@sprucelabs/test-utils';
-import AbstractSpruceFixtureTest from '../../tests/AbstractSpruceFixtureTest.js';
-import FakeAuthorizer from '../../tests/FakeAuthorizer.js';
-import ViewFixture from '../../tests/fixtures/ViewFixture.js';
+import AbstractSpruceFixtureTest from '../../../tests/AbstractSpruceFixtureTest.js';
+import FakeAuthorizer from '../../../tests/FakeAuthorizer.js';
+import PermissionFixture from '../../../tests/fixtures/PermissionFixture.js';
 export default class CheckingPermissionsTest extends AbstractSpruceFixtureTest {
     static beforeEach() {
         const _super = Object.create(null, {
@@ -38,10 +38,10 @@ export default class CheckingPermissionsTest extends AbstractSpruceFixtureTest {
             assert.isEqual(this.instance, this.instance);
         });
     }
-    static viewsFixtureResetsInstance() {
+    static permsFixtureResetsInstance() {
         return __awaiter(this, void 0, void 0, function* () {
             const instance = this.instance;
-            yield ViewFixture.beforeEach();
+            PermissionFixture.beforeEach();
             assert.isNotEqual(this.instance, instance);
         });
     }
@@ -100,7 +100,7 @@ export default class CheckingPermissionsTest extends AbstractSpruceFixtureTest {
     static fixtureAndLoadOptionsShareAuthorizer() {
         return __awaiter(this, void 0, void 0, function* () {
             this.setupEmptyViewFixture();
-            const auth = this.views.getAuthorizer();
+            const auth = this.permissions.getAuthorizer();
             const router = this.views.getRouter();
             assert.isEqual(auth, router.buildLoadOptions().authorizer);
         });
@@ -165,7 +165,7 @@ export default class CheckingPermissionsTest extends AbstractSpruceFixtureTest {
     }
     static assertThrowsFakeError() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield assert.doesThrowAsync(() => this.can(['test']), `Contract by the id '${this.contractId}'`);
+            yield assert.doesThrowAsync(() => this.can(['test']), `Contract with the id '${this.contractId}'`);
         });
     }
     static fakePermissions(faked) {
@@ -186,7 +186,7 @@ export default class CheckingPermissionsTest extends AbstractSpruceFixtureTest {
         });
     }
     static get instance() {
-        return FakeAuthorizer.getInstance();
+        return this.permissions.getAuthorizer();
     }
 }
 __decorate([
@@ -197,7 +197,7 @@ __decorate([
 ], CheckingPermissionsTest, "sharesInstances", null);
 __decorate([
     test()
-], CheckingPermissionsTest, "viewsFixtureResetsInstance", null);
+], CheckingPermissionsTest, "permsFixtureResetsInstance", null);
 __decorate([
     test()
 ], CheckingPermissionsTest, "throwsWhenMissingOnCan", null);

package/build/esm/__tests__/behavioral/permissions/PermissionFixture.test.d.ts

@@ -0,0 +1,5 @@
+import AbstractSpruceFixtureTest from '../../../tests/AbstractSpruceFixtureTest';
+export default class PermissionFixtureTest extends AbstractSpruceFixtureTest {
+    protected static disablesPermissionsAtStart(): Promise<void>;
+    protected static permissionFixtureShouldUseSharedInstance(): Promise<void>;
+}

package/build/esm/__tests__/behavioral/permissions/{TestingWithPermissions.test.js → PermissionFixture.test.js}

@@ -13,20 +13,31 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { AuthorizerFactory } from '@sprucelabs/spruce-permission-utils';
 import { test, assert } from '@sprucelabs/test-utils';
 import AbstractSpruceFixtureTest from '../../../tests/AbstractSpruceFixtureTest.js';
 import fake from '../../../tests/decorators/fake.js';
-let DisablingPermissionsInTestsTest = class DisablingPermissionsInTestsTest extends AbstractSpruceFixtureTest {
+let PermissionFixtureTest = class PermissionFixtureTest extends AbstractSpruceFixtureTest {
     static disablesPermissionsAtStart() {
         return __awaiter(this, void 0, void 0, function* () {
             assert.isEqual(process.env.SHOULD_REGISTER_PERMISSIONS, 'false');
         });
     }
+    static permissionFixtureShouldUseSharedInstance() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const actual = this.permissions.getAuthorizer();
+            const expected = AuthorizerFactory.getInstance();
+            assert.isEqual(actual, expected);
+        });
+    }
 };
 __decorate([
     test()
-], DisablingPermissionsInTestsTest, "disablesPermissionsAtStart", null);
-DisablingPermissionsInTestsTest = __decorate([
+], PermissionFixtureTest, "disablesPermissionsAtStart", null);
+__decorate([
+    test()
+], PermissionFixtureTest, "permissionFixtureShouldUseSharedInstance", null);
+PermissionFixtureTest = __decorate([
     fake.login()
-], DisablingPermissionsInTestsTest);
-export default DisablingPermissionsInTestsTest;
+], PermissionFixtureTest);
+export default PermissionFixtureTest;

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

@@ -1,10 +1,7 @@
 import { Authorizer, AuthorizerCanOptions } from '@sprucelabs/heartwood-view-controllers';
 import { PermissionContractId, PermissionId } from '@sprucelabs/mercury-types';
 export default class FakeAuthorizer implements Authorizer {
-    private static instance?;
     private fakedContracts;
-    static getInstance(): FakeAuthorizer;
-    static reset(): void;
     fakePermissions<ContractId extends PermissionContractId = PermissionContractId>(options: FakeOptions<ContractId>): void;
     can<ContractId extends PermissionContractId, Ids extends PermissionId<ContractId>>(options: AuthorizerCanOptions<ContractId, Ids>): Promise<Record<Ids, boolean>>;
     private assertValidPermission;

package/build/esm/tests/FakeAuthorizer.js

@@ -13,15 +13,6 @@ export default class FakeAuthorizer {
     constructor() {
         this.fakedContracts = [];
     }
-    static getInstance() {
-        if (!this.instance) {
-            this.instance = new this();
-        }
-        return this.instance;
-    }
-    static reset() {
-        this.instance = undefined;
-    }
     fakePermissions(options) {
         this.fakedContracts.unshift(options);
     }
@@ -48,7 +39,7 @@ Valid permissions on this contract are:
 ${faked.permissions.map((p) => p.id).join('\n')}`);
     }
     assertValidContractId(faked, contractId) {
-        assert.isTruthy(faked, `Contract by the id '${contractId}' not found! You need to tell the authorizer how to respond. Try 'this.views.getAuthorizer().fakePermissions(...)'
+        assert.isTruthy(faked, `Contract with the id '${contractId}' not found! You need to tell the authorizer how to respond. Try 'this.views.getAuthorizer().fakePermissions(...)'
 
 Valid contracts are: 
 

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

@@ -105,7 +105,7 @@ export default class FixtureFactory {
                 });
                 break;
             case 'permission':
-                fixture = new PermissionFixture();
+                fixture = new PermissionFixture(mercuryFixture);
                 break;
             case 'view': {
                 if (!this.namespace) {
@@ -113,7 +113,7 @@ export default class FixtureFactory {
                 }
                 fixture = new ViewFixture(Object.assign({ 
                     //@ts-ignore
-                    people: (_e = options === null || options === void 0 ? void 0 : options.personFixture) !== null && _e !== void 0 ? _e : this.Fixture('person'), connectToApi: mercuryFixture.getConnectFactory(), fixtureFactory: this, namespace: this.namespace, proxyDecorator: ClientProxyDecorator.getInstance(), cwd: this.cwd }, options));
+                    people: (_e = options === null || options === void 0 ? void 0 : options.personFixture) !== null && _e !== void 0 ? _e : this.Fixture('person'), connectToApi: mercuryFixture.getConnectFactory(), fixtureFactory: this, namespace: this.namespace, proxyDecorator: ClientProxyDecorator.getInstance(), cwd: this.cwd, permissions: this.Fixture('permission') }, options));
                 break;
             }
         }

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

@@ -1,5 +1,8 @@
 import FakeAuthorizer from '../FakeAuthorizer';
+import MercuryFixture from './MercuryFixture';
 export default class PermissionFixture {
+    private connectToApi;
+    constructor(mercury: MercuryFixture);
     static beforeEach(): void;
     getAuthorizer(): FakeAuthorizer;
     getAuthenticator(): import("@sprucelabs/heartwood-view-controllers").Authenticator;

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

@@ -1,11 +1,18 @@
 import { AuthenticatorImpl } from '@sprucelabs/heartwood-view-controllers';
+import { AuthorizerFactory } from '@sprucelabs/spruce-permission-utils';
 import FakeAuthorizer from '../FakeAuthorizer.js';
 export default class PermissionFixture {
+    constructor(mercury) {
+        this.connectToApi = mercury.getConnectFactory();
+        AuthorizerFactory.setConnectToApi(this.connectToApi);
+    }
     static beforeEach() {
         process.env.SHOULD_REGISTER_PERMISSIONS = 'false';
+        AuthorizerFactory.reset();
+        AuthorizerFactory.setClass(FakeAuthorizer);
     }
     getAuthorizer() {
-        return FakeAuthorizer.getInstance();
+        return AuthorizerFactory.getInstance();
     }
     getAuthenticator() {
         return AuthenticatorImpl.getInstance();

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

@@ -6,9 +6,9 @@ import { ClientProxyDecorator } from '../..';
 import { TokenGenerator } from '../../ClientProxyDecorator';
 import { TestConnectFactory } from '../../types/fixture.types';
 import { ArgsFromSvc } from '../../types/view.types';
-import FakeAuthorizer from '../FakeAuthorizer';
 import TestRouter from '../routers/TestRouter';
 import FixtureFactory from './FixtureFactory';
+import PermissionFixture from './PermissionFixture';
 import PersonFixture from './PersonFixture';
 import SpyScope from './SpyScope';
 type Factory = TestConnectFactory;
@@ -29,6 +29,7 @@ export default class ViewFixture {
     private locations;
     private proxyDecorator;
     private locale;
+    private permissions;
     static lockProxyCacheForPerson(id: any): void;
     static setShouldAutomaticallyResetAuth(shouldReset: false): void;
     constructor(options: {
@@ -40,6 +41,7 @@ export default class ViewFixture {
         controllerMap?: Record<string, any>;
         namespace: string;
         proxyDecorator: ClientProxyDecorator;
+        permissions: PermissionFixture;
     });
     getFactory(): ViewControllerFactory;
     getMaps(): import("../../utilities/SpyMapUtil").SpyMapUtil;
@@ -66,7 +68,7 @@ export default class ViewFixture {
     /**
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
-    getAuthorizer(): FakeAuthorizer;
+    getAuthorizer(): import("../FakeAuthorizer").default;
     getProxyTokenGenerator(): TokenGenerator | undefined;
     setProxyTokenGenerator(cb: TokenGenerator): void;
     loginAsDemoPerson(phone?: string): Promise<{

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

@@ -16,7 +16,6 @@ import SpruceError from '../../errors/SpruceError.js';
 import spyMapUtil from '../../utilities/SpyMapUtil.js';
 import vcDiskUtil from '../../utilities/vcDisk.utility.js';
 import FakeSkillViewController from '../Fake.svc.js';
-import FakeAuthorizer from '../FakeAuthorizer.js';
 import TestRouter from '../routers/TestRouter.js';
 import SpyScope from './SpyScope.js';
 export default class ViewFixture {
@@ -38,6 +37,7 @@ export default class ViewFixture {
         this.orgs = options.fixtureFactory.Fixture('organization', {
             people: this.people,
         });
+        this.permissions = options.permissions;
         this.locale = new LocaleImpl();
         this.locations = options.fixtureFactory.Fixture('location', {
             people: this.people,
@@ -154,7 +154,6 @@ export default class ViewFixture {
                 };
             }
             TestRouter.reset();
-            FakeAuthorizer.reset();
             ViewFixture.resetMaps();
             ActiveRecordCardViewController.setShouldThrowOnResponseError(true);
             process.env.SHOULD_REGISTER_VIEWS = 'false';
@@ -222,6 +221,7 @@ export default class ViewFixture {
             vcFactory: this.getFactory(),
             scope: this.getScope(),
             locale: this.getLocale(),
+            authorizer: this.permissions.getAuthorizer(),
         });
         return TestRouter.getInstance();
     }
@@ -229,13 +229,13 @@ export default class ViewFixture {
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
     getAuthenticator() {
-        return AuthenticatorImpl.getInstance();
+        return this.permissions.getAuthenticator();
     }
     /**
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
     getAuthorizer() {
-        return FakeAuthorizer.getInstance();
+        return this.permissions.getAuthorizer();
     }
     getProxyTokenGenerator() {
         return this.proxyDecorator.getProxyTokenGenerator();
@@ -246,7 +246,7 @@ export default class ViewFixture {
     loginAsDemoPerson(phone) {
         return __awaiter(this, void 0, void 0, function* () {
             const { person, token, client } = yield this.people.loginAsDemoPerson(phone);
-            this.getAuthenticator().setSessionToken(token, person);
+            this.permissions.getAuthenticator().setSessionToken(token, person);
             this.proxyDecorator.setProxyTokenGenerator(() => __awaiter(this, void 0, void 0, function* () {
                 if (!ViewFixture.loggedInPersonProxyTokens[person.id]) {
                     const proxyToken = client.registerProxyToken();

package/build/esm/tests/routers/TestRouter.d.ts

@@ -1,5 +1,5 @@
 import { Locale } from '@sprucelabs/calendar-utils';
-import { Router, Scope, SkillViewController, SkillViewControllerArgs, SkillViewControllerId, SkillViewControllerLoadOptions, SkillViewControllerMap, ViewControllerFactory } from '@sprucelabs/heartwood-view-controllers';
+import { Authorizer, Router, Scope, SkillViewController, SkillViewControllerArgs, SkillViewControllerId, SkillViewControllerLoadOptions, SkillViewControllerMap, ViewControllerFactory } from '@sprucelabs/heartwood-view-controllers';
 import { AbstractEventEmitter } from '@sprucelabs/mercury-event-emitter';
 import { MercuryEventEmitter } from '@sprucelabs/mercury-types';
 import FakeThemeManager from '../../__tests__/support/FakeThemeManager';
@@ -23,6 +23,8 @@ export default class TestRouter extends AbstractEventEmitter<Contract> implement
     private scope;
     private locale;
     private readonly themes;
+    private authorizer;
+    private static authorizer;
     static setShouldThrowWhenRedirectingToBadSvc(shouldThrow: boolean): void;
     private constructor();
     static setShouldLoadDestinationVc(shouldLoad: boolean): void;
@@ -32,6 +34,7 @@ export default class TestRouter extends AbstractEventEmitter<Contract> implement
         vcFactory: ViewControllerFactory;
         scope: Scope;
         locale: Locale;
+        authorizer: Authorizer;
     }): void;
     getPresentVc(): SkillViewController<any> | undefined;
     redirect<Id extends SkillViewControllerId>(id: Id, args?: SkillViewControllerArgs<Id>): Promise<SkillViewControllerMap[Id]>;

package/build/esm/tests/routers/TestRouter.js

@@ -12,7 +12,6 @@ import { AbstractEventEmitter } from '@sprucelabs/mercury-event-emitter';
 import { buildEventContract, } from '@sprucelabs/mercury-types';
 import testRouterEmitPayloadSchema from './../../.spruce/schemas/spruceTestFixtures/v2021_07_19/testRouterEmitPayload.schema.js';
 import FakeThemeManager from '../../__tests__/support/FakeThemeManager.js';
-import FakeAuthorizer from '../FakeAuthorizer.js';
 const contract = buildEventContract({
     eventSignatures: {
         'did-redirect': {
@@ -30,6 +29,7 @@ export default class TestRouter extends AbstractEventEmitter {
         this.vcFactory = options.vcFactory;
         this.scope = options.scope;
         this.locale = options.locale;
+        this.authorizer = options.authorizer;
     }
     static setShouldLoadDestinationVc(shouldLoad) {
         this.shouldLoadDestinationVc = shouldLoad;
@@ -40,6 +40,7 @@ export default class TestRouter extends AbstractEventEmitter {
                 vcFactory: this.vcFactory,
                 scope: this.scope,
                 locale: this.locale,
+                authorizer: this.authorizer,
             });
             routerTestPatcher.patchRedirectToThrow(this.instance);
         }
@@ -55,6 +56,7 @@ export default class TestRouter extends AbstractEventEmitter {
         this.vcFactory = options.vcFactory;
         this.scope = options.scope;
         this.locale = options.locale;
+        this.authorizer = options.authorizer;
     }
     getPresentVc() {
         return this.presentVc;
@@ -93,7 +95,7 @@ export default class TestRouter extends AbstractEventEmitter {
             authenticator: AuthenticatorImpl.getInstance(),
             args,
             locale: this.locale,
-            authorizer: FakeAuthorizer.getInstance(),
+            authorizer: this.authorizer,
             scope: this.scope,
             themes: this.themes,
         };

package/build/tests/FakeAuthorizer.d.ts

@@ -1,10 +1,7 @@
 import { Authorizer, AuthorizerCanOptions } from '@sprucelabs/heartwood-view-controllers';
 import { PermissionContractId, PermissionId } from '@sprucelabs/mercury-types';
 export default class FakeAuthorizer implements Authorizer {
-    private static instance?;
     private fakedContracts;
-    static getInstance(): FakeAuthorizer;
-    static reset(): void;
     fakePermissions<ContractId extends PermissionContractId = PermissionContractId>(options: FakeOptions<ContractId>): void;
     can<ContractId extends PermissionContractId, Ids extends PermissionId<ContractId>>(options: AuthorizerCanOptions<ContractId, Ids>): Promise<Record<Ids, boolean>>;
     private assertValidPermission;

package/build/tests/FakeAuthorizer.js

@@ -6,15 +6,6 @@ class FakeAuthorizer {
     constructor() {
         this.fakedContracts = [];
     }
-    static getInstance() {
-        if (!this.instance) {
-            this.instance = new this();
-        }
-        return this.instance;
-    }
-    static reset() {
-        this.instance = undefined;
-    }
     fakePermissions(options) {
         this.fakedContracts.unshift(options);
     }
@@ -39,7 +30,7 @@ Valid permissions on this contract are:
 ${faked.permissions.map((p) => p.id).join('\n')}`);
     }
     assertValidContractId(faked, contractId) {
-        test_utils_1.assert.isTruthy(faked, `Contract by the id '${contractId}' not found! You need to tell the authorizer how to respond. Try 'this.views.getAuthorizer().fakePermissions(...)'
+        test_utils_1.assert.isTruthy(faked, `Contract with the id '${contractId}' not found! You need to tell the authorizer how to respond. Try 'this.views.getAuthorizer().fakePermissions(...)'
 
 Valid contracts are: 
 

package/build/tests/fixtures/FixtureFactory.js

@@ -101,7 +101,7 @@ class FixtureFactory {
                 });
                 break;
             case 'permission':
-                fixture = new PermissionFixture_1.default();
+                fixture = new PermissionFixture_1.default(mercuryFixture);
                 break;
             case 'view': {
                 if (!this.namespace) {
@@ -109,7 +109,7 @@ class FixtureFactory {
                 }
                 fixture = new ViewFixture_1.default(Object.assign({ 
                     //@ts-ignore
-                    people: (_e = options === null || options === void 0 ? void 0 : options.personFixture) !== null && _e !== void 0 ? _e : this.Fixture('person'), connectToApi: mercuryFixture.getConnectFactory(), fixtureFactory: this, namespace: this.namespace, proxyDecorator: __1.ClientProxyDecorator.getInstance(), cwd: this.cwd }, options));
+                    people: (_e = options === null || options === void 0 ? void 0 : options.personFixture) !== null && _e !== void 0 ? _e : this.Fixture('person'), connectToApi: mercuryFixture.getConnectFactory(), fixtureFactory: this, namespace: this.namespace, proxyDecorator: __1.ClientProxyDecorator.getInstance(), cwd: this.cwd, permissions: this.Fixture('permission') }, options));
                 break;
             }
         }

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

@@ -1,5 +1,8 @@
 import FakeAuthorizer from '../FakeAuthorizer';
+import MercuryFixture from './MercuryFixture';
 export default class PermissionFixture {
+    private connectToApi;
+    constructor(mercury: MercuryFixture);
     static beforeEach(): void;
     getAuthorizer(): FakeAuthorizer;
     getAuthenticator(): import("@sprucelabs/heartwood-view-controllers").Authenticator;

package/build/tests/fixtures/PermissionFixture.js

@@ -4,13 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const heartwood_view_controllers_1 = require("@sprucelabs/heartwood-view-controllers");
+const spruce_permission_utils_1 = require("@sprucelabs/spruce-permission-utils");
 const FakeAuthorizer_1 = __importDefault(require("../FakeAuthorizer"));
 class PermissionFixture {
+    constructor(mercury) {
+        this.connectToApi = mercury.getConnectFactory();
+        spruce_permission_utils_1.AuthorizerFactory.setConnectToApi(this.connectToApi);
+    }
     static beforeEach() {
         process.env.SHOULD_REGISTER_PERMISSIONS = 'false';
+        spruce_permission_utils_1.AuthorizerFactory.reset();
+        spruce_permission_utils_1.AuthorizerFactory.setClass(FakeAuthorizer_1.default);
     }
     getAuthorizer() {
-        return FakeAuthorizer_1.default.getInstance();
+        return spruce_permission_utils_1.AuthorizerFactory.getInstance();
     }
     getAuthenticator() {
         return heartwood_view_controllers_1.AuthenticatorImpl.getInstance();

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

@@ -6,9 +6,9 @@ import { ClientProxyDecorator } from '../..';
 import { TokenGenerator } from '../../ClientProxyDecorator';
 import { TestConnectFactory } from '../../types/fixture.types';
 import { ArgsFromSvc } from '../../types/view.types';
-import FakeAuthorizer from '../FakeAuthorizer';
 import TestRouter from '../routers/TestRouter';
 import FixtureFactory from './FixtureFactory';
+import PermissionFixture from './PermissionFixture';
 import PersonFixture from './PersonFixture';
 import SpyScope from './SpyScope';
 type Factory = TestConnectFactory;
@@ -29,6 +29,7 @@ export default class ViewFixture {
     private locations;
     private proxyDecorator;
     private locale;
+    private permissions;
     static lockProxyCacheForPerson(id: any): void;
     static setShouldAutomaticallyResetAuth(shouldReset: false): void;
     constructor(options: {
@@ -40,6 +41,7 @@ export default class ViewFixture {
         controllerMap?: Record<string, any>;
         namespace: string;
         proxyDecorator: ClientProxyDecorator;
+        permissions: PermissionFixture;
     });
     getFactory(): ViewControllerFactory;
     getMaps(): import("../../utilities/SpyMapUtil").SpyMapUtil;
@@ -66,7 +68,7 @@ export default class ViewFixture {
     /**
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
-    getAuthorizer(): FakeAuthorizer;
+    getAuthorizer(): import("../FakeAuthorizer").default;
     getProxyTokenGenerator(): TokenGenerator | undefined;
     setProxyTokenGenerator(cb: TokenGenerator): void;
     loginAsDemoPerson(phone?: string): Promise<{

package/build/tests/fixtures/ViewFixture.js

@@ -12,7 +12,6 @@ const SpruceError_1 = __importDefault(require("../../errors/SpruceError"));
 const SpyMapUtil_1 = __importDefault(require("../../utilities/SpyMapUtil"));
 const vcDisk_utility_1 = __importDefault(require("../../utilities/vcDisk.utility"));
 const Fake_svc_1 = __importDefault(require("../Fake.svc"));
-const FakeAuthorizer_1 = __importDefault(require("../FakeAuthorizer"));
 const TestRouter_1 = __importDefault(require("../routers/TestRouter"));
 const SpyScope_1 = __importDefault(require("./SpyScope"));
 class ViewFixture {
@@ -34,6 +33,7 @@ class ViewFixture {
         this.orgs = options.fixtureFactory.Fixture('organization', {
             people: this.people,
         });
+        this.permissions = options.permissions;
         this.locale = new calendar_utils_1.LocaleImpl();
         this.locations = options.fixtureFactory.Fixture('location', {
             people: this.people,
@@ -147,7 +147,6 @@ class ViewFixture {
             };
         }
         TestRouter_1.default.reset();
-        FakeAuthorizer_1.default.reset();
         ViewFixture.resetMaps();
         heartwood_view_controllers_1.ActiveRecordCardViewController.setShouldThrowOnResponseError(true);
         process.env.SHOULD_REGISTER_VIEWS = 'false';
@@ -210,6 +209,7 @@ class ViewFixture {
             vcFactory: this.getFactory(),
             scope: this.getScope(),
             locale: this.getLocale(),
+            authorizer: this.permissions.getAuthorizer(),
         });
         return TestRouter_1.default.getInstance();
     }
@@ -217,13 +217,13 @@ class ViewFixture {
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
     getAuthenticator() {
-        return heartwood_view_controllers_1.AuthenticatorImpl.getInstance();
+        return this.permissions.getAuthenticator();
     }
     /**
      * @deprecated this.views.getAuthorizer() -> this.permissions.getAuthorizer()
      */
     getAuthorizer() {
-        return FakeAuthorizer_1.default.getInstance();
+        return this.permissions.getAuthorizer();
     }
     getProxyTokenGenerator() {
         return this.proxyDecorator.getProxyTokenGenerator();
@@ -233,7 +233,7 @@ class ViewFixture {
     }
     async loginAsDemoPerson(phone) {
         const { person, token, client } = await this.people.loginAsDemoPerson(phone);
-        this.getAuthenticator().setSessionToken(token, person);
+        this.permissions.getAuthenticator().setSessionToken(token, person);
         this.proxyDecorator.setProxyTokenGenerator(async () => {
             if (!ViewFixture.loggedInPersonProxyTokens[person.id]) {
                 const proxyToken = client.registerProxyToken();

package/build/tests/routers/TestRouter.d.ts

@@ -1,5 +1,5 @@
 import { Locale } from '@sprucelabs/calendar-utils';
-import { Router, Scope, SkillViewController, SkillViewControllerArgs, SkillViewControllerId, SkillViewControllerLoadOptions, SkillViewControllerMap, ViewControllerFactory } from '@sprucelabs/heartwood-view-controllers';
+import { Authorizer, Router, Scope, SkillViewController, SkillViewControllerArgs, SkillViewControllerId, SkillViewControllerLoadOptions, SkillViewControllerMap, ViewControllerFactory } from '@sprucelabs/heartwood-view-controllers';
 import { AbstractEventEmitter } from '@sprucelabs/mercury-event-emitter';
 import { MercuryEventEmitter } from '@sprucelabs/mercury-types';
 import FakeThemeManager from '../../__tests__/support/FakeThemeManager';
@@ -23,6 +23,8 @@ export default class TestRouter extends AbstractEventEmitter<Contract> implement
     private scope;
     private locale;
     private readonly themes;
+    private authorizer;
+    private static authorizer;
     static setShouldThrowWhenRedirectingToBadSvc(shouldThrow: boolean): void;
     private constructor();
     static setShouldLoadDestinationVc(shouldLoad: boolean): void;
@@ -32,6 +34,7 @@ export default class TestRouter extends AbstractEventEmitter<Contract> implement
         vcFactory: ViewControllerFactory;
         scope: Scope;
         locale: Locale;
+        authorizer: Authorizer;
     }): void;
     getPresentVc(): SkillViewController<any> | undefined;
     redirect<Id extends SkillViewControllerId>(id: Id, args?: SkillViewControllerArgs<Id>): Promise<SkillViewControllerMap[Id]>;

package/build/tests/routers/TestRouter.js

@@ -8,7 +8,6 @@ const mercury_event_emitter_1 = require("@sprucelabs/mercury-event-emitter");
 const mercury_types_1 = require("@sprucelabs/mercury-types");
 const testRouterEmitPayload_schema_1 = __importDefault(require("./../../.spruce/schemas/spruceTestFixtures/v2021_07_19/testRouterEmitPayload.schema"));
 const FakeThemeManager_1 = __importDefault(require("../../__tests__/support/FakeThemeManager"));
-const FakeAuthorizer_1 = __importDefault(require("../FakeAuthorizer"));
 const contract = (0, mercury_types_1.buildEventContract)({
     eventSignatures: {
         'did-redirect': {
@@ -26,6 +25,7 @@ class TestRouter extends mercury_event_emitter_1.AbstractEventEmitter {
         this.vcFactory = options.vcFactory;
         this.scope = options.scope;
         this.locale = options.locale;
+        this.authorizer = options.authorizer;
     }
     static setShouldLoadDestinationVc(shouldLoad) {
         this.shouldLoadDestinationVc = shouldLoad;
@@ -36,6 +36,7 @@ class TestRouter extends mercury_event_emitter_1.AbstractEventEmitter {
                 vcFactory: this.vcFactory,
                 scope: this.scope,
                 locale: this.locale,
+                authorizer: this.authorizer,
             });
             heartwood_view_controllers_1.routerTestPatcher.patchRedirectToThrow(this.instance);
         }
@@ -51,6 +52,7 @@ class TestRouter extends mercury_event_emitter_1.AbstractEventEmitter {
         this.vcFactory = options.vcFactory;
         this.scope = options.scope;
         this.locale = options.locale;
+        this.authorizer = options.authorizer;
     }
     getPresentVc() {
         return this.presentVc;
@@ -85,7 +87,7 @@ class TestRouter extends mercury_event_emitter_1.AbstractEventEmitter {
             authenticator: heartwood_view_controllers_1.AuthenticatorImpl.getInstance(),
             args,
             locale: this.locale,
-            authorizer: FakeAuthorizer_1.default.getInstance(),
+            authorizer: this.authorizer,
             scope: this.scope,
             themes: this.themes,
         };

package/package.json

@@ -13,7 +13,7 @@
       "@sprucelabs/spruce-test-fixtures"
     ]
   },
-  "version": "52.5.4",
+  "version": "52.5.6",
   "files": [
     "build/**/*",
     "!build/__tests__",
@@ -64,14 +64,15 @@
   "dependencies": {
     "@sprucelabs/data-stores": "^19.1.13",
     "@sprucelabs/error": "^5.0.555",
-    "@sprucelabs/heartwood-view-controllers": "^99.1.13",
+    "@sprucelabs/heartwood-view-controllers": "^99.1.14",
     "@sprucelabs/mercury-client": "^35.0.29",
     "@sprucelabs/mercury-core-events": "^15.0.144",
     "@sprucelabs/mercury-event-emitter": "^35.0.29",
     "@sprucelabs/schema": "^28.5.88",
     "@sprucelabs/spruce-core-schemas": "^35.1.95",
     "@sprucelabs/spruce-event-utils": "^30.0.25",
-    "@sprucelabs/spruce-skill-booter": "^52.5.4",
+    "@sprucelabs/spruce-permission-utils": "^1.0.0",
+    "@sprucelabs/spruce-skill-booter": "^52.5.6",
     "@sprucelabs/spruce-skill-utils": "^28.1.18",
     "@sprucelabs/test-utils": "^3.2.76",
     "dotenv": "^16.0.3",
@@ -131,5 +132,5 @@
       ]
     ]
   },
-  "gitHead": "2b5c9cdf8d4a29373baf115210340df11035187e"
+  "gitHead": "708f8b4190cf6ec41041462d4b0c52c2d7bc10b2"
 }

package/build/__tests__/behavioral/permissions/TestingWithPermissions.test.d.ts

@@ -1,4 +0,0 @@
-import AbstractSpruceFixtureTest from '../../../tests/AbstractSpruceFixtureTest';
-export default class DisablingPermissionsInTestsTest extends AbstractSpruceFixtureTest {
-    protected static disablesPermissionsAtStart(): Promise<void>;
-}

package/build/esm/__tests__/behavioral/permissions/TestingWithPermissions.test.d.ts

@@ -1,4 +0,0 @@
-import AbstractSpruceFixtureTest from '../../../tests/AbstractSpruceFixtureTest';
-export default class DisablingPermissionsInTestsTest extends AbstractSpruceFixtureTest {
-    protected static disablesPermissionsAtStart(): Promise<void>;
-}