test: adjust for dependency updates

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

Author: susnux

.github/workflows/playwright.yml

@@ -5,7 +5,9 @@ name: Playwright Tests
 
 on:
   pull_request:
-    branches: [master]
+    branches:
+      - master
+      - stable35
     types:
       - opened
       - synchronize

apps/files/src/actions/openLocallyAction.spec.ts

@@ -13,6 +13,11 @@ import { action } from './openLocallyAction.ts'
 
 vi.mock('@nextcloud/auth')
 vi.mock('@nextcloud/axios')
+// Only mock the toasts, the dialog classes are needed to test the confirmation dialog
+vi.mock('@nextcloud/dialogs', async (importOriginal) => ({
+	...await importOriginal<typeof nextcloudDialogs>(),
+	showError: vi.fn(),
+}))
 
 const view = {
 	id: 'files',

apps/files/src/services/DropServiceUtils.spec.ts

@@ -10,6 +10,8 @@ import { logger } from '../utils/logger.ts'
 import { dataTransferToFileTree } from './DropService.ts'
 import { Directory, traverseTree } from './DropServiceUtils.ts'
 
+vi.mock('@nextcloud/dialogs')
+
 const dataTree = {
 	'file0.txt': ['Hello, world!', 1234567890],
 	dir1: {

apps/files/src/views/DialogConfirmFileHidden.spec.ts

@@ -25,7 +25,7 @@ describe('DialogConfirmFileHidden', () => {
 		})
 
 		await expect(component.findByRole('dialog', { name: 'Rename file to hidden' })).resolves.not.toThrow()
-		expect((component.getByRole('checkbox', { name: /Do not show this dialog again/i }) as HTMLInputElement).checked).toBe(false)
+		expect((component.getByRole('switch', { name: /Do not show this dialog again/i }) as HTMLInputElement).checked).toBe(false)
 		await expect(component.findByRole('button', { name: 'Cancel' })).resolves.not.toThrow()
 		await expect(component.findByRole('button', { name: 'Rename' })).resolves.not.toThrow()
 	})
@@ -86,7 +86,7 @@ describe('DialogConfirmFileHidden', () => {
 			},
 		})
 
-		await fireEvent.click(component.getByRole('checkbox', { name: /Do not show this dialog again/i }))
+		await fireEvent.click(component.getByRole('switch', { name: /Do not show this dialog again/i }))
 		const store = useUserConfigStore()
 		expect(store.update).toHaveBeenCalledOnce()
 		expect(store.update).toHaveBeenCalledWith('show_dialog_file_extension', false)

apps/files_trashbin/src/services/api.spec.ts

@@ -13,6 +13,7 @@ const axiosMock = vi.hoisted(() => ({
 	delete: vi.fn(),
 }))
 vi.mock('@nextcloud/axios', () => ({ default: axiosMock }))
+vi.mock('@nextcloud/dialogs')
 
 describe('files_trashbin: API - emptyTrash', () => {
 	beforeEach(() => {

build/frontend-legacy/__tests__/mock-window.js

@@ -13,3 +13,18 @@ window.OCA = { ...window.OCA }
 window.OCP = { ...window.OCP }
 
 window._oc_webroot = ''
+
+// jsdom does not implement `innerText` at all, while the specification defines it
+// to fall back to `textContent` for elements that are not being rendered.
+// @see https://github.com/jsdom/jsdom/issues/1245
+if (!('innerText' in HTMLElement.prototype)) {
+	Object.defineProperty(HTMLElement.prototype, 'innerText', {
+		configurable: true,
+		get() {
+			return this.textContent
+		},
+		set(value) {
+			this.textContent = value
+		},
+	})
+}

build/frontend/__tests__/mock-window.js

@@ -13,3 +13,18 @@ window.OCA = { ...window.OCA }
 window.OCP = { ...window.OCP }
 
 window._oc_webroot = ''
+
+// jsdom does not implement `innerText` at all, while the specification defines it
+// to fall back to `textContent` for elements that are not being rendered.
+// @see https://github.com/jsdom/jsdom/issues/1245
+if (!('innerText' in HTMLElement.prototype)) {
+	Object.defineProperty(HTMLElement.prototype, 'innerText', {
+		configurable: true,
+		get() {
+			return this.textContent
+		},
+		set(value) {
+			this.textContent = value
+		},
+	})
+}

build/frontend/vitest.config.ts

@@ -36,6 +36,13 @@ export default defineConfig({
 	resolve: {
 		preserveSymlinks: true,
 	},
+	server: {
+		fs: {
+			// The dependencies are installed in the repository root, which is outside of the vite root,
+			// so it needs to be allowed explicitly for assets like `*.svg?raw` to be loadable.
+			allow: [resolve(import.meta.dirname, '../..')],
+		},
+	},
 	test: {
 		include: ['apps/**/*.{test,spec}.?(c|m)[jt]s?(x)'],
 		env: {

tests/playwright/e2e/files/drag-n-drop.spec.ts

@@ -6,6 +6,7 @@
 import { expect, test } from '../../support/fixtures/files-page.ts'
 import { mkdir, uploadContent } from '../../support/utils/dav.ts'
 import { createFileDataTransfer, dropFilesOn } from '../../support/utils/drag-drop.ts'
+import { getToast } from '../../support/utils/toast.ts'
 
 test.describe('files: Drag and Drop', () => {
 	test.beforeEach(async ({ filesListPage }) => {
@@ -56,7 +57,7 @@ test.describe('files: Drag and Drop', () => {
 
 		await dropFilesOn(filesListPage.getDropArea(), dataTransfer)
 
-		await expect(page.locator('.toast-warning')).toBeVisible()
+		await expect(getToast(page, 'Your browser does not support the Filesystem API')).toBeVisible()
 		await expect(filesListPage.getRowForFile('first.txt')).toBeVisible()
 		await expect(filesListPage.getRowForFile('second.txt')).toBeVisible()
 		await expect(filesListPage.getRowForFile('Foo')).toHaveCount(0)

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

@@ -5,6 +5,7 @@
 
 import { expect, test } from '../../support/fixtures/files-page.ts'
 import { mkdir, uploadContent } from '../../support/utils/dav.ts'
+import { getToast } from '../../support/utils/toast.ts'
 
 test.describe('Files', () => {
 	test('Login with a user and open the files app', async ({ filesListPage }) => {
@@ -21,7 +22,7 @@ test.describe('Files', () => {
 		await expect(row).toBeVisible()
 		await expect(row).toHaveAttribute('data-cy-files-list-row-name', 'original.txt')
 		await expect(row).toBeActiveRow()
-		await expect(page.getByText('The file could not be found')).toHaveCount(0)
+		await expect(getToast(page, 'The file could not be found')).toHaveCount(0)
 	})
 
 	test('Opens a valid folder shows its content', async ({ page, user, filesListPage }) => {
@@ -31,13 +32,13 @@ test.describe('Files', () => {
 		await filesListPage.waitForList()
 
 		await expect(filesListPage.getBreadcrumbs()).toContainText('folder')
-		await expect(page.getByText('The file could not be found')).toHaveCount(0)
+		await expect(getToast(page, 'The file could not be found')).toHaveCount(0)
 	})
 
 	test('Opens an unknown file show an error', async ({ page }) => {
 		await page.goto('apps/files/files/123456')
 
 		// The error toast is shown once the (failing) PROPFIND resolves
-		await expect(page.getByText('The file could not be found')).toBeVisible()
+		await expect(getToast(page, 'The file could not be found')).toBeVisible()
 	})
 })