From 3e17fa186c494c8555190bf5973e22f884b26b18 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 4 Mar 2025 17:08:20 +0000 Subject: [PATCH] Fix viewV2.spec.ts --- .../src/api/routes/tests/viewV2.spec.ts | 43 +++++++++++-------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts index d31b2038f2..153a25aca7 100644 --- a/packages/server/src/api/routes/tests/viewV2.spec.ts +++ b/packages/server/src/api/routes/tests/viewV2.spec.ts @@ -2826,35 +2826,42 @@ if (descriptions.length) { return total } - async function expectRowUsage( + async function expectRowUsage( expected: number, - f: () => Promise - ) { - const before = await getRowUsage() - await f() - const after = await getRowUsage() - const usage = after - before - expect(usage).toBe(expected) + f: () => Promise + ): Promise { + return await quotas.withEnabled(async () => { + const before = await getRowUsage() + const result = await f() + const after = await getRowUsage() + const usage = after - before + expect(usage).toBe(expected) + return result + }) } it("should be able to delete a row", async () => { - const createdRow = await config.api.row.save(table._id!, {}) - await expectRowUsage(isInternal ? 0 : -1, async () => { - await config.api.row.bulkDelete(view.id, { rows: [createdRow] }) - }) + const createdRow = await expectRowUsage(isInternal ? 1 : 0, () => + config.api.row.save(table._id!, {}) + ) + await expectRowUsage(isInternal ? -1 : 0, () => + config.api.row.bulkDelete(view.id, { rows: [createdRow] }) + ) await config.api.row.get(table._id!, createdRow._id!, { status: 404, }) }) it("should be able to delete multiple rows", async () => { - const rows = await Promise.all([ - config.api.row.save(table._id!, {}), - config.api.row.save(table._id!, {}), - config.api.row.save(table._id!, {}), - ]) + const rows = await expectRowUsage(isInternal ? 3 : 0, async () => { + return [ + await config.api.row.save(table._id!, {}), + await config.api.row.save(table._id!, {}), + await config.api.row.save(table._id!, {}), + ] + }) - await expectRowUsage(isInternal ? 0 : -2, async () => { + await expectRowUsage(isInternal ? -2 : 0, async () => { await config.api.row.bulkDelete(view.id, { rows: [rows[0], rows[2]], })