Browse Source

test: use xc-token instead of xc-auth

pull/9543/head
mertmit 2 months ago
parent
commit
9bc069ff56
  1. 15
      tests/playwright/setup/index.ts
  2. 2
      tests/playwright/tests/db/features/swagger.spec.ts

15
tests/playwright/setup/index.ts

@ -149,6 +149,7 @@ const workerCount = [0, 0, 0, 0, 0, 0, 0, 0];
export interface NcContext { export interface NcContext {
base: BaseType; base: BaseType;
token: string; token: string;
apiToken: string;
dbType?: string; dbType?: string;
workerId?: string; workerId?: string;
rootUser: UserType & { password: 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_old = `ws_pgExtREST${+workerId - 1}`;
const workspaceTitle = `ws_pgExtREST${workerId}`; const workspaceTitle = `ws_pgExtREST${workerId}`;
const baseTitle = `pgExtREST${workerId}`; const baseTitle = `pgExtREST${workerId}`;
@ -363,7 +375,7 @@ async function localInit({
// get current user information // get current user information
const user = await api.auth.me(); 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) { } catch (e) {
console.error(`Error resetting base: ${process.env.TEST_PARALLEL_INDEX}`, e); console.error(`Error resetting base: ${process.env.TEST_PARALLEL_INDEX}`, e);
return { data: {}, status: 500 }; return { data: {}, status: 500 };
@ -497,6 +509,7 @@ const setup = async ({
return { return {
base, base,
token, token,
apiToken: response.data.apiToken,
dbType, dbType,
workerId, workerId,
rootUser, rootUser,

2
tests/playwright/tests/db/features/swagger.spec.ts

@ -24,7 +24,7 @@ test.describe('Swagger', () => {
// authorize with token information // authorize with token information
await swagger.locator('.btn.authorize').click(); 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('.btn.modal-btn.auth.authorize.button').first().click();
await swagger.locator('.close-modal').click(); await swagger.locator('.close-modal').click();

Loading…
Cancel
Save