test: stablize playwright tests

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

package-lock.json

@@ -73,7 +73,7 @@
   },
   "devDependencies": {
     "@nextcloud/browserslist-config": "^3.1.2",
-    "@nextcloud/e2e-test-server": "^0.4.0",
+    "@nextcloud/e2e-test-server": "^0.5.0",
     "@nextcloud/eslint-config": "^9.0.0-rc.9",
     "@nextcloud/stylelint-config": "^3.2.2",
     "@nextcloud/typings": "^1.10.0",

package.json

@@ -11,11 +11,9 @@ import { handlePasswordConfirmation } from '../../support/utils/password-confirm
 test.describe('Settings: App management', () => {
 	test.beforeEach(async ({ appstorePage }) => {
 		// Disable QA testing app if already enabled
-		expect(await runOcc(['app:disable', 'testing']))
-			.toMatch(/(No such app enabled|testing .+ disabled)/)
+		await runOcc(['app:disable', 'testing'], { failOnError: false })
 		// Enable update notification app if disabled
-		expect(await runOcc(['app:enable', 'updatenotification']))
-			.toMatch(/(updatenotification already enabled|updatenotification .+ enabled)/)
+		await runOcc(['app:enable', 'updatenotification'], { failOnError: false })
 
 		// Open the installed apps page
 		await appstorePage.openInstalledApps()

tests/playwright/e2e/appstore/admin-settings-apps.spec.ts

@@ -216,13 +216,13 @@ test.describe('Files: Download files using selection', () => {
 	 * uid, which `createRandomUser()` cannot produce, so it provisions its own
 	 * user via the docker helper and logs in at the API level.
 	 */
-	test('can download selected files with email uid', async ({ page, context, filesListPage }) => {
+	test('can download selected files with email uid', async ({ page, filesListPage }) => {
 		const randomString = (length: number) => Math.random().toString(36).slice(2, 2 + length)
 		const uid = `${randomString(5)}@${randomString(3)}`
 		const emailUser = new User(uid, uid, 'en')
 
 		await addUser(emailUser)
-		await login(context.request, emailUser)
+		await login(page.request, emailUser)
 
 		try {
 			await uploadContent(page.request, emailUser, '<content>', 'text/plain', '/file.txt')

tests/playwright/e2e/files/files-download.spec.ts

@@ -44,6 +44,6 @@ test('Does not show write actions on read-only storage mounted at the root of th
 
 /** Read the `overwrites_home_folders` files app config as a trimmed string. */
 async function getOverwritesHomeFolders(): Promise<string> {
-	const result = await runOcc(['config:app:get', 'files', 'overwrites_home_folders', '--default-value=[]'])
-	return result.trim()
+	const { stdout } = await runOcc(['config:app:get', 'files', 'overwrites_home_folders', '--default-value=[]'])
+	return stdout.trim()
 }

tests/playwright/e2e/files_external/admin-settings-home-folder-root-mount.spec.ts

@@ -74,8 +74,9 @@ userGroupTest('Account Management: Assign user to a group', async ({ page, testG
 	// user is now group now shows 1 member
 	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', user.userId]))
-	expect(info?.groups).toContain(testGroup)
+	const { stdout: jsonList } = await runOcc(['user:info', '--output=json', user.userId])
+	const { groups } = JSON.parse(jsonList)
+	expect(groups).toContain(testGroup)
 })
 
 // ── Delete an empty group ─────────────────────────────────────────────────────
@@ -108,7 +109,10 @@ test.describe('Settings: Delete an empty group', () => {
 		await expect(settingsPage.groupListItem(groupName)).toHaveCount(0)
 
 		// Verify backend
-		const groups: Record<string, unknown> = JSON.parse(await runOcc(['group:list', '--output=json']))
+		// `group:list --output=json` returns the group map directly ({"name":[members]}),
+		// with no `groups` wrapper — unlike `user:info`.
+		const { stdout: jsonList } = await runOcc(['group:list', '--output=json'])
+		const groups = JSON.parse(jsonList)
 		expect(Object.keys(groups)).not.toContain(groupName)
 	})
 })
@@ -145,7 +149,10 @@ test.describe('Settings: Delete a non-empty group', () => {
 
 		await expect(settingsPage.groupListItem(groupName)).toHaveCount(0)
 
-		const groups: Record<string, unknown> = JSON.parse(await runOcc(['group:list', '--output=json']))
+		// `group:list --output=json` returns the group map directly ({"name":[members]}),
+		// with no `groups` wrapper — unlike `user:info`.
+		const { stdout: jsonList } = await runOcc(['group:list', '--output=json'])
+		const groups = JSON.parse(jsonList)
 		expect(Object.keys(groups)).not.toContain(groupName)
 	})
 })

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

@@ -27,7 +27,8 @@ test.describe('Settings: Change user properties', () => {
 		await expect(page.getByText(/Account updated/i)).toBeVisible()
 
 		// Verify backend
-		const info = JSON.parse(await runOcc(['user:info', '--output=json', user.userId]))
+		const { stdout: jsonList } = await runOcc(['user:info', '--output=json', user.userId])
+		const info = JSON.parse(jsonList)
 		expect(info?.display_name).toBe('John Doe')
 	})
 
@@ -68,7 +69,8 @@ test.describe('Settings: Change user properties', () => {
 		await expect(page.getByText(/Account updated/i)).toBeVisible()
 
 		// Verify backend
-		const info = JSON.parse(await runOcc(['user:info', '--output=json', user.userId]))
+		const { stdout: jsonList } = await runOcc(['user:info', '--output=json', user.userId])
+		const info = JSON.parse(jsonList)
 		expect(info?.email).toBe('mymail@example.com')
 	})
 
@@ -90,7 +92,8 @@ test.describe('Settings: Change user properties', () => {
 		await expect(page.getByText(/Account updated/i)).toBeVisible()
 
 		// Verify backend
-		const info = JSON.parse(await runOcc(['user:info', '--output=json', user.userId]))
+		const { stdout: jsonList } = await runOcc(['user:info', '--output=json', user.userId])
+		const info = JSON.parse(jsonList)
 		expect(info?.quota).toBe('5 GB')
 	})
 
@@ -112,7 +115,8 @@ test.describe('Settings: Change user properties', () => {
 		await expect(page.getByText(/Account updated/i)).toBeVisible()
 
 		// Verify backend (stored as bytes)
-		const info = JSON.parse(await runOcc(['user:info', '--output=json', user.userId]))
+		const { stdout: jsonList } = await runOcc(['user:info', '--output=json', user.userId])
+		const info = JSON.parse(jsonList)
 		expect(info?.quota).not.toBe('none')
 	})
 

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

@@ -15,8 +15,8 @@ export const test = randomUserTest.extend({
 		const page = await browser.newPage()
 		try {
 			await login(page.request, user)
-		} catch {
-			// Retry once on transient auth failure
+		} catch (error) {
+			console.info('Failed to authenticate as random user, retrying', error)
 			await new Promise((resolve) => setTimeout(resolve, 800))
 			await login(page.request, user)
 		}

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

@@ -15,8 +15,15 @@ import { test as baseTest } from '@playwright/test'
  */
 export const test = baseTest.extend<{ user: User }>({
 	user: async ({}, use) => {
-		const user = await createRandomUser()
+		let user: User
+		try {
+			user = await createRandomUser()
+		} catch {
+			// Retry once on transient failure
+			await new Promise((resolve) => setTimeout(resolve, 800))
+			user = await createRandomUser()
+		}
 		await use(user)
-		await runOcc(['user:delete', user.userId]).catch(() => {})
+		await runOcc(['user:delete', user.userId], { failOnError: false })
 	},
 })

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

@@ -61,7 +61,7 @@ export async function createStorageWithConfig(
 		command.push('--user', user.userId)
 	}
 
-	const stdout = await runOcc(command)
+	const { stdout } = await runOcc(command)
 	// Plain output is "Storage created with id <id>"; keep only the trailing id
 	return stdout.replace('Storage created with id ', '').trim()
 }
@@ -83,7 +83,7 @@ export async function setStorageMountOptions(mountId: string, options: StorageMo
  * listed here, so this is safe to call without disturbing the per-user specs.
  */
 export async function deleteAllGlobalStorages(): Promise<void> {
-	const stdout = await runOcc(['files_external:list', '--output=json'])
+	const { stdout } = await runOcc(['files_external:list', '--output=json'])
 	const list = JSON.parse(stdout) as Array<{ mount_id: number }>
 	for (const { mount_id: mountId } of list) {
 		await runOcc(['files_external:delete', String(mountId), '--yes'])