From 9bc069ff56befd92c0204201078c08dbcd480d6d Mon Sep 17 00:00:00 2001 From: mertmit Date: Wed, 25 Sep 2024 01:30:02 +0000 Subject: [PATCH] test: use xc-token instead of xc-auth --- tests/playwright/setup/index.ts | 15 ++++++++++++++- .../playwright/tests/db/features/swagger.spec.ts | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/playwright/setup/index.ts b/tests/playwright/setup/index.ts index f763595162..1075dc506f 100644 --- a/tests/playwright/setup/index.ts +++ b/tests/playwright/setup/index.ts @@ -149,6 +149,7 @@ const workerCount = [0, 0, 0, 0, 0, 0, 0, 0]; export interface NcContext { base: BaseType; token: string; + apiToken: string; dbType?: string; workerId?: string; rootUser: UserType & { password: string }; @@ -208,6 +209,17 @@ async function localInit({ }, }); + let apiToken = null; + + const apiTokens = await api.orgTokens.list(); + + if (apiTokens.list.length > 0) { + apiToken = apiTokens.list[0].token; + } else { + const { token: createdToken } = await api.orgTokens.create({ description: 'test' }); + apiToken = createdToken; + } + // const workspaceTitle_old = `ws_pgExtREST${+workerId - 1}`; const workspaceTitle = `ws_pgExtREST${workerId}`; const baseTitle = `pgExtREST${workerId}`; @@ -363,7 +375,7 @@ async function localInit({ // get current user information const user = await api.auth.me(); - return { data: { base, user, workspace, token, api }, status: 200 }; + return { data: { base, user, workspace, token, api, apiToken }, status: 200 }; } catch (e) { console.error(`Error resetting base: ${process.env.TEST_PARALLEL_INDEX}`, e); return { data: {}, status: 500 }; @@ -497,6 +509,7 @@ const setup = async ({ return { base, token, + apiToken: response.data.apiToken, dbType, workerId, rootUser, diff --git a/tests/playwright/tests/db/features/swagger.spec.ts b/tests/playwright/tests/db/features/swagger.spec.ts index 3da2f4697b..a028ace25d 100644 --- a/tests/playwright/tests/db/features/swagger.spec.ts +++ b/tests/playwright/tests/db/features/swagger.spec.ts @@ -24,7 +24,7 @@ test.describe('Swagger', () => { // authorize with token information await swagger.locator('.btn.authorize').click(); - await swagger.locator('.modal-ux').locator('input').first().fill(context.token); + await swagger.locator('.modal-ux').locator('input').first().fill(context.apiToken); await swagger.locator('.btn.modal-btn.auth.authorize.button').first().click(); await swagger.locator('.close-modal').click();