Skip to content

Commit e3abd35

Browse files
fix: upgrade prismock to 1.33.4 (#17735)
* upgrade prismock, removed 2 hacks, update 3 tests * yarnlock changes
1 parent dfdb04a commit e3abd35

File tree

4 files changed

+95
-238
lines changed

4 files changed

+95
-238
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
"node-gyp": "^10.2.0",
106106
"node-ical": "^0.16.1",
107107
"prettier": "^2.8.6",
108-
"prismock": "^1.21.1",
108+
"prismock": "^1.33.4",
109109
"resize-observer-polyfill": "^1.5.1",
110110
"tsc-absolute": "^1.0.0",
111111
"typescript": "^4.9.4",

packages/features/ee/workflows/lib/test/workflows.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ describe("scheduleBookingReminders", () => {
443443
];
444444

445445
scheduledWorkflowReminders.forEach((reminder, index) => {
446-
expect(expectedScheduledDates[index]).toStrictEqual(reminder.scheduledDate);
446+
expect(expectedScheduledDates[index].toISOString()).toStrictEqual(reminder.scheduledDate.toISOString());
447447
expect(reminder.method).toBe(WorkflowMethods.EMAIL);
448448
if (index < 2) {
449449
expect(reminder.scheduled).toBe(true);
@@ -527,7 +527,7 @@ describe("scheduleBookingReminders", () => {
527527
];
528528

529529
scheduledWorkflowReminders.forEach((reminder, index) => {
530-
expect(expectedScheduledDates[index]).toStrictEqual(reminder.scheduledDate);
530+
expect(expectedScheduledDates[index].toISOString()).toStrictEqual(reminder.scheduledDate.toISOString());
531531
expect(reminder.method).toBe(WorkflowMethods.EMAIL);
532532
if (index < 2) {
533533
expect(reminder.scheduled).toBe(true);
@@ -662,7 +662,7 @@ describe("scheduleBookingReminders", () => {
662662
];
663663

664664
scheduledWorkflowReminders.forEach((reminder, index) => {
665-
expect(expectedScheduledDates[index]).toStrictEqual(reminder.scheduledDate);
665+
expect(expectedScheduledDates[index].toISOString()).toStrictEqual(reminder.scheduledDate.toISOString());
666666
expect(reminder.method).toBe(WorkflowMethods.SMS);
667667
if (index < 2) {
668668
expect(reminder.scheduled).toBe(true);

tests/libs/__mocks__/prisma.ts

-30
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,7 @@ vi.mock("@calcom/prisma", () => ({
1212
}));
1313

1414
const handlePrismockBugs = () => {
15-
const __updateBooking = prismock.booking.update;
16-
const __findFirstOrThrowBooking = prismock.booking.findFirstOrThrow;
1715
const __findManyWebhook = prismock.webhook.findMany;
18-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
19-
prismock.booking.update = (...rest: any[]) => {
20-
// There is a bug in prismock where it considers `createMany` and `create` itself to have the data directly
21-
// In booking flows, we encounter such scenario, so let's fix that here directly till it's fixed in prismock
22-
if (rest[0].data.references?.createMany) {
23-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
24-
// @ts-ignore
25-
rest[0].data.references.createMany = rest[0].data.references?.createMany.data;
26-
logger.silly("Fixed Prismock bug");
27-
}
28-
if (rest[0].data.references?.create) {
29-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
30-
// @ts-ignore
31-
rest[0].data.references.create = rest[0].data.references?.create.data;
32-
logger.silly("Fixed Prismock bug-1");
33-
}
34-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
35-
// @ts-ignore
36-
return __updateBooking(...rest);
37-
};
38-
39-
prismock.booking.findFirstOrThrow = (...rest: any[]) => {
40-
const { where } = rest[0];
41-
delete where.NOT;
42-
logger.silly("Fixed Prismock bug with using NOT in where clause");
43-
44-
return __findFirstOrThrowBooking(...rest);
45-
};
4616

4717
// eslint-disable-next-line @typescript-eslint/no-explicit-any
4818
prismock.webhook.findMany = (...rest: any[]) => {

0 commit comments

Comments
 (0)