From 45bff7b0d108f199b50c8f64a3de4038d74b55eb Mon Sep 17 00:00:00 2001 From: YuryShkoda Date: Wed, 15 Jul 2026 09:21:53 +0300 Subject: [PATCH] fix: update test fixtures for userId: string after ID->UID merge Execution.spec.ts, processProgram.spec.ts and code.spec.ts didn't exist when issue-361 (ID -> UID) branched, so they were written against the old userId: number shape. Update them to match the merged-in string-based uid now that main has been merged in. --- api/src/controllers/internal/spec/Execution.spec.ts | 2 +- api/src/controllers/internal/spec/processProgram.spec.ts | 2 +- api/src/routes/api/spec/code.spec.ts | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/src/controllers/internal/spec/Execution.spec.ts b/api/src/controllers/internal/spec/Execution.spec.ts index e377d12..9e0e86f 100644 --- a/api/src/controllers/internal/spec/Execution.spec.ts +++ b/api/src/controllers/internal/spec/Execution.spec.ts @@ -8,7 +8,7 @@ import { RunTimeType } from '../../../utils' const preProgramVariables: PreProgramVars = { username: 'testUser', - userId: 1, + userId: '1', displayName: 'Test User', serverUrl: 'http://localhost:5000', httpHeaders: [] diff --git a/api/src/controllers/internal/spec/processProgram.spec.ts b/api/src/controllers/internal/spec/processProgram.spec.ts index b1a37f3..f728fb1 100644 --- a/api/src/controllers/internal/spec/processProgram.spec.ts +++ b/api/src/controllers/internal/spec/processProgram.spec.ts @@ -11,7 +11,7 @@ import { const preProgramVariables: PreProgramVars = { username: 'testUser', - userId: 1, + userId: '1', displayName: 'Test User', serverUrl: 'http://localhost:5000', httpHeaders: [] diff --git a/api/src/routes/api/spec/code.spec.ts b/api/src/routes/api/spec/code.spec.ts index a65f212..c051219 100644 --- a/api/src/routes/api/spec/code.spec.ts +++ b/api/src/routes/api/spec/code.spec.ts @@ -71,13 +71,13 @@ describe('code', () => { permissionController = new PermissionController() const dbUser = await userController.createUser(user) - accessToken = await generateAndSaveToken(dbUser.id) + accessToken = await generateAndSaveToken(dbUser.uid) await permissionController.createPermission({ path: '/SASjsApi/code/execute', type: PermissionType.route, principalType: PrincipalType.user, - principalId: dbUser.id, + principalId: dbUser.uid, setting: PermissionSettingForRoute.grant }) @@ -122,7 +122,7 @@ describe('code', () => { }) }) -const generateAndSaveToken = async (userId: number) => { +const generateAndSaveToken = async (userId: string) => { const accessToken = generateAccessToken({ clientId, userId