test(db): run the notifications and advanced packing MCP suites on the real database module

They seed through the booted container's ORM instead of the SQLite snapshot
mock and reset through resetDatabase, so they run in the Postgres lane as
well. The tag notification case waits for the fire-and-forget row with
vi.waitFor instead of one turn of the event loop: on SQLite the insert
lands within that turn, on Postgres it needs a few round trips more.
This commit is contained in:
Maurice
2026-11-17 20:13:29 +01:00
parent 280e9ab0d9
commit fcddde71a7
4 changed files with 135 additions and 147 deletions
-2
View File
@@ -63,8 +63,6 @@
"tests/setup.ts": 1,
"tests/unit/auto-backup.test.ts": 1,
"tests/unit/db/database-lazy-open.test.ts": 1,
"tests/unit/mcp/tools-notifications.test.ts": 1,
"tests/unit/mcp/tools-packing-advanced.test.ts": 1,
"tests/unit/mcp/tools-prompts.test.ts": 1,
"tests/unit/nest/accommodations.service.test.ts": 1,
"tests/unit/nest/admin.service.test.ts": 1,
@@ -1,4 +1 @@
[
"tests/unit/mcp/tools-notifications.test.ts",
"tests/unit/mcp/tools-packing-advanced.test.ts"
]
[]
@@ -9,39 +9,32 @@
* harness here keeps withTools on (the resource is NOT registered by the
* legacy registerResources fan-out anymore).
*/
import { db as testDb } from '../../../src/db/database';
import { Notifications } from '../../../src/db/entities/Notifications.entity';
import { RealtimeService } from '../../../src/nest/realtime/realtime.service';
import { createUser } from '../../helpers/factories';
import { makeNotification } from '../../helpers/factories/notifications';
import { countRows, findRow, updateRows } from '../../helpers/factories/rows';
import { makeUser } from '../../helpers/factories/users';
import type { FakeRealtimeService } from '../../helpers/fake-realtime';
import { createMcpHarness, parseToolResult, parseResourceResult, type McpHarness } from '../../helpers/mcp-harness';
import { resetDatabase } from '../../helpers/reset-database';
import { bootTestApp } from '../../helpers/test-app';
import { resetTestDb } from '../../helpers/test-db';
import { createTestOrm, type TestOrm } from '../../helpers/test-orm';
import { MikroORM } from '@mikro-orm/core';
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
import { describe, it, expect, beforeAll, beforeEach, afterAll } from 'vitest';
vi.mock('../../../src/db/database', async () => {
const { createSnapshotTestDb, buildDbMock } = await import('../../helpers/db-mock');
return buildDbMock(createSnapshotTestDb());
});
let orm: TestOrm;
let orm: MikroORM;
beforeAll(async () => {
orm = await createTestOrm(testDb);
orm = (await bootTestApp()).get(MikroORM);
});
beforeEach(() => {
resetTestDb(testDb);
beforeEach(async () => {
await resetDatabase(orm);
delete process.env.DEMO_MODE;
});
afterAll(async () => {
await orm.close();
testDb.close();
await (await bootTestApp()).close();
});
// ---------------------------------------------------------------------------
@@ -88,7 +81,7 @@ async function withResourceHarness(userId: number, fn: (h: McpHarness) => Promis
describe('Tool: list_notifications', () => {
it('returns empty array initially', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({ name: 'list_notifications', arguments: {} });
const data = parseToolResult(result) as any;
@@ -97,7 +90,7 @@ describe('Tool: list_notifications', () => {
});
it('returns notifications when they exist', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await createNotification(user.id, { title_key: 'notif.first' });
await createNotification(user.id, { title_key: 'notif.second' });
await withHarness(user.id, async (h) => {
@@ -108,7 +101,7 @@ describe('Tool: list_notifications', () => {
});
it('returns only unread notifications when unread_only is true', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await createNotification(user.id);
const read = await createNotification(user.id);
await updateRows(orm, Notifications, { id: read.id }, { is_read: 1 });
@@ -126,7 +119,7 @@ describe('Tool: list_notifications', () => {
describe('Tool: get_unread_notification_count', () => {
it('returns 0 initially', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({ name: 'get_unread_notification_count', arguments: {} });
const data = parseToolResult(result) as any;
@@ -135,7 +128,7 @@ describe('Tool: get_unread_notification_count', () => {
});
it('returns 1 after inserting one unread notification', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await createNotification(user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({ name: 'get_unread_notification_count', arguments: {} });
@@ -151,7 +144,7 @@ describe('Tool: get_unread_notification_count', () => {
describe('Tool: mark_notification_read', () => {
it('flips is_read to 1 and returns success', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
const notif = await createNotification(user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
@@ -166,7 +159,7 @@ describe('Tool: mark_notification_read', () => {
});
it('returns isError for non-existent notification', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'mark_notification_read',
@@ -178,7 +171,7 @@ describe('Tool: mark_notification_read', () => {
it('blocks demo user', async () => {
process.env.DEMO_MODE = 'true';
const { user } = createUser(testDb, { email: 'demo@nomad.app' });
const { user } = await makeUser(orm, { email: 'demo@nomad.app' });
const notif = await createNotification(user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
@@ -196,7 +189,7 @@ describe('Tool: mark_notification_read', () => {
describe('Tool: mark_notification_unread', () => {
it('flips is_read to 0', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
const notif = await createNotification(user.id);
await updateRows(orm, Notifications, { id: notif.id }, { is_read: 1 });
await withHarness(user.id, async (h) => {
@@ -212,7 +205,7 @@ describe('Tool: mark_notification_unread', () => {
});
it('returns isError for non-existent notification', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'mark_notification_unread',
@@ -229,7 +222,7 @@ describe('Tool: mark_notification_unread', () => {
describe('Tool: mark_all_notifications_read', () => {
it('marks all notifications read and returns count', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await createNotification(user.id);
await createNotification(user.id);
await createNotification(user.id);
@@ -244,7 +237,7 @@ describe('Tool: mark_all_notifications_read', () => {
});
it('returns count 0 when nothing to mark', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({ name: 'mark_all_notifications_read', arguments: {} });
const data = parseToolResult(result) as any;
@@ -259,7 +252,7 @@ describe('Tool: mark_all_notifications_read', () => {
describe('Resource: trek://notifications/in-app', () => {
it('returns notifications list', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await createNotification(user.id, { title_key: 'notif.test' });
await withResourceHarness(user.id, async (h) => {
const result = await h.client.readResource({ uri: 'trek://notifications/in-app' });
@@ -271,7 +264,7 @@ describe('Resource: trek://notifications/in-app', () => {
});
it('returns empty notifications for user with none', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await withResourceHarness(user.id, async (h) => {
const result = await h.client.readResource({ uri: 'trek://notifications/in-app' });
const data = parseResourceResult(result) as any;
@@ -289,7 +282,7 @@ describe('Read state reaches every tab of the user', () => {
}
it('MCP-NOTIF-001: mark_notification_read and _unread send the row as it now reads, to every tab', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
const notif = await createNotification(user.id);
const sent = await userMessages();
await withHarness(user.id, async (h) => {
@@ -308,7 +301,7 @@ describe('Read state reaches every tab of the user', () => {
});
it('MCP-NOTIF-002: mark_all_notifications_read pings once when something changed, and not for nothing', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await createNotification(user.id);
const sent = await userMessages();
await withHarness(user.id, async (h) => {
@@ -319,8 +312,8 @@ describe('Read state reaches every tab of the user', () => {
});
it("MCP-NOTIF-003: marking somebody else's notification is refused and sends nothing to either user", async () => {
const { user: owner } = createUser(testDb);
const { user: stranger } = createUser(testDb);
const { user: owner } = await makeUser(orm);
const { user: stranger } = await makeUser(orm);
const notif = await createNotification(owner.id);
const sent = await userMessages();
await withHarness(stranger.id, async (h) => {
@@ -6,7 +6,6 @@
* bulk_import_packing. The basic item tools + scope/addon gating + resources
* live in tools-packing.test.ts.
*/
import { db as testDb } from '../../../src/db/database';
import { Notifications } from '../../../src/db/entities/Notifications.entity';
import { PackingBags } from '../../../src/db/entities/PackingBags.entity';
import { PackingCategoryAssignees } from '../../../src/db/entities/PackingCategoryAssignees.entity';
@@ -14,39 +13,35 @@ import { PackingItems } from '../../../src/db/entities/PackingItems.entity';
import { PackingTemplateCategories } from '../../../src/db/entities/PackingTemplateCategories.entity';
import { PackingTemplateItems } from '../../../src/db/entities/PackingTemplateItems.entity';
import { PackingTemplates } from '../../../src/db/entities/PackingTemplates.entity';
import { addTripMember, createUser, createAdmin, createTrip, createPackingItem } from '../../helpers/factories';
import { addPackingBagMembers, makePackingBag, makePackingItem } from '../../helpers/factories/packing';
import { countRows, findRow, insertRow } from '../../helpers/factories/rows';
import { addTripMember, makeTrip } from '../../helpers/factories/trips';
import { makeAdmin, makeUser } from '../../helpers/factories/users';
import { FakeRealtimeService } from '../../helpers/fake-realtime';
import { createMcpHarness, parseToolResult, type McpHarness } from '../../helpers/mcp-harness';
import { resetTestDb } from '../../helpers/test-db';
import { createTestOrm, type TestOrm } from '../../helpers/test-orm';
import { resetDatabase } from '../../helpers/reset-database';
import { bootTestApp } from '../../helpers/test-app';
import { MikroORM } from '@mikro-orm/core';
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
vi.mock('../../../src/db/database', async () => {
const { createSnapshotTestDb, buildDbMock } = await import('../../helpers/db-mock');
return buildDbMock(createSnapshotTestDb());
});
const realtime = new FakeRealtimeService();
const broadcastMock = realtime.broadcastMock;
let orm: TestOrm;
let orm: MikroORM;
beforeAll(async () => {
orm = await createTestOrm(testDb);
orm = (await bootTestApp(realtime)).get(MikroORM);
});
beforeEach(() => {
resetTestDb(testDb);
beforeEach(async () => {
await resetDatabase(orm);
broadcastMock.mockClear();
delete process.env.DEMO_MODE;
});
afterAll(async () => {
await orm.close();
testDb.close();
await (await bootTestApp(realtime)).close();
});
async function withHarness(userId: number, fn: (h: McpHarness) => Promise<void>) {
@@ -64,10 +59,10 @@ async function withHarness(userId: number, fn: (h: McpHarness) => Promise<void>)
describe('Tool: reorder_packing_items', () => {
it('reorders packing items and broadcasts', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const item1 = createPackingItem(testDb, trip.id, { name: 'Shirt' });
const item2 = createPackingItem(testDb, trip.id, { name: 'Pants' });
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
const item1 = await makePackingItem(orm, trip.id, { name: 'Shirt' });
const item2 = await makePackingItem(orm, trip.id, { name: 'Pants' });
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'reorder_packing_items',
@@ -80,10 +75,10 @@ describe('Tool: reorder_packing_items', () => {
});
it('returns access denied for non-member', async () => {
const { user } = createUser(testDb);
const { user: other } = createUser(testDb);
const trip = createTrip(testDb, other.id);
const item = createPackingItem(testDb, trip.id);
const { user } = await makeUser(orm);
const { user: other } = await makeUser(orm);
const trip = await makeTrip(orm, other.id);
const item = await makePackingItem(orm, trip.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'reorder_packing_items',
@@ -100,8 +95,8 @@ describe('Tool: reorder_packing_items', () => {
describe('Tool: list_packing_bags', () => {
it('returns empty array initially', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'list_packing_bags',
@@ -113,8 +108,8 @@ describe('Tool: list_packing_bags', () => {
});
it('returns bags that exist', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await makePackingBag(orm, trip.id, { name: 'Carry-on', color: '#ff0000' });
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
@@ -134,8 +129,8 @@ describe('Tool: list_packing_bags', () => {
describe('Tool: create_packing_bag', () => {
it('creates a bag and broadcasts', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'create_packing_bag',
@@ -151,8 +146,8 @@ describe('Tool: create_packing_bag', () => {
});
it('creates a bag with a weight limit (#2154)', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'create_packing_bag',
@@ -166,9 +161,9 @@ describe('Tool: create_packing_bag', () => {
});
it('returns access denied for non-member', async () => {
const { user } = createUser(testDb);
const { user: other } = createUser(testDb);
const trip = createTrip(testDb, other.id);
const { user } = await makeUser(orm);
const { user: other } = await makeUser(orm);
const trip = await makeTrip(orm, other.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'create_packing_bag',
@@ -180,8 +175,8 @@ describe('Tool: create_packing_bag', () => {
it('blocks demo user', async () => {
process.env.DEMO_MODE = 'true';
const { user } = createUser(testDb, { email: 'demo@nomad.app' });
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm, { email: 'demo@nomad.app' });
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'create_packing_bag',
@@ -198,8 +193,8 @@ describe('Tool: create_packing_bag', () => {
describe('Tool: update_packing_bag', () => {
it('updates bag name and broadcasts', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
const bag = await makePackingBag(orm, trip.id, { name: 'Old Name', color: '#aabbcc' });
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
@@ -214,9 +209,9 @@ describe('Tool: update_packing_bag', () => {
});
it('returns access denied for non-member', async () => {
const { user } = createUser(testDb);
const { user: other } = createUser(testDb);
const trip = createTrip(testDb, other.id);
const { user } = await makeUser(orm);
const { user: other } = await makeUser(orm);
const trip = await makeTrip(orm, other.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'update_packing_bag',
@@ -233,8 +228,8 @@ describe('Tool: update_packing_bag', () => {
describe('Tool: delete_packing_bag', () => {
it('deletes a bag and broadcasts', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
const { id: bagId } = await makePackingBag(orm, trip.id, { name: 'Delete Me', color: '#000000' });
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
@@ -250,8 +245,8 @@ describe('Tool: delete_packing_bag', () => {
});
it('pings the room to re-read the bag weights (#2191)', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
const { id: bagId } = await makePackingBag(orm, trip.id, { name: 'Carry-on', color: '#000000' });
await makePackingItem(orm, trip.id, {
name: 'Tent',
@@ -275,9 +270,9 @@ describe('Tool: delete_packing_bag', () => {
});
it('returns access denied for non-member', async () => {
const { user } = createUser(testDb);
const { user: other } = createUser(testDb);
const trip = createTrip(testDb, other.id);
const { user } = await makeUser(orm);
const { user: other } = await makeUser(orm);
const trip = await makeTrip(orm, other.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'delete_packing_bag',
@@ -289,9 +284,9 @@ describe('Tool: delete_packing_bag', () => {
// It used to report success and send both events for a bag that was not there.
it('answers a bag that is not on the trip as not found, like REST, and sends nothing', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const otherTrip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
const otherTrip = await makeTrip(orm, user.id);
const { id: bagId } = await makePackingBag(orm, otherTrip.id, { name: 'Elsewhere', color: '#000000' });
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
@@ -312,8 +307,8 @@ describe('Tool: delete_packing_bag', () => {
describe('Tool: set_bag_members', () => {
it('sets bag members and broadcasts', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
const { id: bagId } = await makePackingBag(orm, trip.id, { name: 'My Bag', color: '#123456' });
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
@@ -332,8 +327,8 @@ describe('Tool: set_bag_members', () => {
});
it('clears bag members when passed empty array', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
const { id: bagId } = await makePackingBag(orm, trip.id, { name: 'My Bag', color: '#123456' });
await addPackingBagMembers(orm, bagId, [user.id]);
await withHarness(user.id, async (h) => {
@@ -353,8 +348,8 @@ describe('Tool: set_bag_members', () => {
describe('Tool: get_packing_category_assignees', () => {
it('returns empty object initially', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'get_packing_category_assignees',
@@ -372,8 +367,8 @@ describe('Tool: get_packing_category_assignees', () => {
describe('Tool: set_packing_category_assignees', () => {
it('sets category assignees and broadcasts', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'set_packing_category_assignees',
@@ -392,27 +387,32 @@ describe('Tool: set_packing_category_assignees', () => {
// The REST route always notified the tagged travellers; the tool now does too.
it('notifies the fellow traveller it tags, as the REST route does', async () => {
const { user } = createUser(testDb);
const { user: member } = createUser(testDb);
const trip = createTrip(testDb, user.id);
addTripMember(testDb, trip.id, member.id);
const { user } = await makeUser(orm);
const { user: member } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await addTripMember(orm, trip.id, member.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'set_packing_category_assignees',
arguments: { tripId: trip.id, categoryName: 'Clothing', userIds: [member.id] },
});
expect(result.isError).toBeFalsy();
// The send is fire and forget: it lands one turn of the event loop later.
await new Promise<void>((resolve) => setImmediate(resolve));
const sent = await findRow(orm, Notifications, { recipient: member.id });
// The send is fire and forget: it lands after the tool has answered, a
// turn of the event loop later on SQLite and a few round trips later on
// Postgres, so wait for the row rather than for one turn.
const sent = await vi.waitFor(async () => {
const row = await findRow(orm, Notifications, { recipient: member.id });
expect(row).not.toBeNull();
return row;
});
expect(sent?.text_key).toBe('notif.packing_tagged.text');
expect(JSON.parse(String(sent?.text_params))).toMatchObject({ actor: user.username, category: 'Clothing' });
});
});
it('clears assignees when passed empty array', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await insertRow(orm, PackingCategoryAssignees, { trip: trip.id, category_name: 'Clothing', user: user.id });
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
@@ -425,9 +425,9 @@ describe('Tool: set_packing_category_assignees', () => {
});
it('returns access denied for non-member', async () => {
const { user } = createUser(testDb);
const { user: other } = createUser(testDb);
const trip = createTrip(testDb, other.id);
const { user } = await makeUser(orm);
const { user: other } = await makeUser(orm);
const trip = await makeTrip(orm, other.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'set_packing_category_assignees',
@@ -444,8 +444,8 @@ describe('Tool: set_packing_category_assignees', () => {
describe('Tool: apply_packing_template', () => {
it('applies a template and pings the bag weights once (#2191)', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
const templateId = await insertRow(orm, PackingTemplates, { name: 'Hiking', createdByRef: user.id });
const categoryId = await insertRow(orm, PackingTemplateCategories, {
template: templateId,
@@ -466,8 +466,8 @@ describe('Tool: apply_packing_template', () => {
});
it('returns error for non-existent template', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'apply_packing_template',
@@ -481,8 +481,8 @@ describe('Tool: apply_packing_template', () => {
// It always landed on the common list; REST has taken the visibility since #1565.
it("takes the visibility like REST: personal items are the caller's own and reach the caller alone", async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
const templateId = await insertRow(orm, PackingTemplates, { name: 'Diving', createdByRef: user.id });
const categoryId = await insertRow(orm, PackingTemplateCategories, {
template: templateId,
@@ -515,9 +515,9 @@ describe('Tool: apply_packing_template', () => {
describe('Tool: save_packing_template', () => {
it('saves the current packing list as a template for an admin', async () => {
const { user } = createAdmin(testDb);
const trip = createTrip(testDb, user.id);
createPackingItem(testDb, trip.id, { name: 'Toothbrush', category: 'Toiletries' });
const { user } = await makeAdmin(orm);
const trip = await makeTrip(orm, user.id);
await makePackingItem(orm, trip.id, { name: 'Toothbrush', category: 'Toiletries' });
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'save_packing_template',
@@ -532,8 +532,8 @@ describe('Tool: save_packing_template', () => {
});
it('returns an error when the packing list is empty', async () => {
const { user } = createAdmin(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeAdmin(orm);
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'save_packing_template',
@@ -544,9 +544,9 @@ describe('Tool: save_packing_template', () => {
});
it('denies a non-admin editor (parity with the REST admin gate)', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
createPackingItem(testDb, trip.id, { name: 'Toothbrush', category: 'Toiletries' });
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await makePackingItem(orm, trip.id, { name: 'Toothbrush', category: 'Toiletries' });
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'save_packing_template',
@@ -558,9 +558,9 @@ describe('Tool: save_packing_template', () => {
});
it('returns access denied for non-member', async () => {
const { user } = createUser(testDb);
const { user: other } = createUser(testDb);
const trip = createTrip(testDb, other.id);
const { user } = await makeUser(orm);
const { user: other } = await makeUser(orm);
const trip = await makeTrip(orm, other.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'save_packing_template',
@@ -577,9 +577,9 @@ describe('Tool: save_packing_template', () => {
describe('Tool: list_packing_templates', () => {
it('lists saved templates with their ids and item counts', async () => {
const { user } = createAdmin(testDb);
const trip = createTrip(testDb, user.id);
createPackingItem(testDb, trip.id, { name: 'Toothbrush', category: 'Toiletries' });
const { user } = await makeAdmin(orm);
const trip = await makeTrip(orm, user.id);
await makePackingItem(orm, trip.id, { name: 'Toothbrush', category: 'Toiletries' });
await withHarness(user.id, async (h) => {
const saved = parseToolResult(
await h.client.callTool({
@@ -599,8 +599,8 @@ describe('Tool: list_packing_templates', () => {
});
it('is available to a non-admin trip member (read-only)', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'list_packing_templates',
@@ -615,9 +615,9 @@ describe('Tool: list_packing_templates', () => {
describe('Tool: delete_packing_template', () => {
it('removes a template for an admin', async () => {
const { user } = createAdmin(testDb);
const trip = createTrip(testDb, user.id);
createPackingItem(testDb, trip.id, { name: 'Toothbrush', category: 'Toiletries' });
const { user } = await makeAdmin(orm);
const trip = await makeTrip(orm, user.id);
await makePackingItem(orm, trip.id, { name: 'Toothbrush', category: 'Toiletries' });
await withHarness(user.id, async (h) => {
const saved = parseToolResult(
await h.client.callTool({
@@ -640,7 +640,7 @@ describe('Tool: delete_packing_template', () => {
});
it('denies a non-admin (parity with the REST admin gate)', async () => {
const { user } = createUser(testDb);
const { user } = await makeUser(orm);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'delete_packing_template',
@@ -652,7 +652,7 @@ describe('Tool: delete_packing_template', () => {
});
it('returns an error for a missing template', async () => {
const { user } = createAdmin(testDb);
const { user } = await makeAdmin(orm);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'delete_packing_template',
@@ -669,8 +669,8 @@ describe('Tool: delete_packing_template', () => {
describe('Tool: bulk_import_packing', () => {
it('imports multiple packing items, returns them, and broadcasts per item', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
const items = [
{ name: 'Passport', category: 'Documents' },
{ name: 'Charger', category: 'Electronics' },
@@ -701,8 +701,8 @@ describe('Tool: bulk_import_packing', () => {
});
it('honors the widened fields (bag, weight_grams, checked)', async () => {
const { user } = createUser(testDb);
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm);
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'bulk_import_packing',
@@ -721,9 +721,9 @@ describe('Tool: bulk_import_packing', () => {
});
it('returns access denied for non-member', async () => {
const { user } = createUser(testDb);
const { user: other } = createUser(testDb);
const trip = createTrip(testDb, other.id);
const { user } = await makeUser(orm);
const { user: other } = await makeUser(orm);
const trip = await makeTrip(orm, other.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'bulk_import_packing',
@@ -735,8 +735,8 @@ describe('Tool: bulk_import_packing', () => {
it('blocks demo user', async () => {
process.env.DEMO_MODE = 'true';
const { user } = createUser(testDb, { email: 'demo@nomad.app' });
const trip = createTrip(testDb, user.id);
const { user } = await makeUser(orm, { email: 'demo@nomad.app' });
const trip = await makeTrip(orm, user.id);
await withHarness(user.id, async (h) => {
const result = await h.client.callTool({
name: 'bulk_import_packing',