Merge a05bf23 into d35c536

Author: backportbot[bot]

.github/workflows/cypress.yml

@@ -142,12 +142,14 @@ jobs:
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         if: always()
         with:
-          name: snapshots_${{ matrix.containers }}
-          path: cypress/snapshots
+          name: snapshots_videos_${{ matrix.containers }}
+          path: |
+            cypress/snapshots
+            cypress/videos
 
       - name: Extract NC logs
         if: failure() && matrix.containers != 'component'
-        run: docker logs nextcloud-cypress-tests-${{ env.APP_NAME }} > nextcloud.log
+        run: docker logs nextcloud-cypress-tests_${{ env.APP_NAME }} > nextcloud.log
 
       - name: Upload NC logs
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1

cypress.config.ts

@@ -11,16 +11,20 @@ export default defineConfig({
 	viewportWidth: 1280,
 	viewportHeight: 720,
 
-	// Tries again 2 more times on failure
+	requestTimeout: 20000,
+
 	retries: {
-		runMode: 2,
+		runMode: 0,
 		// do not retry in `cypress open`
 		openMode: 0,
 	},
 
 	// Needed to trigger `after:run` events with cypress open
 	experimentalInteractiveRunEvents: true,
 
+	// disabled if running in CI but enabled in debug mode
+	video: !process.env.CI || !!process.env.RUNNER_DEBUG,
+
 	// faster video processing
 	videoCompression: false,
 
@@ -33,8 +37,6 @@ export default defineConfig({
 	trashAssetsBeforeRuns: true,
 
 	e2e: {
-		testIsolation: false,
-
 		// We've imported your old cypress plugins here.
 		// You may want to clean this up later by importing these.
 		async setupNodeEvents(on, config) {
@@ -74,12 +76,14 @@ export default defineConfig({
 
 			// Remove container after run
 			on('after:run', () => {
-				stopNextcloud()
+				if (!process.env.CI) {
+					stopNextcloud()
+				}
 			})
 
 			// Before the browser launches
 			// starting Nextcloud testing container
-			const ip = await startNextcloud(process.env.BRANCH || 'master')
+			const ip = await startNextcloud(process.env.BRANCH || 'master', undefined, { exposePort: 8080 })
 			// Setting container's IP as base Url
 			config.baseUrl = `http://${ip}/index.php`
 			await waitOnNextcloud(ip)

cypress/e2e/filesUtils.ts

@@ -57,7 +57,12 @@ export const triggerActionForFile = (filename: string, actionId: string) => {
 }
 
 export function renameFile(fileName: string, newName: string) {
+	// The file must exist and the preview loaded as it locks the file
 	getRowForFile(fileName)
+		.should('be.visible')
+		.find('.files-list__row-icon-preview--loaded')
+		.should('exist')
+
 	triggerActionForFile(fileName, 'rename')
 
 	// intercept the move so we can wait for it
@@ -99,8 +104,7 @@ export function createFolder (dirName: string) {
 }
 
 export function moveFile (fileName: string, dirName: string) {
-	toggleMenuAction(fileName)
-	cy.get(`[data-cy-files-list] [data-cy-files-list-row-action="move-copy"]`).click()
+	toggleMenuAction(fileName, 'move-copy')
 	cy.get('.file-picker').within(() => {
 		// intercept the copy so we can wait for it
 		cy.intercept('MOVE', /\/(remote|public)\.php\/dav\/files\//).as('moveFile')
@@ -128,12 +132,23 @@ export function moveFile (fileName: string, dirName: string) {
 	})
 }
 
-export function toggleMenuAction(fileName: string) {
-	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${CSS.escape(fileName)}"] [data-cy-files-list-row-actions]`)
+export function getFileListRow(filename: string) {
+	return cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${CSS.escape(filename)}"]`)
+}
+
+export function toggleMenuAction(fileName: string, action: 'details'|'favorite'|'move-copy'|'rename') {
+	getFileListRow(fileName)
+		.find('[data-cy-files-list-row-actions]')
 		.should('be.visible')
+
+	getFileListRow(fileName)
+		.find('[data-cy-files-list-row-actions]')
 		.findByRole('button', { name: 'Actions' })
 		.should('be.visible')
 		.click()
-	cy.get('[data-cy-files-list-row-action]')
+
+	cy.get(`[data-cy-files-list-row-action="${CSS.escape(action)}"]`)
 		.should('be.visible')
+		.findByRole('menuitem')
+		.click()
 }

cypress/e2e/settings.cy.ts

@@ -20,13 +20,19 @@
  *
  */
 
+import type { User } from "@nextcloud/cypress"
+
 describe('Check that user\'s settings survive a reload', () => {
+	let user: User
+
 	before(() => {
 		cy.createRandomUser()
-			.then((user) => {
-				cy.login(user)
-				cy.visit('/settings/user/notifications')
-			})
+			.then(_user => user = _user)
+	})
+
+	beforeEach(() => {
+		cy.login(user)
+		cy.visit('/settings/user/notifications')
 	})
 
 	it('Form survive a reload', () => {

cypress/e2e/sidebar.cy.ts

@@ -20,8 +20,8 @@
  *
  */
 
-import { createFolder, moveFile, navigateToFolder, renameFile } from './filesUtils'
-import { addComment, addTag, addToFavorites, createPublicShare, removeFromFavorites, showActivityTab } from './sidebarUtils'
+import { createFolder, navigateToFolder, moveFile, renameFile, getFileListRow } from './filesUtils'
+import { addComment, addTag, addToFavorites, createPublicShare, randHash, removeFromFavorites, showActivityTab } from './sidebarUtils'
 
 describe('Check activity listing in the sidebar', { testIsolation: true }, () => {
 	beforeEach(function() {
@@ -49,8 +49,9 @@ describe('Check activity listing in the sidebar', { testIsolation: true }, () =>
 
 	it('Has share activity', () => {
 		createPublicShare('welcome.txt')
-		cy.get('body').contains('Link share created').should('exist')
-		cy.get('.toast-close').click({ multiple: true })
+		cy.visit('/apps/files')
+		getFileListRow('welcome.txt').should('be.visible')
+
 		showActivityTab('welcome.txt')
 		cy.get('.activity-entry').first().should('contains.text', 'Shared as public link')
 	})
@@ -73,7 +74,8 @@ describe('Check activity listing in the sidebar', { testIsolation: true }, () =>
 	})
 
 	it('Has tag activity', () => {
-		addTag('welcome.txt', 'my_tag')
+		addTag('welcome.txt', `my_tag_${randHash()}`)
+		cy.visit('/apps/files')
 
 		showActivityTab('welcome.txt')
 		cy.get('.activity-entry').first().should('contains.text', 'Added system tag')

cypress/e2e/sidebarUtils.ts

@@ -24,11 +24,7 @@ import { toggleMenuAction } from './filesUtils'
 
 function showSidebarForFile(fileName: string) {
 	closeSidebar()
-	toggleMenuAction(fileName)
-	cy.get('[data-cy-files-list-row-action="details"]')
-		.should('be.visible')
-		.findByRole('menuitem')
-		.click()
+	toggleMenuAction(fileName, 'details')
 	cy.get('#app-sidebar-vue').should('be.visible')
 }
 
@@ -47,20 +43,18 @@ export function showActivityTab(fileName: string) {
 	cy.intercept('GET', '/ocs/v2.php/apps/activity/api/v2/activity/filter**').as('getActivities')
 
 	showSidebarForFile(fileName)
-	cy.get('#app-sidebar-vue').contains('Activity').click()
+	cy.get('#app-sidebar-vue').contains('Activity').click({ force: true })
 
 	cy.wait('@getActivities')
 }
 
 export function addToFavorites(fileName: string) {
-	toggleMenuAction(fileName)
-	cy.get('[data-cy-files-list-row-action="favorite"]').should('contain', 'Add to favorites').click()
+	toggleMenuAction(fileName, 'favorite')
 	cy.get('.toast-close').click()
 }
 
 export function removeFromFavorites(fileName: string) {
-	toggleMenuAction(fileName)
-	cy.get('[data-cy-files-list-row-action="favorite"]').should('contain', 'Remove from favorites').click()
+	toggleMenuAction(fileName, 'favorite')
 	cy.get('.toast-close').click()
 }
 
@@ -117,3 +111,7 @@ export function addComment(fileName: string, comment: string) {
 
 	cy.wait('@comment')
 }
+
+export function randHash() {
+	return Math.random().toString(36).replace(/[^a-z]+/g, '').slice(0, 10)
+}

package-lock.json

@@ -59,7 +59,7 @@
   },
   "devDependencies": {
     "@nextcloud/browserslist-config": "^3.0.0",
-    "@nextcloud/cypress": "^1.0.0-beta.14",
+    "@nextcloud/cypress": "^1.0.0-beta.15",
     "@nextcloud/eslint-config": "^8.3.0",
     "@nextcloud/stylelint-config": "^2.4.0",
     "@nextcloud/vite-config": "^1.2.0",