vynte-infra/calendar
2
0
Fork 0
Code Issues Pull Requests Actions 2.0k Packages Projects Releases Wiki Activity

fix: upgrade prismock to 1.33.4 (#17735)

Browse Source 
* upgrade prismock, removed 2 hacks, update 3 tests

* yarnlock changes
This commit is contained in:
Vijay
2024-11-19 23:20:27 +00:00
committed by GitHub
parent dfdb04acf4
commit e3abd35ba7
4 changed files with 95 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -105,7 +105,7 @@
"node-gyp": "^10.2.0",
"node-ical": "^0.16.1",
"prettier": "^2.8.6",
"prismock": "^1.21.1",
"prismock": "^1.33.4",
"resize-observer-polyfill": "^1.5.1",
"tsc-absolute": "^1.0.0",
"typescript": "^4.9.4",
packages/features/ee/workflows/lib/test/workflows.test.ts
+3 -3
View File
@@ -443,7 +443,7 @@ describe("scheduleBookingReminders", () => {
];
scheduledWorkflowReminders.forEach((reminder, index) => {
expect(expectedScheduledDates[index]).toStrictEqual(reminder.scheduledDate);
expect(expectedScheduledDates[index].toISOString()).toStrictEqual(reminder.scheduledDate.toISOString());
expect(reminder.method).toBe(WorkflowMethods.EMAIL);
if (index < 2) {
expect(reminder.scheduled).toBe(true);
@@ -527,7 +527,7 @@ describe("scheduleBookingReminders", () => {
];
scheduledWorkflowReminders.forEach((reminder, index) => {
expect(expectedScheduledDates[index]).toStrictEqual(reminder.scheduledDate);
expect(expectedScheduledDates[index].toISOString()).toStrictEqual(reminder.scheduledDate.toISOString());
expect(reminder.method).toBe(WorkflowMethods.EMAIL);
if (index < 2) {
expect(reminder.scheduled).toBe(true);
@@ -662,7 +662,7 @@ describe("scheduleBookingReminders", () => {
];
scheduledWorkflowReminders.forEach((reminder, index) => {
expect(expectedScheduledDates[index]).toStrictEqual(reminder.scheduledDate);
expect(expectedScheduledDates[index].toISOString()).toStrictEqual(reminder.scheduledDate.toISOString());
expect(reminder.method).toBe(WorkflowMethods.SMS);
if (index < 2) {
expect(reminder.scheduled).toBe(true);
tests/libs/__mocks__/prisma.ts
-30
View File
@@ -12,37 +12,7 @@ vi.mock("@calcom/prisma", () => ({
}));
const handlePrismockBugs = () => {
const __updateBooking = prismock.booking.update;
const __findFirstOrThrowBooking = prismock.booking.findFirstOrThrow;
const __findManyWebhook = prismock.webhook.findMany;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
prismock.booking.update = (...rest: any[]) => {
// There is a bug in prismock where it considers `createMany` and `create` itself to have the data directly
// In booking flows, we encounter such scenario, so let's fix that here directly till it's fixed in prismock
if (rest[0].data.references?.createMany) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
rest[0].data.references.createMany = rest[0].data.references?.createMany.data;
logger.silly("Fixed Prismock bug");
}
if (rest[0].data.references?.create) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
rest[0].data.references.create = rest[0].data.references?.create.data;
logger.silly("Fixed Prismock bug-1");
}
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
return __updateBooking(...rest);
};
prismock.booking.findFirstOrThrow = (...rest: any[]) => {
const { where } = rest[0];
delete where.NOT;
logger.silly("Fixed Prismock bug with using NOT in where clause");
return __findFirstOrThrowBooking(...rest);
};
// eslint-disable-next-line @typescript-eslint/no-explicit-any
prismock.webhook.findMany = (...rest: any[]) => {
yarn.lock
+91 -204
View File
@@ -84,21 +84,6 @@ __metadata:
languageName: node
linkType: hard
"@antfu/ni@npm:0.21.5":
version: 0.21.5
resolution: "@antfu/ni@npm:0.21.5"
bin:
na: bin/na.mjs
nci: bin/nci.mjs
ni: bin/ni.mjs
nlx: bin/nlx.mjs
nr: bin/nr.mjs
nu: bin/nu.mjs
nun: bin/nun.mjs
checksum: 9d5e04faa5096c94141870cc5b7f46d89e60d615e81765f788651235767ac6b86c6dd89bb709ac7a86fe9ded471fa549f04dd4dcdb121f2c492c9fd85200d0bc
languageName: node
linkType: hard
"@antfu/ni@npm:0.21.8":
version: 0.21.8
resolution: "@antfu/ni@npm:0.21.8"
@@ -10141,17 +10126,6 @@ __metadata:
languageName: node
linkType: hard
"@prisma/debug@npm:5.1.1":
version: 5.1.1
resolution: "@prisma/debug@npm:5.1.1"
dependencies:
"@types/debug": 4.1.8
debug: 4.3.4
strip-ansi: 6.0.1
checksum: ab073c70aac7f8240b70c6021b7f46b34a0bbbe6a220fe503cd34bfd6c7b9890916f42c6bc7b7345a3225f8ea9d9744064e716fe39fb2d40e44c752689ee3415
languageName: node
linkType: hard
"@prisma/debug@npm:5.11.0":
version: 5.11.0
resolution: "@prisma/debug@npm:5.11.0"
@@ -10159,6 +10133,13 @@ __metadata:
languageName: node
linkType: hard
"@prisma/debug@npm:5.21.1":
version: 5.21.1
resolution: "@prisma/debug@npm:5.21.1"
checksum: f329c4fa6f317d6f1c42f07402a51c20435d206d152f66a0021b3aaa014e2c0199fcbdb25f9131bbb9c2e266ea2f81c0c318d2db9e42ae134184141011084bb7
languageName: node
linkType: hard
"@prisma/debug@npm:5.3.1":
version: 5.3.1
resolution: "@prisma/debug@npm:5.3.1"
@@ -10188,6 +10169,13 @@ __metadata:
languageName: node
linkType: hard
"@prisma/engines-version@npm:5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36":
version: 5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36
resolution: "@prisma/engines-version@npm:5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36"
checksum: 8ec736023d458a44657b05c1502993f143cdb604fd8a49bc3fb5d03ddf265ebeeab217f2a45bbf2400c4c4f58c5a3c7e726523079523e37c541defcf4be188f2
languageName: node
linkType: hard
"@prisma/engines-version@npm:5.4.1-2.ac9d7041ed77bcc8a8dbd2ab6616b39013829574":
version: 5.4.1-2.ac9d7041ed77bcc8a8dbd2ab6616b39013829574
resolution: "@prisma/engines-version@npm:5.4.1-2.ac9d7041ed77bcc8a8dbd2ab6616b39013829574"
@@ -10195,13 +10183,6 @@ __metadata:
languageName: node
linkType: hard
"@prisma/engines@npm:5.1.1":
version: 5.1.1
resolution: "@prisma/engines@npm:5.1.1"
checksum: 561c85def110279eb7c764e7c1ea1f8f54d9a2948ed5e5db9b11321c2bef362d178b756e39e7e022ee27cb2be5ac8d9b835967ce341ad8f6a1e8502f988140ee
languageName: node
linkType: hard
"@prisma/engines@npm:5.11.0":
version: 5.11.0
resolution: "@prisma/engines@npm:5.11.0"
@@ -10214,6 +10195,18 @@ __metadata:
languageName: node
linkType: hard
"@prisma/engines@npm:5.21.1":
version: 5.21.1
resolution: "@prisma/engines@npm:5.21.1"
dependencies:
"@prisma/debug": 5.21.1
"@prisma/engines-version": 5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36
"@prisma/fetch-engine": 5.21.1
"@prisma/get-platform": 5.21.1
checksum: 4b184f88aa4324819a1aa4ff0f4f4e1c8d89b5290070c778585cbd90d8d71a4a41d7322d773a4f09a324bb7fc59e2182f9c35374c420571088bf91891f9642a8
languageName: node
linkType: hard
"@prisma/engines@npm:5.3.1":
version: 5.3.1
resolution: "@prisma/engines@npm:5.3.1"
@@ -10237,31 +10230,6 @@ __metadata:
languageName: node
linkType: hard
"@prisma/fetch-engine@npm:5.1.1":
version: 5.1.1
resolution: "@prisma/fetch-engine@npm:5.1.1"
dependencies:
"@prisma/debug": 5.1.1
"@prisma/get-platform": 5.1.1
execa: 5.1.1
find-cache-dir: 3.3.2
fs-extra: 11.1.1
hasha: 5.2.2
http-proxy-agent: 7.0.0
https-proxy-agent: 7.0.1
kleur: 4.1.5
node-fetch: 2.6.12
p-filter: 2.1.0
p-map: 4.0.0
p-retry: 4.6.2
progress: 2.0.3
rimraf: 3.0.2
temp-dir: 2.0.0
tempy: 1.0.1
checksum: 7a98c05f8417183fcc211d94dc004dab425887c49199c20b277e487f66b2882039da31cb946dcd41e0fc78a47c298760f31f446883592027270627f7b83ce016
languageName: node
linkType: hard
"@prisma/fetch-engine@npm:5.11.0":
version: 5.11.0
resolution: "@prisma/fetch-engine@npm:5.11.0"
@@ -10273,6 +10241,17 @@ __metadata:
languageName: node
linkType: hard
"@prisma/fetch-engine@npm:5.21.1":
version: 5.21.1
resolution: "@prisma/fetch-engine@npm:5.21.1"
dependencies:
"@prisma/debug": 5.21.1
"@prisma/engines-version": 5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36
"@prisma/get-platform": 5.21.1
checksum: b3d816545a261ee486d5b0b43d22474e49110a70bb7f4cdf1dd8177e7ccfc6ba9c9e9172ded4a806e545e8bdded049fd37da92878e3b5087017c98b30516a56e
languageName: node
linkType: hard
"@prisma/fetch-engine@npm:5.3.1":
version: 5.3.1
resolution: "@prisma/fetch-engine@npm:5.3.1"
@@ -10298,15 +10277,12 @@ __metadata:
languageName: node
linkType: hard
"@prisma/generator-helper@npm:5.1.1":
version: 5.1.1
resolution: "@prisma/generator-helper@npm:5.1.1"
"@prisma/generator-helper@npm:5.21.1":
version: 5.21.1
resolution: "@prisma/generator-helper@npm:5.21.1"
dependencies:
"@prisma/debug": 5.1.1
"@types/cross-spawn": 6.0.2
cross-spawn: 7.0.3
kleur: 4.1.5
checksum: e576e0396031e0f90442c5fd37c0ee13894d03d89d4d9c572e787268156fcda960a969773c37030f3d66271c56424c34c988ac15c75be5dde5f71c6be7266bf6
"@prisma/debug": 5.21.1
checksum: b403ca030af3d5a91ec527b8c6cfbe4a08a5b0f21f1049dbcc34db754a3e6fe66b47a569d09ed6f128e299252247b6fbc49ec04cef15fd5bf8b594746e0565f2
languageName: node
linkType: hard
@@ -10346,24 +10322,6 @@ __metadata:
languageName: node
linkType: hard
"@prisma/get-platform@npm:5.1.1":
version: 5.1.1
resolution: "@prisma/get-platform@npm:5.1.1"
dependencies:
"@prisma/debug": 5.1.1
escape-string-regexp: 4.0.0
execa: 5.1.1
fs-jetpack: 5.1.0
kleur: 4.1.5
replace-string: 3.1.0
strip-ansi: 6.0.1
tempy: 1.0.1
terminal-link: 2.1.1
ts-pattern: 4.3.0
checksum: 9d94496b3acec6553331016e92519b692ad60994a33bc1e3b3fe9758d606b0741b846d6ed99fb164fb7d59912a844f15ce6f46cb29b20ca0ce6c8e9db54d91aa
languageName: node
linkType: hard
"@prisma/get-platform@npm:5.11.0":
version: 5.11.0
resolution: "@prisma/get-platform@npm:5.11.0"
@@ -10373,6 +10331,15 @@ __metadata:
languageName: node
linkType: hard
"@prisma/get-platform@npm:5.21.1":
version: 5.21.1
resolution: "@prisma/get-platform@npm:5.21.1"
dependencies:
"@prisma/debug": 5.21.1
checksum: d53edfd9cac8a55fa1b8fbf55c3f0d87c52f695904b936985cf14e25853a2e74b79c35a370e3f36135185ffb589cc7aa98cefc22193e6783bb995b1a91e26d00
languageName: node
linkType: hard
"@prisma/get-platform@npm:5.3.1":
version: 5.3.1
resolution: "@prisma/get-platform@npm:5.3.1"
@@ -10413,53 +10380,20 @@ __metadata:
languageName: node
linkType: hard
"@prisma/internals@npm:5.1.1":
version: 5.1.1
resolution: "@prisma/internals@npm:5.1.1"
"@prisma/internals@npm:5.21.1":
version: 5.21.1
resolution: "@prisma/internals@npm:5.21.1"
dependencies:
"@antfu/ni": 0.21.5
"@opentelemetry/api": 1.4.1
"@prisma/debug": 5.1.1
"@prisma/engines": 5.1.1
"@prisma/fetch-engine": 5.1.1
"@prisma/generator-helper": 5.1.1
"@prisma/get-platform": 5.1.1
"@prisma/prisma-schema-wasm": 5.1.1-1.6a3747c37ff169c90047725a05a6ef02e32ac97e
archiver: 5.3.1
"@prisma/debug": 5.21.1
"@prisma/engines": 5.21.1
"@prisma/fetch-engine": 5.21.1
"@prisma/generator-helper": 5.21.1
"@prisma/get-platform": 5.21.1
"@prisma/prisma-schema-wasm": 5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36
"@prisma/schema-files-loader": 5.21.1
arg: 5.0.2
checkpoint-client: 1.1.27
cli-truncate: 2.1.0
dotenv: 16.0.3
escape-string-regexp: 4.0.0
execa: 5.1.1
find-up: 5.0.0
fp-ts: 2.16.0
fs-extra: 11.1.1
fs-jetpack: 5.1.0
global-dirs: 3.0.1
globby: 11.1.0
indent-string: 4.0.0
is-windows: 1.0.2
is-wsl: 2.2.0
kleur: 4.1.5
new-github-issue-url: 0.2.1
node-fetch: 2.6.12
npm-packlist: 5.1.3
open: 7.4.2
p-map: 4.0.0
prompts: 2.4.2
read-pkg-up: 7.0.1
replace-string: 3.1.0
resolve: 1.22.2
string-width: 4.2.3
strip-ansi: 6.0.1
strip-indent: 3.0.0
temp-dir: 2.0.0
tempy: 1.0.1
terminal-link: 2.1.1
tmp: 0.2.1
ts-pattern: 4.3.0
checksum: 6c6059ed996e333a925c1ca650a7f84f010494451355798ca76102ecd1e2d05218b6800f36448d94ac885c8b15f00903652e1398b300c53c9d2f53aac6fec515
checksum: 40b39d5ca450972af469966ced187b321ea9725c287b09186e0b7e3020be839a0b7d906ec6669ae141874ca322291f0a2adfca2389db532826d5df1fe9755ada
languageName: node
linkType: hard
@@ -10513,10 +10447,10 @@ __metadata:
languageName: node
linkType: hard
"@prisma/prisma-schema-wasm@npm:5.1.1-1.6a3747c37ff169c90047725a05a6ef02e32ac97e":
version: 5.1.1-1.6a3747c37ff169c90047725a05a6ef02e32ac97e
resolution: "@prisma/prisma-schema-wasm@npm:5.1.1-1.6a3747c37ff169c90047725a05a6ef02e32ac97e"
checksum: 72191fe2bc4ec28287ab0ea119506eb890b536cf1498b516f5576055489a9fec4853ba285408a05dfcb963076987ffd40088ac144a0d13d3377ca9971f94276e
"@prisma/prisma-schema-wasm@npm:5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36":
version: 5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36
resolution: "@prisma/prisma-schema-wasm@npm:5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36"
checksum: b7acfef54410f2ceb6aed3f162ddeb4964f5d18292026d3eaadf0da4f7a08993ff2ddd91975969d5fb72972e944867fba4ce0c23c5fa3d494e5e1bdcbcf08246
languageName: node
linkType: hard
@@ -10527,6 +10461,16 @@ __metadata:
languageName: node
linkType: hard
"@prisma/schema-files-loader@npm:5.21.1":
version: 5.21.1
resolution: "@prisma/schema-files-loader@npm:5.21.1"
dependencies:
"@prisma/prisma-schema-wasm": 5.21.1-1.bf0e5e8a04cada8225617067eaa03d041e2bba36
fs-extra: 11.1.1
checksum: 779884414ecef12657ec3198bc5ffa37c0f66014f4a7cf253613a77ab8ed8992565ecd7d3767b6161109952dbb61b2ad6bc3f4f62d6622c64e96c13853adcdb4
languageName: node
linkType: hard
"@protobufjs/aspromise@npm:^1.1.1, @protobufjs/aspromise@npm:^1.1.2":
version: 1.1.2
resolution: "@protobufjs/aspromise@npm:1.1.2"
@@ -18529,21 +18473,6 @@ __metadata:
languageName: node
linkType: hard
"archiver@npm:5.3.1":
version: 5.3.1
resolution: "archiver@npm:5.3.1"
dependencies:
archiver-utils: ^2.1.0
async: ^3.2.3
buffer-crc32: ^0.2.1
readable-stream: ^3.6.0
readdir-glob: ^1.0.0
tar-stream: ^2.2.0
zip-stream: ^4.1.0
checksum: 905b198ed04d26c951b80545d45c7f2e0432ef89977a93af8a762501d659886e39dda0fbffb0d517ff3fa450a3d09a29146e4273c2170624e1988f889fb5302c
languageName: node
linkType: hard
"archiver@npm:5.3.2":
version: 5.3.2
resolution: "archiver@npm:5.3.2"
@@ -20041,10 +19970,10 @@ __metadata:
languageName: node
linkType: hard
"bson@npm:6.1.0":
version: 6.1.0
resolution: "bson@npm:6.1.0"
checksum: 8250c8158c22d2a0ca0e7677c0cbef9fa6341c176382b835dbf4c7f8aebdfd74d530f7225c6f3b98ca78a68aab4f1ad3d2fad54160a98b3e6ed9823b80db2e48
"bson@npm:6.9.0":
version: 6.9.0
resolution: "bson@npm:6.9.0"
checksum: 42ba21fc6108c04a4ecc047a40f95f6fefd474365c8a8f00fb20fb0422187d54b17e08bdcbfb0c8d3fb153d3ba71a0f1b690b8edf954c3f731c8d7f50678a13b
languageName: node
linkType: hard
@@ -20330,7 +20259,7 @@ __metadata:
node-gyp: ^10.2.0
node-ical: ^0.16.1
prettier: ^2.8.6
prismock: ^1.21.1
prismock: ^1.33.4
resize-observer-polyfill: ^1.5.1
tsc-absolute: ^1.0.0
turbo: ^1.10.1
@@ -26335,13 +26264,6 @@ __metadata:
languageName: node
linkType: hard
"fp-ts@npm:2.16.0":
version: 2.16.0
resolution: "fp-ts@npm:2.16.0"
checksum: 0724a4d8b2171cc98e9d9a05e6fe7e0acbc8c79eaabe8e257cbe3a6a5a77acdbdd2572e2ca8135e91d6e02542237499db6e952a58829ba0796ab96063dd39eb2
languageName: node
linkType: hard
"fp-ts@npm:2.16.1":
version: 2.16.1
resolution: "fp-ts@npm:2.16.1"
@@ -28117,16 +28039,6 @@ __metadata:
languageName: node
linkType: hard
"https-proxy-agent@npm:7.0.1":
version: 7.0.1
resolution: "https-proxy-agent@npm:7.0.1"
dependencies:
agent-base: ^7.0.2
debug: 4
checksum: 2d765c31865071373771f53abdd72912567b76015a4eff61094f586194192950cd89257d50f0e621807a16c083bc8cad5852e3885c6ba154d2ce721a18fac248
languageName: node
linkType: hard
"https-proxy-agent@npm:7.0.2, https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
version: 7.0.2
resolution: "https-proxy-agent@npm:7.0.2"
@@ -29011,7 +28923,7 @@ __metadata:
languageName: node
linkType: hard
"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0":
"is-core-module@npm:^2.13.0":
version: 2.13.0
resolution: "is-core-module@npm:2.13.0"
dependencies:
@@ -36758,17 +36670,18 @@ __metadata:
languageName: node
linkType: hard
"prismock@npm:^1.21.1":
version: 1.21.1
resolution: "prismock@npm:1.21.1"
"prismock@npm:^1.33.4":
version: 1.33.4
resolution: "prismock@npm:1.33.4"
dependencies:
"@paralleldrive/cuid2": 2.2.2
"@prisma/generator-helper": 5.1.1
"@prisma/internals": 5.1.1
bson: 6.1.0
"@prisma/generator-helper": 5.21.1
"@prisma/internals": 5.21.1
bson: 6.9.0
peerDependencies:
"@prisma/client": "*"
checksum: d64211ea4167cf15ce4c8de5d8b6d2705250d984f3221470c6be970184fbec5eeaf33529da270b6c9466b12619e30a41392fe4d54fef3b7ffaaad3aff3c2d7d6
prisma: "*"
checksum: 199f13403ad739ed8be494d315ec627d141e14d17f8a99809c7f8814ad64b36ebd478526dac9b196b33a0d19569cfcb0805fae08e233da86451c75e8d60fbab3
languageName: node
linkType: hard
@@ -38337,7 +38250,7 @@ __metadata:
languageName: node
linkType: hard
"readdir-glob@npm:^1.0.0, readdir-glob@npm:^1.1.2":
"readdir-glob@npm:^1.1.2":
version: 1.1.3
resolution: "readdir-glob@npm:1.1.3"
dependencies:
@@ -38948,19 +38861,6 @@ __metadata:
languageName: node
linkType: hard
"resolve@npm:1.22.2":
version: 1.22.2
resolution: "resolve@npm:1.22.2"
dependencies:
is-core-module: ^2.11.0
path-parse: ^1.0.7
supports-preserve-symlinks-flag: ^1.0.0
bin:
resolve: bin/resolve
checksum: 7e5df75796ebd429445d102d5824482ee7e567f0070b2b45897b29bb4f613dcbc262e0257b8aeedb3089330ccaea0d6a0464df1a77b2992cf331dcda0f4cb549
languageName: node
linkType: hard
"resolve@npm:1.22.4":
version: 1.22.4
resolution: "resolve@npm:1.22.4"
@@ -39046,19 +38946,6 @@ __metadata:
languageName: node
linkType: hard
"resolve@patch:resolve@1.22.2#~builtin<compat/resolve>":
version: 1.22.2
resolution: "resolve@patch:resolve@npm%3A1.22.2#~builtin<compat/resolve>::version=1.22.2&hash=c3c19d"
dependencies:
is-core-module: ^2.11.0
path-parse: ^1.0.7
supports-preserve-symlinks-flag: ^1.0.0
bin:
resolve: bin/resolve
checksum: 66cc788f13b8398de18eb4abb3aed90435c84bb8935953feafcf7231ba4cd191b2c10b4a87b1e9681afc34fb138c705f91f7330ff90bfa36f457e5584076a2b8
languageName: node
linkType: hard
"resolve@patch:resolve@1.22.4#~builtin<compat/resolve>":
version: 1.22.4
resolution: "resolve@patch:resolve@npm%3A1.22.4#~builtin<compat/resolve>::version=1.22.4&hash=c3c19d"