sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51257 from nextcloud/backport/51211/stable31 

[stable31] test(e2e): adjust trashbin tests to be less flaky
pull/51263/head
John Molakvoæ 2025-03-05 09:17:08 +07:00 committed by GitHub
parent ea24143154 571124bc3c
commit 07293019d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 94 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cypress/e2e/files/FilesUtils.ts
Unescape Escape View File

@ -170,9 +170,13 @@ export const renameFile = (fileName: string, newFileName: string) => {
export const navigateToFolder = (dirPath: string) => {
const directories = dirPath.split('/')
directories.forEach((directory) => {
for (const directory of directories) {
if (directory === '') {
continue
}
getRowForFile(directory).should('be.visible').find('[data-cy-files-list-row-name-link]').click()
})
}
}

12
cypress/e2e/files/files-actions.cy.ts
Unescape Escape View File

@ -6,14 +6,14 @@
import type { User } from '@nextcloud/cypress'
import { FileAction } from '@nextcloud/files'
import { getActionButtonForFileId, getActionEntryForFileId, getRowForFile, getSelectionActionButton, getSelectionActionEntry, selectRowForFile, triggerActionForFile, triggerActionForFileId } from './FilesUtils'
import { getActionButtonForFileId, getActionEntryForFileId, getRowForFile, getSelectionActionButton, getSelectionActionEntry, selectRowForFile } from './FilesUtils'
import { ACTION_COPY_MOVE } from '../../../apps/files/src/actions/moveOrCopyAction'
import { ACTION_DELETE } from '../../../apps/files/src/actions/deleteAction'
import { ACTION_DETAILS } from '../../../apps/files/src/actions/sidebarAction'
import { ACTION_SHARING_STATUS } from '../../../apps/files_sharing/src/files_actions/sharingStatusAction'
declare global {
interface Window {
interface Window {
_nc_fileactions: FileAction[]
}
}
@ -53,6 +53,8 @@ describe('Files: Actions', { testIsolation: true }, () => {
getActionButtonForFileId(fileId).click({ force: true })
// Check the action is visible
getActionEntryForFileId(fileId, actionId).should('be.visible')
// Close the menu
cy.get('body').click({ force: true })
})
})
@ -60,7 +62,7 @@ describe('Files: Actions', { testIsolation: true }, () => {
const parent = new FileAction({
id: 'nested-action',
displayName: () => 'Nested Action',
exec: cy.spy(),
exec: cy.spy(),
iconSvgInline: () => '<svg></svg>',
})
@ -88,7 +90,7 @@ describe('Files: Actions', { testIsolation: true }, () => {
win._nc_fileactions.push(parent)
win._nc_fileactions.push(child1)
win._nc_fileactions.push(child2)
}
},
})
// Open the menu
@ -175,7 +177,7 @@ describe('Files: Actions', { testIsolation: true }, () => {
win._nc_fileactions.push(parent)
win._nc_fileactions.push(child1)
win._nc_fileactions.push(child2)
}
},
})
selectRowForFile('image.jpg')

74
cypress/e2e/files/files-delete.cy.ts
Unescape Escape View File

