Skip to content

Commit

Permalink
fix(files): Update webdav to 5.3.2 fixing handling of files with XM…
Browse files Browse the repository at this point in the history
…L entities in their names

Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
susnux authored and backportbot[bot] committed Feb 9, 2024
1 parent c4b164d commit 985e1be
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 8 deletions.
32 changes: 32 additions & 0 deletions cypress/e2e/files/FilesUtils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* @copyright Copyright (c) 2024 Ferdinand Thiessen <[email protected]>
*
* @author Ferdinand Thiessen <[email protected]>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

export const getRowForFile = (filename: string) => cy.get(`[data-cy-files-list-row-name="${CSS.escape(filename)}"]`)

export const getActionsForFile = (filename: string) => getRowForFile(filename).find('[data-cy-files-list-row-actions]')

export const getActionButtonForFile = (filename: string) => getActionsForFile(filename).find('button[aria-label="Actions"]')

export const triggerActionForFile = (filename: string, actionId: string) => {
getActionButtonForFile(filename).click()
cy.get(`[data-cy-files-list-row-action="${CSS.escape(actionId)}"] > button`).should('exist').click()
}
68 changes: 68 additions & 0 deletions cypress/e2e/files/files-xml-regression.cy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/**
* @copyright Copyright (c) 2024 Ferdinand Thiessen
*
* @author John Molakvoæ <[email protected]>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

import { getRowForFile, triggerActionForFile } from './FilesUtils.ts'

/**
* This is a regression test for https://github.com/nextcloud/server/issues/43331
* Where files with XML entities in their names were wrongly displayed and could no longer be renamed / deleted etc.
*/
describe('Files: Can handle XML entities in file names', { testIsolation: false }, () => {
before(() => {
cy.createRandomUser().then((user) => {
cy.uploadContent(user, new Blob(), 'text/plain', '/and.txt')
cy.login(user)
cy.visit('/apps/files/')
})
})

it('Can reanme to a file name containing XML entities', () => {
cy.intercept('MOVE', /\/remote.php\/dav\/files\//).as('renameFile')
triggerActionForFile('and.txt', 'rename')
getRowForFile('and.txt')
.find('form[aria-label="Rename file"] input')
.type('{selectAll}&amp;.txt{enter}')

cy.wait('@renameFile')
getRowForFile('&amp;.txt').should('be.visible')
})

it('After a reload the filename is preserved', () => {
cy.reload()
getRowForFile('&amp;.txt').should('be.visible')
getRowForFile('&.txt').should('not.exist')
})

it('Can delete the file', () => {
cy.intercept('DELETE', /\/remote.php\/dav\/files\//).as('deleteFile')
triggerActionForFile('&amp;.txt', 'delete')
cy.wait('@deleteFile')

cy.contains('.toast-success', /Delete .* successfull/)
.should('be.visible')
getRowForFile('&amp;.txt').should('not.exist')

cy.reload()
getRowForFile('&amp;.txt').should('not.exist')
getRowForFile('&.txt').should('not.exist')
})
})
8 changes: 1 addition & 7 deletions cypress/e2e/files/files_copy-move.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@
*
*/

const getRowForFile = (filename: string) => cy.get(`[data-cy-files-list-row-name="${filename}"]`)
const getActionsForFile = (filename: string) => getRowForFile(filename).find('[data-cy-files-list-row-actions]')
const getActionButtonForFile = (filename: string) => getActionsForFile(filename).find('button[aria-label="Actions"]')
const triggerActionForFile = (filename: string, actionId: string) => {
getActionButtonForFile(filename).click()
cy.get(`[data-cy-files-list-row-action="${actionId}"] > button`).should('exist').click()
}
import { getRowForFile, triggerActionForFile } from './FilesUtils.ts'

describe('Files: Move or copy files', { testIsolation: true }, () => {
let currentUser
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"vuedraggable": "^2.24.3",
"vuex": "^3.6.2",
"vuex-router-sync": "^5.0.0",
"webdav": "^5.3.1",
"webdav": "^5.3.2",
"xml2js": "^0.6.2"
},
"devDependencies": {
Expand Down

0 comments on commit 985e1be

Please sign in to comment.