From fbba6f93a2d04fd742c0789c8a4bc0fbcf068a2d Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Mon, 5 Feb 2024 12:42:18 +0100 Subject: [PATCH] fix(files): Update `webdav` to 5.3.2 fixing handling of files with XML entities in their names Signed-off-by: Ferdinand Thiessen --- cypress/e2e/files/FilesUtils.ts | 32 +++++++++ cypress/e2e/files/files-xml-regression.cy.ts | 68 ++++++++++++++++++++ cypress/e2e/files/files_copy-move.cy.ts | 8 +-- package-lock.json | 8 +-- package.json | 2 +- 5 files changed, 106 insertions(+), 12 deletions(-) create mode 100644 cypress/e2e/files/FilesUtils.ts create mode 100644 cypress/e2e/files/files-xml-regression.cy.ts diff --git a/cypress/e2e/files/FilesUtils.ts b/cypress/e2e/files/FilesUtils.ts new file mode 100644 index 00000000000..0bad38693ae --- /dev/null +++ b/cypress/e2e/files/FilesUtils.ts @@ -0,0 +1,32 @@ +/** + * @copyright Copyright (c) 2024 Ferdinand Thiessen + * + * @author Ferdinand Thiessen + * + * @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 . + * + */ + +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() +} diff --git a/cypress/e2e/files/files-xml-regression.cy.ts b/cypress/e2e/files/files-xml-regression.cy.ts new file mode 100644 index 00000000000..5e26418d442 --- /dev/null +++ b/cypress/e2e/files/files-xml-regression.cy.ts @@ -0,0 +1,68 @@ +/** + * @copyright Copyright (c) 2024 Ferdinand Thiessen + * + * @author John Molakvoæ + * + * @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 . + * + */ + +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}&.txt{enter}') + + cy.wait('@renameFile') + getRowForFile('&.txt').should('be.visible') + }) + + it('After a reload the filename is preserved', () => { + cy.reload() + getRowForFile('&.txt').should('be.visible') + getRowForFile('&.txt').should('not.exist') + }) + + it('Can delete the file', () => { + cy.intercept('DELETE', /\/remote.php\/dav\/files\//).as('deleteFile') + triggerActionForFile('&.txt', 'delete') + cy.wait('@deleteFile') + + cy.contains('.toast-success', /Delete .* successfull/) + .should('be.visible') + getRowForFile('&.txt').should('not.exist') + + cy.reload() + getRowForFile('&.txt').should('not.exist') + getRowForFile('&.txt').should('not.exist') + }) +}) diff --git a/cypress/e2e/files/files_copy-move.cy.ts b/cypress/e2e/files/files_copy-move.cy.ts index 63e48e5f881..9fee5eb44d5 100644 --- a/cypress/e2e/files/files_copy-move.cy.ts +++ b/cypress/e2e/files/files_copy-move.cy.ts @@ -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 diff --git a/package-lock.json b/package-lock.json index eabc7d5fe0a..adaf761cea4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -88,7 +88,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": { @@ -26494,9 +26494,9 @@ } }, "node_modules/webdav": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.3.1.tgz", - "integrity": "sha512-wzZdTHtMuSIXqHGBznc8FM2L94Mc/17Tbn9ppoMybRO0bjWOSIeScdVXWX5qqHsg00EjfiOcwMqGFx6ghIhccQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.3.2.tgz", + "integrity": "sha512-wfUh68rccDcH1A9W5gdcAflBm0EOeXrX3LwKbdDLWR0SDFE5QTPfLXPkDit+zGC0tRihCD9qzPfIVEUFoc7MwA==", "dependencies": { "@buttercup/fetch": "^0.1.1", "base-64": "^1.0.0", diff --git a/package.json b/package.json index 7a56fa3d567..37268d7be90 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,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": {