@sprucelabs/spruce-calendar-components 22.8.12 → 22.8.13

package/build/__tests__/support/utilities/calendarAssert.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const calendar_utils_1 = require("@sprucelabs/calendar-utils");
 const heartwood_view_controllers_1 = require("@sprucelabs/heartwood-view-controllers");
-const test_1 = require("@sprucelabs/test");
+const test_utils_1 = require("@sprucelabs/test-utils");
 const just_clone_1 = __importDefault(require("just-clone"));
 const calendarAssert = {
     rendersTotalEvents(vc, expected) {
         const model = heartwood_view_controllers_1.renderUtil.render(vc);
-        test_1.assert.isLength(model.events, expected);
+        test_utils_1.assert.isLength(model.events, expected);
     },
     hasEvent(vc, lookup) {
         const { events } = heartwood_view_controllers_1.renderUtil.render(vc);
@@ -22,19 +22,19 @@ const calendarAssert = {
         }
         actual.sort(sort);
         expected.sort(sort);
-        test_1.assert.isEqualDeep(actual, expected);
+        test_utils_1.assert.isEqualDeep(actual, expected);
     },
     includesInEvent(events, lookup) {
         const match = events.find((e) => {
             try {
-                test_1.assert.doesInclude(e, lookup);
+                test_utils_1.assert.doesInclude(e, lookup);
                 return e;
                 // eslint-disable-next-line no-empty
             }
             catch (_a) { }
             return null;
         });
-        test_1.assert.isTruthy(match, `I could not find an event that matched:\n\n${test_1.assertUtil.stringify(lookup)}`);
+        test_utils_1.assert.isTruthy(match, `I could not find an event that matched:\n\n${test_utils_1.assertUtil.stringify(lookup)}`);
         return match;
     },
     eventIsDuration(event, expectedDuration) {
@@ -42,7 +42,7 @@ const calendarAssert = {
             minutes += timeBlock.durationMinutes;
             return minutes;
         }, 0);
-        test_1.assert.isEqual(duration, expectedDuration);
+        test_utils_1.assert.isEqual(duration, expectedDuration);
     },
     eventsFallOnDows(events, expectedDows) {
         const remaining = [...expectedDows];
@@ -50,25 +50,25 @@ const calendarAssert = {
             const dow = calendar_utils_1.dateUtil.getDayOfWeek(event.startDateTimeMs);
             const idx = remaining.indexOf(dow);
             if (idx === -1) {
-                test_1.assert.fail(`Checking days of week and got ${dow} but it wasn't in the array of expected dows.`);
+                test_utils_1.assert.fail(`Checking days of week and got ${dow} but it wasn't in the array of expected dows.`);
             }
             remaining.splice(idx, 1);
         }
         if (remaining.length > 0) {
-            test_1.assert.fail(`Didn't find the following days of week in events:\n\n${test_1.assertUtil.stringify(remaining)}`);
+            test_utils_1.assert.fail(`Didn't find the following days of week in events:\n\n${test_utils_1.assertUtil.stringify(remaining)}`);
         }
     },
     eventEquals(actual, expected) {
         var _a, _b, _c;
-        test_1.assert.isTruthy(actual, 'Event is missing');
-        test_1.assert.isTruthy(expected, 'Event is missing');
-        test_1.assert.isEqual(actual.startDateTimeMs, expected.startDateTimeMs, 'startDateTimeMs does not match');
-        test_1.assert.isEqual((_a = actual.isBusy) !== null && _a !== void 0 ? _a : false, (_b = expected.isBusy) !== null && _b !== void 0 ? _b : false, `isBusy does not match, needs to be '${(_c = expected.isBusy) !== null && _c !== void 0 ? _c : false}'`);
+        test_utils_1.assert.isTruthy(actual, 'Event is missing');
+        test_utils_1.assert.isTruthy(expected, 'Event is missing');
+        test_utils_1.assert.isEqual(actual.startDateTimeMs, expected.startDateTimeMs, 'startDateTimeMs does not match');
+        test_utils_1.assert.isEqual((_a = actual.isBusy) !== null && _a !== void 0 ? _a : false, (_b = expected.isBusy) !== null && _b !== void 0 ? _b : false, `isBusy does not match, needs to be '${(_c = expected.isBusy) !== null && _c !== void 0 ? _c : false}'`);
         const cleanedActual = (0, just_clone_1.default)(actual);
         const cleanedExpected = (0, just_clone_1.default)(expected);
         cleanEvent(cleanedActual);
         cleanEvent(cleanedExpected);
-        test_1.assert.isEqualDeep(cleanedActual, cleanedExpected, 'Your event did not equal what I expected!');
+        test_utils_1.assert.isEqualDeep(cleanedActual, cleanedExpected, 'Your event did not equal what I expected!');
     },
 };
 function cleanEvent(obj, propsToIgnore = [

package/build/__tests__/support/utilities/calendarSkillAssert.js

@@ -7,8 +7,8 @@ const heartwood_view_controllers_1 = require("@sprucelabs/heartwood-view-control
 const schema_1 = require("@sprucelabs/schema");
 const spruce_skill_utils_1 = require("@sprucelabs/spruce-skill-utils");
 const spruce_test_fixtures_1 = require("@sprucelabs/spruce-test-fixtures");
-const test_1 = require("@sprucelabs/test");
 const test_utils_1 = require("@sprucelabs/test-utils");
+const test_utils_2 = require("@sprucelabs/test-utils");
 const AbstractCalendarEventToolBeltState_1 = __importDefault(require("../../../toolBelt/states/AbstractCalendarEventToolBeltState"));
 const Calendar_vc_1 = __importDefault(require("../../../viewControllers/Calendar.vc"));
 const EventControlsCard_vc_1 = __importDefault(require("../../../viewControllers/EventControlsCard.vc"));
@@ -67,9 +67,9 @@ const calendarSkillAssert = {
             },
         });
         const organization = organizations.pop();
-        test_1.assert.isTruthy(organization, `You gotta @seed('organizations', 1) before you can assert a calendar is created on install.`);
+        test_utils_1.assert.isTruthy(organization, `You gotta @seed('organizations', 1) before you can assert a calendar is created on install.`);
         const skill = spruce_skill_utils_1.AuthService.Auth(process.cwd()).getCurrentSkill();
-        test_1.assert.isTruthy(skill, `Make sure you registered your skill before you can do anything else. Try 'spruce register'.`);
+        test_utils_1.assert.isTruthy(skill, `Make sure you registered your skill before you can do anything else. Try 'spruce register'.`);
         const responses = await client.emit('did-install::v2020_12_25', {
             target: {
                 organizationId: organization.id,
@@ -80,7 +80,7 @@ const calendarSkillAssert = {
             throw (_b = (_a = responses.responses[0].errors) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : `did-instal error`;
         }
         if (responses.totalResponses === 0) {
-            test_1.assert.fail(`did-install listener missing! To get this test passing your skill will need to be listening to did-install, try 'spruce create.listener' and look under Mercury. You may also need to boot your skill with 'await this.bootSkill()'`);
+            test_utils_1.assert.fail(`did-install listener missing! To get this test passing your skill will need to be listening to did-install, try 'spruce create.listener' and look under Mercury. You may also need to boot your skill with 'await this.bootSkill()'`);
         }
         let cal;
         try {
@@ -93,7 +93,7 @@ const calendarSkillAssert = {
             cal = calendar;
         }
         catch (err) {
-            test_1.assert.fail(`It looks like you still need to create a calendar, maybe the following code will help:
+            test_utils_1.assert.fail(`It looks like you still need to create a calendar, maybe the following code will help:
 const events = event.skill.getFeatureByCode('event') as EventFeature
 const client = await events.connectToApi()
 
@@ -112,7 +112,7 @@ await client.emitAndFlattenResponses(
 )\n\nOh, and here's the original error: ${(_d = (_c = err.stack) !== null && _c !== void 0 ? _c : err.message) !== null && _d !== void 0 ? _d : err}`);
         }
         if (typeSlugs) {
-            test_1.assert.isEqualDeep(cal.eventTypes, typeSlugs, `Your calendar does not have types set to: [${typeSlugs.join(', ')}]`);
+            test_utils_1.assert.isEqualDeep(cal.eventTypes, typeSlugs, `Your calendar does not have types set to: [${typeSlugs.join(', ')}]`);
         }
     },
     async createsCalendarsWithMultipleInstalls(calendarSlug, client) {
@@ -121,7 +121,7 @@ await client.emitAndFlattenResponses(
             await this.createsCalendarOnInstall(calendarSlug, client);
         }
         catch (err) {
-            test_1.assert.fail(`You tried to create the same calendar twice! It's time for the next step (don't forget to extract):
+            test_utils_1.assert.fail(`You tried to create the same calendar twice! It's time for the next step (don't forget to extract):
 			
 try {
 	await client.emitAndFlattenResponses('calendar.get-calendar::v2021_05_19', {
@@ -150,7 +150,7 @@ try {
     async createsEventTypesOnBoot(types, client, boot) {
         assertRanBeforeEach(this);
         await (boot === null || boot === void 0 ? void 0 : boot());
-        test_1.assert.isTruthy(
+        test_utils_1.assert.isTruthy(
         //@ts-ignore
         client.auth.skill, `You gotta be logged in as a skill! Try 'const { client } = await this.skills.loginAsCurrentSkill()'`);
         const typeSlugs = types.map((t) => (typeof t === 'string' ? t : t.typeSlug));
@@ -169,7 +169,7 @@ try {
                 shouldShowOnlyMine: true,
             },
         });
-        test_1.assert.isAbove(calendarEventTypes.length, 0, `No event types were created. Make sure you are listening to the 'did-boot' event and booted. Use 'spruce create.listener' and look under Skill (or await this.bootSkill()). Then, drop in something like this:\n\n
+        test_utils_1.assert.isAbove(calendarEventTypes.length, 0, `No event types were created. Make sure you are listening to the 'did-boot' event and booted. Use 'spruce create.listener' and look under Skill (or await this.bootSkill()). Then, drop in something like this:\n\n
 await client.emitAndFlattenResponses('calendar.create-calendar-event-type::v2021_05_19', {
 	payload: {
 		name: '${typeSlugs[0]}',
@@ -182,7 +182,7 @@ await client.emitAndFlattenResponses('calendar.create-calendar-event-type::v2021
             viewControllerId: cet.viewControllerId,
         }))
             .sort(sort);
-        test_1.assert.isEqualDeep(normalizedActual, normalizedExpected, 'The event types I was found were not created as expected.');
+        test_utils_1.assert.isEqualDeep(normalizedActual, normalizedExpected, 'The event types I was found were not created as expected.');
     },
     async createsEventTypesWithMultipleBoots(types, client, boot) {
         await this.createsEventTypesOnBoot(types, client, boot);
@@ -204,20 +204,20 @@ await client.emitAndFlattenResponses('calendar.create-calendar-event-type::v2021
         });
         calendarVc.setDefaultControllerForEvents(event.id);
         const vc = calendarVc.getEventVc(event.id);
-        test_1.assert.isFunction(vc.getToolBeltState, `Bad event vc. You need to make sure your event vc extends and implements what it needs to! Try:
+        test_utils_1.assert.isFunction(vc.getToolBeltState, `Bad event vc. You need to make sure your event vc extends and implements what it needs to! Try:
 
 class MyEventViewController
 	extends AbstractCalendarEventViewController
 	implements EventWithToolBeltState`);
         const state = vc.getToolBeltState();
-        test_1.assert.isTrue(state instanceof ToolBeltClass, `Your event vc did not return the state I expected. Make sure getToolBeltState() is returning an instance of ${ToolBeltClass.name}.`);
+        test_utils_1.assert.isTrue(state instanceof ToolBeltClass, `Your event vc did not return the state I expected. Make sure getToolBeltState() is returning an instance of ${ToolBeltClass.name}.`);
     },
     async stateFetchesAndRendersRemoteTools(options) {
         assertRanBeforeEach(this);
         const { views, state } = (0, schema_1.assertOptions)(options, ['state', 'views']);
-        const event = Object.assign(Object.assign({}, heartwood_view_controllers_1.calendarSeeder.generateEventValues()), { eventTypeSlug: (0, test_utils_1.generateId)() });
+        const event = Object.assign(Object.assign({}, heartwood_view_controllers_1.calendarSeeder.generateEventValues()), { eventTypeSlug: (0, test_utils_2.generateId)() });
         const org = await views.getScope().getCurrentOrganization();
-        test_1.assert.isTruthy(org, `You gotta @seed('organizations', 1) to test fetching and rendering remote tools.`);
+        test_utils_1.assert.isTruthy(org, `You gotta @seed('organizations', 1) to test fetching and rendering remote tools.`);
         let passedTargetAndPayload;
         const VC_NAME_1 = 'calendars.test-one';
         const VC_NAME_2 = 'calendars.test-two';
@@ -236,19 +236,19 @@ class MyEventViewController
         const { toolBeltVc, stateMachine } = await CalendarToolBeltStateMachineTestFactory_1.default.StateMachine(views);
         await stateMachine.updateContext({ event });
         await stateMachine.transitionTo(state);
-        test_1.assert.isTruthy(passedTargetAndPayload, `You aren't emitting 'calendar.register-event-tools::v2021_05_19'. 
+        test_utils_1.assert.isTruthy(passedTargetAndPayload, `You aren't emitting 'calendar.register-event-tools::v2021_05_19'. 
 			
 Try adding the following to your state's load():
 			
 const tools = new CalendarToolRegistrar(stateMachine)
 await tools.fetchAndAddCards()
 `);
-        test_1.assert.isEqualDeep(passedTargetAndPayload.target, { organizationId: org.id, calendarEventId: event.id }, `Your target is not what is expected! Make sure you are sending organizationId and calendarEventId`);
-        test_1.assert.isEqualDeep(passedTargetAndPayload.payload, {
+        test_utils_1.assert.isEqualDeep(passedTargetAndPayload.target, { organizationId: org.id, calendarEventId: event.id }, `Your target is not what is expected! Make sure you are sending organizationId and calendarEventId`);
+        test_utils_1.assert.isEqualDeep(passedTargetAndPayload.payload, {
             eventTypeSlug: event.eventTypeSlug,
         }, `Your payload does not what is expected! Make sure you pass through eventTypeSlug.`);
         const tools = toolBeltVc.getTools();
-        test_1.assert.isAbove(tools.length, 0, `It looks like you didn't add any tools to the tool belt! try sm.getToolBeltVc().addTool()`);
+        test_utils_1.assert.isAbove(tools.length, 0, `It looks like you didn't add any tools to the tool belt! try sm.getToolBeltVc().addTool()`);
         const results = [];
         for (let c = 0; c < vcIds.length; c++) {
             const id = vcIds[c];
@@ -257,22 +257,22 @@ await tools.fetchAndAddCards()
                 toolId: id,
                 Class: Classes[c],
             });
-            test_1.assert.isTruthy(tool, `You didn't add the tools I expected! Make sure you are using the CalendarToolRegistrar!`);
+            test_utils_1.assert.isTruthy(tool, `You didn't add the tools I expected! Make sure you are using the CalendarToolRegistrar!`);
         }
         return results;
     },
     async toolBeltStateProperlyInheritsAbstractToolBeltState(stateMachine, state) {
         assertRanBeforeEach(this);
         (0, schema_1.assertOptions)({ stateMachine, state }, ['stateMachine', 'state']);
-        test_1.assert.isTrue(state instanceof AbstractCalendarEventToolBeltState_1.default, `Your state does not extend 'AbstractCalendarEventToolBeltState'. Make sure you do that next!`);
+        test_utils_1.assert.isTrue(state instanceof AbstractCalendarEventToolBeltState_1.default, `Your state does not extend 'AbstractCalendarEventToolBeltState'. Make sure you do that next!`);
         await stateMachine.transitionTo(state);
-        test_1.assert.isTruthy(state.getIsLoaded(), `You need to call super.load(stateMachine) in your state!`);
+        test_utils_1.assert.isTruthy(state.getIsLoaded(), `You need to call super.load(stateMachine) in your state!`);
         await stateMachine.on('did-update-context', () => { });
         const originalListenCount = stateMachine.listenCount('did-update-context');
         await state.destroy();
         const count = stateMachine.listenCount('did-update-context');
-        test_1.assert.isAbove(count, originalListenCount - 2, `You 'sm.off(...)'ed too many listeners, make sure you pass the callback to remove to 'this.sm.off(...)'. It's the second param.`);
-        test_1.assert.isEqual(count, originalListenCount - 1, `Don't forget to remove all listeners to the stateMachine. Either implement 'destroy()' and call 'this.sm.off(...)' or try 'await super.destroy()' in your state.`);
+        test_utils_1.assert.isAbove(count, originalListenCount - 2, `You 'sm.off(...)'ed too many listeners, make sure you pass the callback to remove to 'this.sm.off(...)'. It's the second param.`);
+        test_utils_1.assert.isEqual(count, originalListenCount - 1, `Don't forget to remove all listeners to the stateMachine. Either implement 'destroy()' and call 'this.sm.off(...)' or try 'await super.destroy()' in your state.`);
     },
     async toolBeltStateAddsTool(options) {
         const { state, toolId, views, Class } = (0, schema_1.assertOptions)(options, [
@@ -282,10 +282,10 @@ await tools.fetchAndAddCards()
         ]);
         const { toolBeltVc, stateMachine } = await CalendarToolBeltStateMachineTestFactory_1.default.StateMachine(views);
         await stateMachine.transitionTo(state);
-        test_1.assert.isTruthy(toolBeltVc.getTool(toolId), `I could not find the tool with the id '${toolId}', try 'this.addTool(...)' from inside your state!`);
+        test_utils_1.assert.isTruthy(toolBeltVc.getTool(toolId), `I could not find the tool with the id '${toolId}', try 'this.addTool(...)' from inside your state!`);
         //@ts-ignore
         const match = state.vcs.find((o) => o.toolId === toolId);
-        test_1.assert.isTruthy(match, `It looks like you added your tool directly to the toolBeltVc instead of to your parent class. 'this.addTool(...)'`);
+        test_utils_1.assert.isTruthy(match, `It looks like you added your tool directly to the toolBeltVc instead of to your parent class. 'this.addTool(...)'`);
         if (Class) {
             heartwood_view_controllers_1.vcAssert.assertToolInstanceOf(toolBeltVc, toolId, Class);
         }
@@ -302,7 +302,7 @@ async function fakeEventTypeEvents(eventTypes) {
         };
     });
     await spruce_test_fixtures_1.eventFaker.on('calendar.create-calendar-event-type::v2021_05_19', ({ payload, source }) => {
-        const type = Object.assign({ id: (0, test_utils_1.generateId)(), source: source, viewControllerId: null }, payload);
+        const type = Object.assign({ id: (0, test_utils_2.generateId)(), source: source, viewControllerId: null }, payload);
         eventTypes.push(type);
         return {
             calendarEventType: type,
@@ -316,7 +316,7 @@ async function fakeEventTypeEvents(eventTypes) {
                 calendarEventType: match,
             };
         }
-        const type = Object.assign({ id: (0, test_utils_1.generateId)(), source: source, viewControllerId: null, slug: target.slug }, payload);
+        const type = Object.assign({ id: (0, test_utils_2.generateId)(), source: source, viewControllerId: null, slug: target.slug }, payload);
         eventTypes.push(type);
         return {
             calendarEventType: type,
@@ -326,8 +326,8 @@ async function fakeEventTypeEvents(eventTypes) {
 async function fakeCalendarEvents(calendars) {
     await spruce_test_fixtures_1.eventFaker.on('calendar.create-calendar::v2021_05_19', ({ payload, source, target }) => {
         const matches = calendars.filter((c) => c.slug === payload.slug);
-        test_1.assert.isLength(matches, 0, `You already created a calendar the slug: ${payload.slug}!`);
-        const calendar = Object.assign({ id: (0, test_utils_1.generateId)(), source: source, target }, payload);
+        test_utils_1.assert.isLength(matches, 0, `You already created a calendar the slug: ${payload.slug}!`);
+        const calendar = Object.assign({ id: (0, test_utils_2.generateId)(), source: source, target }, payload);
         calendars.push(calendar);
         return { calendar };
     });
@@ -340,7 +340,7 @@ async function fakeCalendarEvents(calendars) {
     });
 }
 function assertRanBeforeEach(me) {
-    test_1.assert.isTrue(
+    test_utils_1.assert.isTrue(
     //@ts-ignore
     me._didBeforeEach, `You gotta add 'await calendarSkillAssert.beforeEach(...)' to the beforeEach() of your test.`);
 }

package/build/esm/__tests__/support/utilities/calendarAssert.js

@@ -1,6 +1,6 @@
 import { dateUtil } from '@sprucelabs/calendar-utils';
 import { renderUtil, } from '@sprucelabs/heartwood-view-controllers';
-import { assert, assertUtil } from '@sprucelabs/test';
+import { assert, assertUtil } from '@sprucelabs/test-utils';
 import clone from 'just-clone';
 const calendarAssert = {
     rendersTotalEvents(vc, expected) {

package/build/esm/__tests__/support/utilities/calendarSkillAssert.js

@@ -11,7 +11,7 @@ import { calendarSeeder, CardViewControllerImpl, vcAssert, } from '@sprucelabs/h
 import { assertOptions } from '@sprucelabs/schema';
 import { AuthService } from '@sprucelabs/spruce-skill-utils';
 import { eventFaker } from '@sprucelabs/spruce-test-fixtures';
-import { assert } from '@sprucelabs/test';
+import { assert } from '@sprucelabs/test-utils';
 import { generateId } from '@sprucelabs/test-utils';
 import AbstractCalendarEventToolBeltState from '../../../toolBelt/states/AbstractCalendarEventToolBeltState.js';
 import CalendarViewController from '../../../viewControllers/Calendar.vc.js';

package/build/esm/toolBelt/CalendarToolTestFactory.js

@@ -1,5 +1,5 @@
 import { assertOptions, SchemaError } from '@sprucelabs/schema';
-import { assert } from '@sprucelabs/test';
+import { assert } from '@sprucelabs/test-utils';
 import clone from 'just-clone';
 export default class CalendarToolTestFactory {
     static Tool(stateMachine, vcId, options) {

package/build/toolBelt/CalendarToolTestFactory.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const schema_1 = require("@sprucelabs/schema");
-const test_1 = require("@sprucelabs/test");
+const test_utils_1 = require("@sprucelabs/test-utils");
 const just_clone_1 = __importDefault(require("just-clone"));
 class CalendarToolTestFactory {
     static Tool(stateMachine, vcId, options) {
@@ -27,7 +27,7 @@ class CalendarToolTestFactory {
         void stateMachine.on('did-update-context', () => {
             return vc.handleUpdateContext(stateMachine.getContext());
         });
-        test_1.assert.isFunction(vc.handleUpdateContext, `You need to make sure your card view controller implements the CalendarTool interface!`);
+        test_utils_1.assert.isFunction(vc.handleUpdateContext, `You need to make sure your card view controller implements the CalendarTool interface!`);
         return vc;
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sprucelabs/spruce-calendar-components",
   "description": "Calendar components for working with calendars and Sprucebot.",
-  "version": "22.8.12",
+  "version": "22.8.13",
   "skill": {
     "namespace": "calendar"
   },
@@ -179,7 +179,7 @@
     "@sprucelabs/mercury-client": "latest",
     "@sprucelabs/schema": "latest",
     "@sprucelabs/spruce-skill-utils": "latest",
-    "@sprucelabs/test": "latest",
+    "@sprucelabs/test-utils": "latest",
     "@sprucelabs/data-stores": "latest",
     "@sprucelabs/calendar-utils": "latest",
     "@sprucelabs/heartwood-view-controllers": "latest",