Compare commits

...

5 Commits

Author SHA1 Message Date
Hardik
384ac8f979 test(e2e): clean up role when granted-user setup fails 2026-11-17 10:28:47 +05:30
Hardik
d016e5e227 test(e2e): cover rename without update:user 2026-11-17 10:26:46 +05:30
Hardik
9fbfaacbe5 test(e2e): add members name input locator 2026-11-17 10:26:30 +05:30
Hardik
d754cd418b test(e2e): cover users FGA on the members page 2026-11-17 10:12:51 +05:30
Hardik
049848e1cc test(e2e): add guest settings fixture and granted-user seed 2026-11-17 10:12:33 +05:30
4 changed files with 245 additions and 6 deletions

View File

@@ -131,14 +131,23 @@ export interface Settings {
/** The member's table row. Search for the email first: the list pages at 20. */
row(email: string): Locator;
inviteButton(): Locator;
searchInput(): Locator;
resetLinkButton(): Locator;
/** The "is not authorized" message a denied list or drawer renders. */
deniedMessage(): Locator;
openInvite(): Promise<void>;
inviteDialog(): Locator;
invite(rows: { email: string; role: string }[]): Promise<void>;
openMember(email: string): Promise<void>;
drawer(): Locator;
nameInput(): Locator;
roleSelect(): Locator;
deleteButton(): Locator;
setRoles(roles: string[]): Promise<void>;
/** Add a role to the open member without clearing the others. */
addRole(role: string): Promise<void>;
/** Remove one role from the open member, leaving the others. */
removeRole(role: string): Promise<void>;
saveMember(): Promise<void>;
/** Mint a reset or invite link from the drawer and return it. */
generateLink(): Promise<string>;
@@ -414,6 +423,9 @@ export function settingsDriver(page: Page): Settings {
// antd keys each row by the member id; the email is what callers hold.
row: (email) => page.locator('tr[data-row-key]').filter({ hasText: email }),
inviteButton: () => page.getByTestId('invite-member-btn'),
searchInput: () => page.getByTestId('members-search-input'),
resetLinkButton: () => page.getByTestId('member-reset-link-btn'),
deniedMessage: () => page.getByText(/is not authorized/).first(),
openInvite: async () => {
await settings.members.inviteButton().click();
await expect(settings.members.inviteDialog()).toBeVisible();
@@ -449,6 +461,7 @@ export function settingsDriver(page: Page): Settings {
await expect(settings.members.drawer().getByText(email)).toBeVisible();
},
drawer: () => page.getByRole('dialog', { name: 'Member Details' }),
nameInput: () => page.getByPlaceholder('Enter name'),
roleSelect: () => selectById('member-role'),
deleteButton: () => page.getByTestId('member-delete-btn'),
setRoles: async (roles) => {
@@ -458,6 +471,21 @@ export function settingsDriver(page: Page): Settings {
await pickInDialog(settings.members.drawer(), select, role);
}
},
addRole: async (role) => {
await pickInDialog(
settings.members.drawer(),
settings.members.roleSelect(),
role,
);
},
removeRole: async (role) => {
await settings.members
.roleSelect()
.locator('.ant-select-selection-item')
.filter({ hasText: role })
.locator('.ant-select-selection-item-remove')
.click();
},
saveMember: async () => {
await page.getByTestId('member-save-btn').click();
await expect(

View File

@@ -1,7 +1,7 @@
import { withAuthFlows } from '../auth-flows';
import { kit } from '../kit';
import { guestDriver, kit, type Layer } from '../kit';
import { withSettings } from './driver';
import { settingsDriver, withSettings, type Settings } from './driver';
import {
withActiveEditor,
withCustomRoleSeed,
@@ -9,6 +9,12 @@ import {
withServiceAccountSeed,
} from './seeds';
/** The settings pages bound to the logged-out `guestPage`, for a signed-in member. */
const withGuestSettings: Layer<{ guestSettings: Settings }> = guestDriver(
'guestSettings',
({ page }) => settingsDriver(page),
);
/**
* The settings `test`. Seeds are test-scoped and lazy: a spec pays only for the
* ones it destructures. `authFlows` drives a guest context, for the flows that
@@ -16,8 +22,10 @@ import {
*/
export const test = withAuthFlows(
withSettings(
withActiveEditor(
withPendingMember(withServiceAccountSeed(withCustomRoleSeed(kit))),
withGuestSettings(
withActiveEditor(
withPendingMember(withServiceAccountSeed(withCustomRoleSeed(kit))),
),
),
),
);

View File

@@ -1,9 +1,11 @@
import type { Browser, TestType } from '@playwright/test';
import type { User } from '../auth';
import type { AuthtypesTransactionGroupDTO } from '../schemas';
import { onAdminPage, type Layer } from '../kit';
import { usersApi, type CreatedUser } from '../users';
import { grantAll, roleName, settingsDriver } from './driver';
import { grantAll, roleName, settingsDriver, type Settings } from './driver';
/**
* Test-scoped seeds. Each test that asks for one gets its own copy, created on
@@ -123,3 +125,40 @@ export const withActiveEditor = perTest(
({ browser, value }) =>
onAdminPage(browser, (page) => usersApi(page).remove(value.id)),
);
export interface GrantedUser {
user: User;
role: string;
remove(): Promise<void>;
}
/**
* An active member whose only role is a fresh custom role holding
* `transactionGroups`. Call `remove` in a `finally`.
*/
export async function createGrantedUser(
settings: Settings,
workerIndex: number,
kind: string,
transactionGroups: AuthtypesTransactionGroupDTO[],
): Promise<GrantedUser> {
const name = roleName(kind, workerIndex);
const roleId = await settings.roles.createApi({ name, transactionGroups });
const label = `${kind}-w${workerIndex}-${Date.now()}`;
let member: CreatedUser;
try {
member = await settings.users.createActive(name, label);
} catch (error) {
await settings.users.removeByEmail(`e2e-${label}@signoz.test`);
await settings.roles.removeApi(roleId);
throw error;
}
return {
user: member.user,
role: name,
remove: async () => {
await settings.users.remove(member.id);
await settings.roles.removeApi(roleId);
},
};
}

View File

@@ -1,4 +1,9 @@
import { expect, test } from '../../drivers/settings';
import {
createGrantedUser,
expect,
grantAll,
test,
} from '../../drivers/settings';
test.describe('settings — members', () => {
test('TC-01 an invite of two rows creates two pending members', async ({
@@ -62,4 +67,163 @@ test.describe('settings — members', () => {
await settings.members.search(email);
await expect(settings.members.row(email)).toContainText('DELETED');
});
test('TC-04 a user without create:user cannot invite members', async ({
settings,
authFlows,
guestSettings,
}, testInfo) => {
const member = await createGrantedUser(
settings,
testInfo.workerIndex,
'list-users',
[grantAll('list', 'user', 'user')],
);
try {
await authFlows.login(member.user);
await guestSettings.members.goto();
await expect(guestSettings.members.inviteButton()).toHaveAttribute(
'data-denied-permissions',
/create/,
);
} finally {
await member.remove();
}
});
test('TC-05 a user without list:user cannot list members', async ({
settings,
authFlows,
guestSettings,
}, testInfo) => {
const member = await createGrantedUser(
settings,
testInfo.workerIndex,
'no-list',
[grantAll('read', 'dashboard')],
);
try {
await authFlows.login(member.user);
await guestSettings.members.goto();
await expect(guestSettings.members.deniedMessage()).toBeVisible();
await expect(guestSettings.members.searchInput()).toHaveAttribute(
'data-denied-permissions',
/list/,
);
} finally {
await member.remove();
}
});
test('TC-06 an invite link is unavailable without factor-password:list', async ({
settings,
authFlows,
guestSettings,
pendingMember,
}, testInfo) => {
const member = await createGrantedUser(
settings,
testInfo.workerIndex,
'no-pwd',
[grantAll('list', 'user', 'user'), grantAll('read', 'user', 'user')],
);
try {
await authFlows.login(member.user);
await guestSettings.members.goto();
await guestSettings.members.openMember(pendingMember.email);
await expect(guestSettings.members.resetLinkButton()).toHaveAttribute(
'data-denied-permissions',
/factor-password/,
);
await expect(guestSettings.members.resetLinkButton()).toContainText(
'Invite Link Unavailable',
);
} finally {
await member.remove();
}
});
test('TC-07 a member can add and remove a role on themselves', async ({
settings,
authFlows,
guestSettings,
}, testInfo) => {
const member = await createGrantedUser(
settings,
testInfo.workerIndex,
'self-edit',
[
grantAll('list', 'user', 'user'),
grantAll('read', 'user', 'user'),
grantAll('attach', 'user', 'user'),
grantAll('detach', 'user', 'user'),
grantAll('list', 'role', 'role'),
grantAll('read', 'role', 'role'),
grantAll('attach', 'role', 'role'),
grantAll('detach', 'role', 'role'),
],
);
try {
await authFlows.login(member.user);
await guestSettings.members.goto();
await guestSettings.members.openMember(member.user.email);
await guestSettings.members.addRole('signoz-viewer');
await guestSettings.members.saveMember();
await guestSettings.reload();
await guestSettings.members.openMember(member.user.email);
await expect(guestSettings.members.roleSelect()).toContainText(
'signoz-viewer',
);
const added = await settings.users.byEmail(member.user.email);
expect(
(added?.userRoles ?? []).map((entry) => entry.role.name).sort(),
).toEqual([member.role, 'signoz-viewer'].sort());
await guestSettings.members.removeRole('signoz-viewer');
await guestSettings.members.saveMember();
await guestSettings.reload();
await guestSettings.members.openMember(member.user.email);
await expect(guestSettings.members.roleSelect()).not.toContainText(
'signoz-viewer',
);
const removed = await settings.users.byEmail(member.user.email);
expect((removed?.userRoles ?? []).map((entry) => entry.role.name)).toEqual([
member.role,
]);
} finally {
await member.remove();
}
});
test('TC-08 a user without update:user cannot rename another member', async ({
settings,
authFlows,
guestSettings,
activeEditor,
}, testInfo) => {
const member = await createGrantedUser(
settings,
testInfo.workerIndex,
'no-update',
[grantAll('list', 'user', 'user'), grantAll('read', 'user', 'user')],
);
try {
await authFlows.login(member.user);
await guestSettings.members.goto();
await guestSettings.members.openMember(activeEditor.user.email);
await expect(guestSettings.members.nameInput()).toHaveAttribute(
'data-denied-permissions',
/update/,
);
} finally {
await member.remove();
}
});
});