@ -0,0 +1,74 @@
/*!
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import type { User } from '@nextcloud/cypress'
import { getRowForFile, navigateToFolder, selectAllFiles, triggerActionForFile } from './FilesUtils.ts'
describe('files: Delete files using file actions', { testIsolation: true }, () => {
let user: User
beforeEach(() => {
cy.createRandomUser().then(($user) => {
user = $user
})
})
it('can delete file', () => {
cy.uploadContent(user, new Blob([]), 'text/plain', '/file.txt')
cy.login(user)
cy.visit('/apps/files')
// The file must exist and the preview loaded as it locks the file
getRowForFile('file.txt')
.should('be.visible')
.find('.files-list__row-icon-preview--loaded')
.should('exist')
cy.intercept('DELETE', '**/remote.php/dav/files/**').as('deleteFile')
triggerActionForFile('file.txt', 'delete')
cy.wait('@deleteFile').its('response.statusCode').should('eq', 204)
})
it('can delete multiple files', () => {
cy.mkdir(user, '/root')
for (let i = 0; i < 5; i++) {
cy.uploadContent(user, new Blob([]), 'text/plain', `/root/file${i}.txt`)
}
cy.login(user)
cy.visit('/apps/files')
navigateToFolder('/root')
// The file must exist and the preview loaded as it locks the file
cy.get('.files-list__row-icon-preview--loaded')
.should('have.length', 5)
cy.intercept('DELETE', '**/remote.php/dav/files/**').as('deleteFile')
// select all
selectAllFiles()
cy.get('[data-cy-files-list-selection-actions]')
.findByRole('button', { name: 'Actions' })
.click()
cy.get('[data-cy-files-list-selection-action="delete"]')
.findByRole('menuitem', { name: /^Delete files/ })
.click()
// see dialog for confirmation
cy.findByRole('dialog', { name: 'Confirm deletion' })
.findByRole('button', { name: 'Delete files' })
.click()
cy.wait('@deleteFile')
cy.get('@deleteFile.all')
.should('have.length', 5)
// eslint-disable-next-line @typescript-eslint/no-explicit-any
.should((all: any) => {
for (const call of all) {
expect(call.response.statusCode).to.equal(204)
}
})
})
})

44
cypress/e2e/files_trashbin/files-trash-action.cy.ts
Unescape Escape View File

@ -3,7 +3,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import type { User } from '@nextcloud/cypress'
import { deleteFileWithRequest, getRowForFile, triggerActionForFile, triggerFileListAction } from '../files/FilesUtils.ts'
import { deleteFileWithRequest, triggerFileListAction } from '../files/FilesUtils.ts'
const FILE_COUNT = 5
describe('files_trashbin: Empty trashbin action', { testIsolation: true }, () => {
@ -12,44 +12,19 @@ describe('files_trashbin: Empty trashbin action', { testIsolation: true }, () =>
beforeEach(() => {
cy.createRandomUser().then(($user) => {
user = $user
// create 10 fake files
new Array(FILE_COUNT).fill(0).forEach((_, index) => {
// create 5 fake files and move them to trash
for (let index = 0; index < FILE_COUNT; index++) {
cy.uploadContent(user, new Blob(['<content>']), 'text/plain', `/file${index}.txt`)
})
deleteFileWithRequest(user, `/file${index}.txt`)
}
// login
cy.login(user)
cy.visit('/apps/files')
})
})
it('Can delete files', () => {
for (let i = 0; i < FILE_COUNT; i++) {
getRowForFile(`file${i}.txt`).should('be.visible')
}
cy.intercept('DELETE', '**/remote.php/dav/files/**').as('deleteFile')
// Delete all files one by one
for (let i = 0; i < FILE_COUNT; i++) {
triggerActionForFile(`file${i}.txt`, 'delete')
cy.wait('@deleteFile').its('response.statusCode').should('eq', 204)
}
cy.get('@deleteFile.all').should('have.length', FILE_COUNT)
for (let i = 0; i < FILE_COUNT; i++) {
getRowForFile(`file${i}.txt`).should('not.exist')
}
})
it('Can empty trashbin', () => {
// Delete files from home
new Array(FILE_COUNT).fill(0).forEach((_, index) => {
deleteFileWithRequest(user, `/file${index}.txt`)
})
// Home have no files (or the default welcome file)
cy.visit('/apps/files')
// Home have no files (or the default welcome file)
cy.get('[data-cy-files-list-row-fileid]').should('have.length', 1)
cy.get('[data-cy-files-list-action="empty-trash"]').should('not.exist')
@ -74,11 +49,6 @@ describe('files_trashbin: Empty trashbin action', { testIsolation: true }, () =>
})
it('Cancelling empty trashbin action does not delete anything', () => {
// Delete files from home
new Array(FILE_COUNT).fill(0).forEach((_, index) => {
deleteFileWithRequest(user, `/file${index}.txt`)
})
// Go to trashbin, and see our deleted files
cy.visit('/apps/files/trashbin')
cy.get('[data-cy-files-list-row-fileid]').should('have.length', FILE_COUNT)