Merge 8cccc96 into 0bdf564

miaulalala · web-flow · commit 8fcfd8a7f9b2 · 2026-05-06T11:27:37.000Z
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -1,4 +1,4 @@
-import { configureNextcloud, startNextcloud, stopNextcloud, waitOnNextcloud } from '@nextcloud/cypress/docker'
+import { configureNextcloud, runOcc, startNextcloud, stopNextcloud, waitOnNextcloud } from '@nextcloud/cypress/docker'
 // eslint-disable-next-line n/no-extraneous-import
 import { defineConfig } from 'cypress'
 
@@ -89,6 +89,8 @@ export default defineConfig({
 			config.baseUrl = `http://${ip}/index.php`
 			await waitOnNextcloud(ip)
 			await configureNextcloud(['viewer'])
+			// Cypress uses Electron 118 which NC32 considers unsupported — disable the check
+			await runOcc(['config:system:set', 'no_unsupported_browser_warning', '--value', 'true', '--type', 'boolean'])
 			return config
 		},
 	},
diff --git a/cypress/e2e/filesUtils.ts b/cypress/e2e/filesUtils.ts
@@ -128,10 +128,10 @@ export function toggleMenuAction(filename: string, action: 'details'|'favorite'|
 		.find('[data-cy-files-list-row-actions]')
 		.findByRole('button', { name: 'Actions' })
 		.should('be.visible')
-		.click()
+		.click({ force: true })
 
-	cy.get(`[data-cy-files-list-row-action="${CSS.escape(action)}"]`)
+	cy.get(`[data-cy-files-list-row-action="${CSS.escape(action)}"]`, { timeout: 10000 })
 		.should('be.visible')
 		.findByRole('menuitem')
-		.click()
+		.click({ force: true })
 }
diff --git a/cypress/e2e/settings.cy.ts b/cypress/e2e/settings.cy.ts
@@ -16,14 +16,23 @@ describe('Check that user\'s settings survive a reload', () => {
 	beforeEach(() => {
 		cy.login(user)
 		cy.visit('/settings/user/notifications')
+		// The notification settings are rendered by a Vue component after page load.
+		// On slow CI runners for older NC versions this can exceed the default 4s timeout.
+		cy.get("#app-content input[type='checkbox']", { timeout: 10000 })
+			.should('have.length.at.least', 1)
 	})
 
 	it('Form survive a reload', () => {
+		cy.intercept({ method: 'POST', url: '**/activity/settings' }).as('apiCall')
+
 		cy.get("#app-content input[type='checkbox']").uncheck({ force: true })
 		cy.get("#app-content input[type='checkbox']").should('not.be.checked')
 
+		cy.wait('@apiCall')
 		cy.reload()
 
+		cy.intercept({ method: 'POST', url: '**/activity/settings' }).as('apiCall')
+
 		cy.get("#app-content input[type='checkbox']").uncheck({ force: true })
 		cy.get("#app-content input[type='checkbox']").should('not.be.checked')
 
@@ -34,6 +43,7 @@ describe('Check that user\'s settings survive a reload', () => {
 		cy.get('#calendar_notification').check({ force: true })
 		cy.get('#personal_settings_email').check({ force: true })
 		cy.get('#personal_settings_notification').check({ force: true })
+		cy.wait('@apiCall')
 		cy.reload()
 
 		cy.get('#file_changed_email').should('not.be.checked')
diff --git a/cypress/e2e/sidebar.cy.ts b/cypress/e2e/sidebar.cy.ts
@@ -11,8 +11,11 @@ describe('Check activity listing in the sidebar', { testIsolation: true }, () =>
 		cy.createRandomUser()
 			.then((user) => {
 				cy.login(user)
+				cy.intercept('PROPFIND', /\/remote\.php\/dav\/files\//).as('initialFiles')
 				cy.visit('/apps/files')
-				// Wait for page loaded
+				// Wait for the PROPFIND to complete before asserting the file row —
+				// NC32/33 Docker containers can be slow and exceed the default 4s timeout.
+				cy.wait('@initialFiles')
 				getFileListRow('welcome.txt')
 					.should('be.visible')
 			})
@@ -38,9 +41,9 @@ describe('Check activity listing in the sidebar', { testIsolation: true }, () =>
 
 	it('Has share activity', () => {
 		createPublicShare('welcome.txt')
-		cy.visit('/apps/files')
-		getFileListRow('welcome.txt').should('be.visible')
-
+		// No re-navigation needed — createPublicShare already waits for the share API
+		// and closes the sidebar, so the activity is recorded and the page is stable.
+		// Re-navigating triggers an async share-badge update that closes the Actions menu.
 		showActivityTab('welcome.txt')
 		cy.get('.activity-entry').first().should('contains.text', 'Shared as public link')
 	})
diff --git a/cypress/e2e/sidebarUtils.ts b/cypress/e2e/sidebarUtils.ts
@@ -54,8 +54,6 @@ export function toggleFavorite(fileName: string) {
  * @param fileName Name of the file to share
  */
 export function createPublicShare(fileName: string) {
-	cy.intercept('POST', '/ocs/v2.php/apps/files_sharing/api/v1/shares').as('createPublicShare')
-
 	showSidebarForFile(fileName)
 	cy.get('#app-sidebar-vue')
 		.findByRole('tab', { name: 'Sharing' })
@@ -71,11 +69,16 @@ export function createPublicShare(fileName: string) {
 
 	cy.wait('@createShare')
 	closeSidebar()
-
-	cy.wait('@createPublicShare')
+	// NC32 updates the file-row share badge asynchronously after the sidebar closes;
+	// give Vue time to settle before the caller interacts with the file list.
+	cy.wait(500)
 }
 
 export function addTag(fileName: string, tag: string) {
+	cy.get(`[data-cy-files-list-row-name="${CSS.escape(fileName)}"]`)
+		.find('.files-list__row-icon-preview--loaded')
+		.should('exist')
+
 	showSidebarForFile(fileName)
 
 	cy.get('#app-sidebar-vue .app-sidebar-header')
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
@@ -5,4 +5,9 @@
 import './commands'
 
 // Ignore resize observer errors of Chrome, they are unrelated and save to ignore
-Cypress.on('uncaught:exception', err => !err.message.includes('ResizeObserver'))
+// Also ignore a NC32 files-app TypeError in Electron 118 caused by a keyboard-handling
+// module accessing an undefined export — the page still loads correctly.
+Cypress.on('uncaught:exception', err =>
+	!err.message.includes('ResizeObserver')
+	&& !err.message.includes("Cannot read properties of undefined (reading 'Tab')")
+)
