From 021667c7d90e1e901bef9ffdc78cc772dcfbacc9 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 4 Mar 2025 16:28:25 +0000 Subject: [PATCH] Fix viewV2.spec.ts --- .../src/api/routes/tests/viewV2.spec.ts | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts index 7eed1811d9..d31b2038f2 100644 --- a/packages/server/src/api/routes/tests/viewV2.spec.ts +++ b/packages/server/src/api/routes/tests/viewV2.spec.ts @@ -2826,16 +2826,22 @@ if (descriptions.length) { return total } - const assertRowUsage = async (expected: number) => { - const usage = await getRowUsage() + 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) } it("should be able to delete a row", async () => { const createdRow = await config.api.row.save(table._id!, {}) - const rowUsage = await getRowUsage() - await config.api.row.bulkDelete(view.id, { rows: [createdRow] }) - await assertRowUsage(isInternal ? rowUsage - 1 : rowUsage) + await expectRowUsage(isInternal ? 0 : -1, async () => { + await config.api.row.bulkDelete(view.id, { rows: [createdRow] }) + }) await config.api.row.get(table._id!, createdRow._id!, { status: 404, }) @@ -2847,14 +2853,13 @@ if (descriptions.length) { config.api.row.save(table._id!, {}), config.api.row.save(table._id!, {}), ]) - const rowUsage = await getRowUsage() - await config.api.row.bulkDelete(view.id, { - rows: [rows[0], rows[2]], + await expectRowUsage(isInternal ? 0 : -2, async () => { + await config.api.row.bulkDelete(view.id, { + rows: [rows[0], rows[2]], + }) }) - await assertRowUsage(isInternal ? rowUsage - 2 : rowUsage) - await config.api.row.get(table._id!, rows[0]._id!, { status: 404, })