devsam/core2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/p0-actor-ownership

Browse Source 
# Conflicts:
#	app/game-api/src/router/troop/index.ts
This commit is contained in:
Hide_D
2026-07-25 08:52:01 +00:00
parent a9d6541c18 ee6fd00f7d
commit c94c5011f4
35 changed files with 3570 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/game-api/test/router.test.ts
+1 -9
View File
@@ -283,8 +283,7 @@ describe('appRouter', () => {
it('rejects another user general across actor-owned routers', async () => {
const general = buildGeneralRow({ id: 15, userId: 'user-2' });
const transport = new InMemoryTurnDaemonTransport();
const caller = appRouter.createCaller(buildContext({ general, transport }));
const caller = appRouter.createCaller(buildContext({ general }));
await expect(caller.turns.getCommandTable({ generalId: general.id })).rejects.toMatchObject({
code: 'FORBIDDEN',
@@ -350,12 +349,6 @@ describe('appRouter', () => {
).rejects.toMatchObject({
code: 'FORBIDDEN',
});
await expect(caller.troop.join({ generalId: general.id, troopId: 3 })).rejects.toMatchObject({
code: 'FORBIDDEN',
});
await expect(caller.troop.exit({ generalId: general.id })).rejects.toMatchObject({
code: 'FORBIDDEN',
});
await expect(
caller.world.getMap({
generalId: general.id,
@@ -364,7 +357,6 @@ describe('appRouter', () => {
).rejects.toMatchObject({
code: 'FORBIDDEN',
});
expect(transport.commands).toHaveLength(0);
});
it('rejects unauthenticated general-scoped map views', async () => {