Merge pull request #61513 from nextcloud/chore/eslint-pw

chore(tests): adjust PlayWright tests to follow ESLint rules

Author: susnux

core/src/OC/msg.ts

@@ -97,7 +97,6 @@ export default {
 				return
 			}
 
-			// eslint-disable-next-line @stylistic/exp-list-style
 			const animation = el.animate?.(
 				[
 					{ opacity: 1 },

dist/core-login.js.map

@@ -73,10 +73,19 @@ export default defineConfig([
 		},
 	},
 
+	// Playwright tests setup
+	{
+		name: 'server/playwright',
+		files: ['tests/playwright/**'],
+		rules: {
+			'no-empty-pattern': 'off', // PW needs the destructuring syntax {} for fixtures!
+		},
+	},
+
 	// Forbid commiting .only in test files (skipping tests is very unexpected)
 	{
 		name: 'server/no-only-in-tests',
-		files: ['cypress/**', 'apps/**/*.spec.*', 'core/**/*.spec.*'],
+		files: ['cypress/**', 'tests/playwright/**', 'apps/**/*.spec.*', 'core/**/*.spec.*'],
 		plugins: {
 			'no-only-tests': noOnlyTests,
 		},
@@ -96,7 +105,7 @@ export default defineConfig([
 			'composer.json',
 			'**/*.php',
 			'3rdparty/',
-			'tests/', // PHP tests
+			'tests/!(playwright)/', // PHP tests, but not Playwright tests
 			'**/js/',
 			'**/l10n/', // all translations (config only ignored in root)
 			'**/vendor/', // different vendors

dist/core-main.js.map

@@ -23,7 +23,7 @@
     "postinstall": "build/demi.sh ci",
     "lint": "eslint --suppressions-location build/eslint-baseline.json --no-error-on-unmatched-pattern ./cypress ./tests/playwright",
     "postlint": "build/demi.sh lint",
-    "lint:fix": "build/demi.sh lint:fix",
+    "lint:fix": "concurrently 'npm run lint -- --fix' 'build/demi.sh lint:fix'",
     "playwright": "playwright test",
     "playwright:install": "playwright install chromium-headless-shell",
     "sass": "sass --style compressed --load-path core/css core/css/ $(for cssdir in $(find apps -mindepth 2 -maxdepth 2 -name \"css\"); do if ! $(git check-ignore -q $cssdir); then printf \"$cssdir \"; fi; done)",

eslint.config.js

@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { runOcc } from '@nextcloud/e2e-test-server'
 import { expect } from '@playwright/test'
 import { test } from '../../support/fixtures/admin-appstore-page.ts'
 import { handlePasswordConfirmation } from '../../support/utils/password-confirmation.ts'
-import { runOcc } from '@nextcloud/e2e-test-server'
 
 test.describe('Settings: App management', () => {
-	test.beforeEach(async ({ page, appstorePage }) => {
+	test.beforeEach(async ({ appstorePage }) => {
 		// Disable QA testing app if already enabled
 		expect(await runOcc(['app:disable', 'testing']))
 			.toMatch(/(No such app enabled|testing .+ disabled)/)
@@ -19,22 +19,20 @@ test.describe('Settings: App management', () => {
 
 		// Open the installed apps page
 		await appstorePage.openInstalledApps()
-		
+
 		// Wait for the apps table to load
 		await appstorePage.appsTable().waitFor({ state: 'visible', timeout: 10000 })
 	})
 
 	test('Can enable an installed app', async ({ page, appstorePage }) => {
 		// Intercept the enable app request
-		const enableRequest = page.waitForResponse(
-			(response) => response.url().includes('/ocs/v2.php/apps/appstore/api/v1/apps/enable'),
-		)
+		const enableRequest = page.waitForResponse((response) => response.url().includes('/ocs/v2.php/apps/appstore/api/v1/apps/enable'))
 
 		// Find and click the enable button for the QA testing app
 		await expect(appstorePage.appsTable()).toBeVisible()
 		const qaTestingRow = appstorePage.appRow('QA testing')
 		await expect(qaTestingRow).toBeVisible({ timeout: 10000 })
-		
+
 		await appstorePage.enableButton('QA testing').click({ force: true })
 
 		// Handle password confirmation if needed
@@ -57,15 +55,13 @@ test.describe('Settings: App management', () => {
 
 	test('Can disable an installed app', async ({ page, appstorePage }) => {
 		// Intercept the disable app request
-		const disableRequest = page.waitForResponse(
-			(response) => response.url().includes('/ocs/v2.php/apps/appstore/api/v1/apps/disable'),
-		)
+		const disableRequest = page.waitForResponse((response) => response.url().includes('/ocs/v2.php/apps/appstore/api/v1/apps/disable'))
 
 		// Find and click the disable button for the Update notification app
 		await expect(appstorePage.appsTable()).toBeVisible()
 		const updateRow = appstorePage.appRow('Update notification')
 		await expect(updateRow).toBeVisible({ timeout: 10000 })
-		
+
 		await appstorePage.disableButton('Update notification').click({ force: true })
 
 		// Handle password confirmation if needed
@@ -95,15 +91,15 @@ test.describe('Settings: App management', () => {
 
 		// Verify that there are only enabled apps (all have "Disable" button, no "Enable" button)
 		await expect(appstorePage.appsTable()).toBeVisible()
-		
+
 		// Get all rows and verify each has a disable button and no enable button
 		const rows = appstorePage.appsTable().locator('tr')
 		const rowCount = await rows.count()
-		
-		for (let i = 1; i < rowCount; i++) {  // Skip header row
+
+		for (let i = 1; i < rowCount; i++) { // Skip header row
 			const row = rows.nth(i)
 			const enableButton = row.getByRole('button', { name: 'Enable' })
-			
+
 			// Enabled apps should not have an "Enable" button
 			await expect(enableButton).not.toBeVisible()
 		}
@@ -118,15 +114,15 @@ test.describe('Settings: App management', () => {
 
 		// Verify that there are only disabled apps (all have "Enable" button, no "Disable" button)
 		await expect(appstorePage.appsTable()).toBeVisible()
-		
+
 		// Get all rows and verify each has an enable button and no disable button
 		const rows = appstorePage.appsTable().locator('tr')
 		const rowCount = await rows.count()
-		
-		for (let i = 1; i < rowCount; i++) {  // Skip header row
+
+		for (let i = 1; i < rowCount; i++) { // Skip header row
 			const row = rows.nth(i)
 			const disableButton = row.getByRole('button', { name: 'Disable' })
-			
+
 			// Disabled apps should not have a "Disable" button
 			await expect(disableButton).not.toBeVisible()
 		}
@@ -152,12 +148,12 @@ test.describe('Settings: App management', () => {
 		const sidebar = appstorePage.appSidebar()
 		await expect(sidebar).toBeVisible()
 		await expect(appstorePage.appSidebarHeader()).toContainText('QA testing')
-		
+
 		// Verify the sidebar contains expected elements
 		await expect(appstorePage.viewInStoreLink()).toBeVisible()
 		await expect(appstorePage.appSidebarEnableButton()).toBeVisible()
 		await expect(appstorePage.removeButton()).toBeVisible()
-		
+
 		// Verify version information is displayed
 		await expect(appstorePage.versionText()).toBeVisible()
 	})

package.json

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { test, expect } from '@playwright/test'
+import { expect, test } from '@playwright/test'
 
 test.describe('404 error page', () => {
 	test('renders 404 page with a link back to login', async ({ page }) => {

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

@@ -4,8 +4,8 @@
  */
 
 import { expect } from '@playwright/test'
-import { test as userTest } from '../../support/fixtures/random-user-session.ts'
 import { test as adminTest } from '../../support/fixtures/admin-session.ts'
+import { test as userTest } from '../../support/fixtures/random-user-session.ts'
 import { AccountMenuPage } from '../../support/sections/AccountMenuPage.ts'
 
 // Regular user tests — the page fixture is logged in as a fresh random user.

tests/playwright/e2e/core/404-error.spec.ts

@@ -4,8 +4,8 @@
  */
 
 import { expect } from '@playwright/test'
-import { test as userTest } from '../../support/fixtures/random-user-session.ts'
 import { test as adminTest } from '../../support/fixtures/admin-session.ts'
+import { test as userTest } from '../../support/fixtures/random-user-session.ts'
 import { NavigationHeaderPage } from '../../support/sections/NavigationHeaderPage.ts'
 
 // Regular-user tests — logged in as a fresh random user.
@@ -65,7 +65,7 @@ adminTest.describe('Header: App menu (waffle launcher) – admin', () => {
  */
 async function expectWaffleMenuContainsApps(
 	navigationHeader: NavigationHeaderPage,
-	apps: Array<{ name: string; href: string }>,
+	apps: Array<{ name: string, href: string }>,
 ): Promise<void> {
 	await navigationHeader.openMenu()
 	await expect(navigationHeader.popover()).toBeVisible()

tests/playwright/e2e/core/header-access-levels.spec.ts

@@ -4,6 +4,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'