refactor(tests): cleanup PlayWright tests

tests/playwright/e2e/settings/personal-info.spec.ts

@@ -3,12 +3,11 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { User } from '@nextcloud/e2e-test-server'
 import type { Page, Response } from '@playwright/test'
 
 import { runOcc } from '@nextcloud/e2e-test-server/docker'
-import { createRandomUser, login } from '@nextcloud/e2e-test-server/playwright'
-import { test as baseTest, expect } from '@playwright/test'
+import { expect } from '@playwright/test'
+import { test as userSessionTest } from '../../support/fixtures/random-user-session.ts'
 import { handlePasswordConfirmation } from '../../support/utils/password-confirmation.ts'
 
 // ── Visibility scope labels exactly as rendered in the UI ─────────────────────
@@ -45,23 +44,13 @@ async function changeVisibility(page: Page, property: string, scope: Visibility,
 
 // ── Fixture ───────────────────────────────────────────────────────────────────
 
-const test = baseTest.extend<{ user: User }>({
-	user: async ({}, use) => {
-		const user = await createRandomUser()
-		// Ensure English UI language and locale so string assertions are stable
-		await runOcc(['user:setting', user.userId, 'core', 'lang', 'en'])
-		await runOcc(['user:setting', user.userId, 'core', 'locale', 'en_US'])
-		await use(user)
-		await runOcc(['user:delete', user.userId])
+// Ensure English UI language and locale so string assertions are stable
+const test = userSessionTest.extend({
+	user: async ({ user: baseUser }, use) => {
+		await runOcc(['user:setting', baseUser.userId, 'core', 'lang', 'en'])
+		await runOcc(['user:setting', baseUser.userId, 'core', 'locale', 'en_US'])
+		await use(baseUser)
 	},
-
-	page: async ({ browser, user }, use) => {
-		const page = await browser.newPage()
-		await login(page.request, user)
-		await use(page)
-		await page.close()
-	},
-
 })
 
 // ── Spec ──────────────────────────────────────────────────────────────────────

tests/playwright/e2e/users/users-disable.spec.ts

@@ -3,36 +3,26 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { type User } from '@nextcloud/e2e-test-server'
 import { runOcc } from '@nextcloud/e2e-test-server/docker'
-import { createRandomUser } from '@nextcloud/e2e-test-server/playwright'
 import { expect } from '@playwright/test'
-import { test as adminTest } from '../../support/fixtures/admin-session.ts'
+import { test } from '../../support/fixtures/admin-with-user.ts'
 import { SettingsUsersPage } from '../../support/sections/SettingsUsersPage.ts'
 
-const test = adminTest.extend<{ testUser: User }>({
-	testUser: async ({}, use) => {
-		const user = await createRandomUser()
-		await use(user)
-		await runOcc(['user:delete', user.userId])
-	},
-})
-
 test.describe('Settings: Disable and enable users', () => {
-	test('can disable a user', async ({ page, testUser }) => {
+	test('can disable a user', async ({ page, user }) => {
 		// Ensure user is enabled
-		await runOcc(['user:enable', testUser.userId])
+		await runOcc(['user:enable', user.userId])
 
 		const settingsPage = new SettingsUsersPage(page)
 		await settingsPage.open()
 
-		await expect(settingsPage.userRow(testUser.userId)).toBeVisible()
+		await expect(settingsPage.userRow(user.userId)).toBeVisible()
 
-		await settingsPage.openActionsMenu(testUser.userId)
+		await settingsPage.openActionsMenu(user.userId)
 		await page.getByRole('menuitem', { name: 'Disable account' }).click()
 
 		// User should no longer be in the main list
-		await expect(settingsPage.userRow(testUser.userId)).toHaveCount(0)
+		await expect(settingsPage.userRow(user.userId)).toHaveCount(0)
 
 		// Disabled accounts nav link should now appear
 		const disabledLink = settingsPage.navigation().getByRole('link', { name: /Disabled accounts/i })
@@ -44,12 +34,12 @@ test.describe('Settings: Disable and enable users', () => {
 
 		// The disabled user should be in the list
 		await settingsPage.userList().waitFor({ state: 'visible' })
-		await expect(settingsPage.userRow(testUser.userId)).toBeVisible()
+		await expect(settingsPage.userRow(user.userId)).toBeVisible()
 	})
 
-	test('can enable a user', async ({ page, testUser }) => {
+	test('can enable a user', async ({ page, user }) => {
 		// Ensure user is disabled
-		await runOcc(['user:disable', testUser.userId])
+		await runOcc(['user:disable', user.userId])
 
 		const settingsPage = new SettingsUsersPage(page)
 		await settingsPage.open()
@@ -62,7 +52,7 @@ test.describe('Settings: Disable and enable users', () => {
 		await settingsPage.userList().waitFor({ state: 'visible' })
 
 		const waitForEnableRequest = page.waitForResponse((r) => r.request().url().match(/\/ocs\/v2\.php\/cloud\/users\/[^/]+\/enable/) !== null)
-		await settingsPage.openActionsMenu(testUser.userId)
+		await settingsPage.openActionsMenu(user.userId)
 		await page.getByRole('menuitem', { name: 'Enable account' }).click()
 		await waitForEnableRequest
 

tests/playwright/e2e/users/users-group-admin.spec.ts

@@ -10,6 +10,7 @@ import { createRandomUser, login } from '@nextcloud/e2e-test-server/playwright'
 import { test as baseTest, expect } from '@playwright/test'
 import { SettingsUsersPage } from '../../support/sections/SettingsUsersPage.ts'
 import { handlePasswordConfirmation } from '../../support/utils/password-confirmation.ts'
+import { makeSubAdmin } from '../../support/utils/users.ts'
 
 const test = baseTest.extend<{ subadmin: User, group: string }>({
 	group: async ({}, use) => {
@@ -21,14 +22,7 @@ const test = baseTest.extend<{ subadmin: User, group: string }>({
 	subadmin: async ({ group, request }, use) => {
 		const user = await createRandomUser()
 		await runOcc(['group:adduser', group, user.userId])
-		// Grant subadmin rights via OCS API authenticated as admin
-		await request.post(`/ocs/v2.php/cloud/users/${user.userId}/subadmins`, {
-			headers: {
-				'OCS-APIRequest': 'true',
-				Authorization: 'Basic ' + Buffer.from('admin:admin').toString('base64'),
-			},
-			form: { groupid: group },
-		})
+		await makeSubAdmin(request, user.userId, group)
 		await use(user)
 		await runOcc(['user:delete', user.userId])
 	},

tests/playwright/e2e/users/users-groups.spec.ts

@@ -8,7 +8,7 @@ import type { User } from '@nextcloud/e2e-test-server'
 import { runOcc } from '@nextcloud/e2e-test-server/docker'
 import { createRandomUser } from '@nextcloud/e2e-test-server/playwright'
 import { expect } from '@playwright/test'
-import { test } from '../../support/fixtures/admin-session.ts'
+import { test } from '../../support/fixtures/admin-with-user.ts'
 import { SettingsUsersPage } from '../../support/sections/SettingsUsersPage.ts'
 import { handlePasswordConfirmation } from '../../support/utils/password-confirmation.ts'
 
@@ -37,12 +37,7 @@ test('Account Management: Can create a group', async ({ page }) => {
 
 // ── Assign user to group ──────────────────────────────────────────────────────
 
-const userGroupTest = test.extend<{ testUser: User, testGroup: string }>({
-	async testUser({}, use) {
-		const testUser = await createRandomUser()
-		await use(testUser)
-		await runOcc(['user:delete', testUser.userId])
-	},
+const userGroupTest = test.extend<{ testGroup: string }>({
 	async testGroup({}, use) {
 		const testGroup = crypto.randomUUID()
 		await runOcc(['group:add', testGroup])
@@ -51,19 +46,19 @@ const userGroupTest = test.extend<{ testUser: User, testGroup: string }>({
 	},
 })
 
-userGroupTest('Account Management: Assign user to a group', async ({ page, testGroup, testUser }) => {
+userGroupTest('Account Management: Assign user to a group', async ({ page, testGroup, user }) => {
 	const settingsPage = new SettingsUsersPage(page)
 	await settingsPage.open()
 
 	// group is in the list with no members
 	await expect(settingsPage.groupListItem(testGroup)).toBeVisible()
 	// Counter bubble is absent when member count is 0
-	await expect(settingsPage.groupListItem(testGroup).locator('.counter-bubble__counter')).toHaveCount(0)
+	await expect(settingsPage.groupMemberCount(testGroup)).toHaveCount(0)
 	// user is in the list
-	await expect(settingsPage.userRow(testUser.userId)).toBeVisible()
+	await expect(settingsPage.userRow(user.userId)).toBeVisible()
 
 	// can assign the group via the edit dialog
-	await settingsPage.openEditDialog(testUser.userId)
+	await settingsPage.openEditDialog(user.userId)
 	const dialog = settingsPage.editUserDialog()
 	const groupsCombobox = dialog.getByRole('combobox', { name: /Member of the following groups/i })
 	const searchRequest = page.waitForResponse((r) => r.request().url().match(new RegExp('/ocs/v2\\.php/cloud/groups/details\\?(.+&|)search=' + testGroup.slice(0, 5))) !== null)
@@ -77,9 +72,9 @@ userGroupTest('Account Management: Assign user to a group', async ({ page, testG
 	await expect(page.getByText(/Account updated/i)).toBeVisible()
 
 	// user is now group now shows 1 member
-	await expect(settingsPage.groupListItem(testGroup).locator('.counter-bubble__counter')).toHaveText('1')
+	await expect(settingsPage.groupMemberCount(testGroup)).toHaveText('1')
 	// backend confirms the user is in the group
-	const info = JSON.parse(await runOcc(['user:info', '--output=json', testUser.userId]))
+	const info = JSON.parse(await runOcc(['user:info', '--output=json', user.userId]))
 	expect(info?.groups).toContain(testGroup)
 })
 
@@ -100,13 +95,9 @@ test.describe('Settings: Delete an empty group', () => {
 		const settingsPage = new SettingsUsersPage(page)
 		await settingsPage.open()
 
-		const groupItem = settingsPage.groupListItem(groupName)
-		await expect(groupItem).toBeVisible()
+		await expect(settingsPage.groupListItem(groupName)).toBeVisible()
 
-		// Open the group's actions menu
-		await groupItem.hover()
-		await expect(groupItem.getByRole('button', { name: /Actions/i })).toBeVisible()
-		await groupItem.getByRole('button', { name: /Actions/i }).click()
+		await settingsPage.openGroupActionsMenu(groupName)
 
 		// and delete the group
 		await page.getByRole('button', { name: 'Delete group' }).click()
@@ -143,13 +134,9 @@ test.describe('Settings: Delete a non-empty group', () => {
 		const settingsPage = new SettingsUsersPage(page)
 		await settingsPage.open()
 
-		const groupItem = settingsPage.groupListItem(groupName)
-		await expect(groupItem).toBeVisible()
+		await expect(settingsPage.groupListItem(groupName)).toBeVisible()
 
-		// Open the group's actions menu
-		await groupItem.hover()
-		expect(groupItem.getByRole('button', { name: /Actions/i })).toBeVisible()
-		await groupItem.getByRole('button', { name: /Actions/i }).click()
+		await settingsPage.openGroupActionsMenu(groupName)
 
 		// and delete the group
 		await page.getByRole('button', { name: 'Delete group' }).click()
@@ -164,24 +151,19 @@ test.describe('Settings: Delete a non-empty group', () => {
 })
 
 // ── Sort groups ───────────────────────────────────────────────────────────────
-const sortGroupsTest = test.extend<{ testUser: User, testGroups: [string, string] }>({
-	async testGroups({ testUser }, use) {
+const sortGroupsTest = test.extend<{ testGroups: [string, string] }>({
+	async testGroups({ user }, use) {
 		const suffix = crypto.randomUUID().slice(0, 8)
 		const groupA = `A-${suffix}`
 		const groupB = `B-${suffix}`
 
 		await runOcc(['group:add', groupA])
 		await runOcc(['group:add', groupB])
-		await runOcc(['group:adduser', groupB, testUser.userId])
+		await runOcc(['group:adduser', groupB, user.userId])
 		await use([groupA, groupB])
 		await runOcc(['group:delete', groupA]).catch(() => {})
 		await runOcc(['group:delete', groupB]).catch(() => {})
 	},
-	testUser: async ({}, use) => {
-		const testUser = await createRandomUser()
-		await use(testUser)
-		await runOcc(['user:delete', testUser.userId])
-	},
 })
 
 sortGroupsTest('Settings: Sort groups by member count and then by name', async ({ page, testGroups }) => {

tests/playwright/e2e/users/users-manager.spec.ts

@@ -7,20 +7,15 @@ import { type User } from '@nextcloud/e2e-test-server'
 import { runOcc } from '@nextcloud/e2e-test-server/docker'
 import { createRandomUser } from '@nextcloud/e2e-test-server/playwright'
 import { expect } from '@playwright/test'
-import { test as adminTest } from '../../support/fixtures/admin-session.ts'
+import { test as adminUserTest } from '../../support/fixtures/admin-with-user.ts'
 import { SettingsUsersPage } from '../../support/sections/SettingsUsersPage.ts'
 import { handlePasswordConfirmation } from '../../support/utils/password-confirmation.ts'
 
-const test = adminTest.extend<{ user: User, manager: User }>({
-	user: async ({}, use) => {
-		const u = await createRandomUser()
-		await use(u)
-		await runOcc(['user:delete', u.userId])
-	},
+const test = adminUserTest.extend<{ manager: User }>({
 	manager: async ({}, use) => {
-		const u = await createRandomUser()
-		await use(u)
-		await runOcc(['user:delete', u.userId])
+		const manager = await createRandomUser()
+		await use(manager)
+		await runOcc(['user:delete', manager.userId]).catch(() => {})
 	},
 })
 

tests/playwright/e2e/users/users-modify.spec.ts

@@ -3,22 +3,13 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { type User } from '@nextcloud/e2e-test-server'
 import { runOcc } from '@nextcloud/e2e-test-server/docker'
-import { createRandomUser, login } from '@nextcloud/e2e-test-server/playwright'
+import { login } from '@nextcloud/e2e-test-server/playwright'
 import { expect } from '@playwright/test'
-import { test as adminTest } from '../../support/fixtures/admin-session.ts'
+import { test } from '../../support/fixtures/admin-with-user.ts'
 import { SettingsUsersPage } from '../../support/sections/SettingsUsersPage.ts'
 import { handlePasswordConfirmation } from '../../support/utils/password-confirmation.ts'
 
-const test = adminTest.extend<{ user: User }>({
-	user: async ({}, use) => {
-		const user = await createRandomUser()
-		await use(user)
-		await runOcc(['user:delete', user.userId])
-	},
-})
-
 test.describe('Settings: Change user properties', () => {
 	test('can change the display name', async ({ page, user }) => {
 		const settingsPage = new SettingsUsersPage(page)

tests/playwright/support/fixtures/admin-with-user.ts

@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { mergeTests } from '@playwright/test'
+import { test as adminTest } from './admin-session.ts'
+import { test as randomUserTest } from './random-user.ts'
+
+/**
+ * Admin session combined with a freshly-created random `user` fixture.
+ * The page is logged in as admin; the user is available via the `user` fixture.
+ */
+export const test = mergeTests(adminTest, randomUserTest)

tests/playwright/support/fixtures/random-user-session.ts

@@ -3,17 +3,18 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { runOcc } from '@nextcloud/e2e-test-server/docker'
-import { createRandomUser, login } from '@nextcloud/e2e-test-server/playwright'
-import { test as baseTest } from '@playwright/test'
-
-export const test = baseTest.extend({
-	page: async ({ page, context }, use) => {
-		const user = await createRandomUser()
-		await login(context.request, user)
+import { login } from '@nextcloud/e2e-test-server/playwright'
+import { test as randomUserTest } from './random-user.ts'
 
+/**
+ * Extends the random-user fixture with a `page` logged in as that user.
+ * The page runs in an isolated browser context — no admin session leaks in.
+ */
+export const test = randomUserTest.extend({
+	page: async ({ browser, user }, use) => {
+		const page = await browser.newPage()
+		await login(page.request, user)
 		await use(page)
-
-		await runOcc(['user:delete', user.userId])
+		await page.close()
 	},
 })

tests/playwright/support/fixtures/random-user.ts

@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import type { User } from '@nextcloud/e2e-test-server'
+
+import { runOcc } from '@nextcloud/e2e-test-server/docker'
+import { createRandomUser } from '@nextcloud/e2e-test-server/playwright'
+import { test as baseTest } from '@playwright/test'
+
+/**
+ * Extends the base test with a freshly-created random `user`.
+ * The user is deleted in teardown regardless of test outcome.
+ */
+export const test = baseTest.extend<{ user: User }>({
+	user: async ({}, use) => {
+		const user = await createRandomUser()
+		await use(user)
+		await runOcc(['user:delete', user.userId]).catch(() => {})
+	},
+})

tests/playwright/support/sections/SettingsUsersPage.ts

@@ -91,6 +91,24 @@ export class SettingsUsersPage {
 		await dialog.waitFor({ state: 'hidden' })
 	}
 
+	/**
+	 * Open the NcActions flyout for a custom group nav item.
+	 * NcActions inside NcAppNavigationItem falls back to the default `t('Actions')` label.
+	 */
+	async openGroupActionsMenu(groupName: string): Promise<void> {
+		const item = this.groupListItem(groupName)
+		await item.hover()
+		await item.getByRole('button', { name: /Actions/i }).click()
+	}
+
+	/**
+	 * Locator for the member count inside a group list item.
+	 * NcCounterBubble has no accessible role — CSS class is a last resort.
+	 */
+	groupMemberCount(groupName: string): Locator {
+		return this.groupListItem(groupName).locator('.counter-bubble__counter')
+	}
+
 	/** Open the actions dropdown for `userId`. */
 	async openActionsMenu(userId: string): Promise<void> {
 		const button = this.userRow(userId).getByRole('button', { name: 'Toggle account actions menu' })