Merge pull request #2806 from nextcloud/fix/fix-cypress-file-deletion

Author: come-nc

cypress/e2e/groupfolders.cy.ts

@@ -26,6 +26,7 @@ import {
 	createGroupFolder,
 	deleteGroupFolder,
 	deleteFile,
+	deleteFolder,
 	enableACLPermissions,
 	enterFolder,
 	enterFolderInTrashbin,
@@ -126,7 +127,7 @@ describe('Groupfolders ACLs and trashbin behavior', () => {
 		cy.visit('/apps/files')
 		enterFolder(groupFolderName)
 		enterFolder('subfolder1')
-		deleteFile('subfolder2')
+		deleteFolder('subfolder2')
 
 		// User1 sees it in trash
 		cy.logout()
@@ -186,7 +187,7 @@ describe('Groupfolders ACLs and trashbin behavior', () => {
 		cy.login(managerUser)
 		cy.visit('/apps/files')
 		enterFolder(groupFolderName)
-		deleteFile('subfolder1')
+		deleteFolder('subfolder1')
 
 		// User1 sees it in trash
 		cy.login(user1)

cypress/e2e/groupfoldersUtils.ts

@@ -110,8 +110,24 @@ export function enterFolderInTrashbin(name: string) {
 	cy.wait('@propFindFolder')
 }
 
+export function deleteFolder(name: string) {
+	cy.intercept({ times: 1, method: 'DELETE', url: `**/dav/files/**/${name}` }).as('delete')
+	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${name}"] [data-cy-files-list-row-actions]`).click()
+	cy.get(`[data-cy-files-list] [data-cy-files-list-row-action="delete"]`).should('be.visible')
+	cy.get(`[data-cy-files-list] [data-cy-files-list-row-action="delete"]`).scrollIntoView()
+	cy.get(`[data-cy-files-list] [data-cy-files-list-row-action="delete"]`).click()
+	cy.wait('@delete').its('response.statusCode').should('eq', 204)
+}
+
 export function deleteFile(name: string) {
 	cy.intercept({ times: 1, method: 'DELETE', url: `**/dav/files/**/${name}` }).as('delete')
+	// For files wait for preview to load and release lock
+	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${name}"] .files-list__row-icon img`)
+	.should('be.visible')
+	.and(($img) => {
+		// "naturalWidth" and "naturalHeight" are set when the image loads
+		expect($img[0].naturalWidth, 'image has natural width').to.be.greaterThan(0)
+	})
 	cy.get(`[data-cy-files-list] [data-cy-files-list-row-name="${name}"] [data-cy-files-list-row-actions]`).click()
 	cy.get(`[data-cy-files-list] [data-cy-files-list-row-action="delete"]`).should('be.visible')
 	cy.get(`[data-cy-files-list] [data-cy-files-list-row-action="delete"]`).scrollIntoView()