diff options
Diffstat (limited to 'cypress/e2e/files_versions')
-rw-r--r-- | cypress/e2e/files_versions/filesVersionsUtils.ts | 3 | ||||
-rw-r--r-- | cypress/e2e/files_versions/version_creation.cy.ts | 14 | ||||
-rw-r--r-- | cypress/e2e/files_versions/version_deletion.cy.ts | 25 | ||||
-rw-r--r-- | cypress/e2e/files_versions/version_download.cy.ts | 32 | ||||
-rw-r--r-- | cypress/e2e/files_versions/version_expiration.cy.ts | 4 | ||||
-rw-r--r-- | cypress/e2e/files_versions/version_naming.cy.ts | 81 | ||||
-rw-r--r-- | cypress/e2e/files_versions/version_restoration.cy.ts | 29 | ||||
-rw-r--r-- | cypress/e2e/files_versions/version_sharing.cy.ts | 46 |
8 files changed, 160 insertions, 74 deletions
diff --git a/cypress/e2e/files_versions/filesVersionsUtils.ts b/cypress/e2e/files_versions/filesVersionsUtils.ts index 91c41dc19af..75c76b7e97c 100644 --- a/cypress/e2e/files_versions/filesVersionsUtils.ts +++ b/cypress/e2e/files_versions/filesVersionsUtils.ts @@ -4,8 +4,7 @@ */ /* eslint-disable jsdoc/require-jsdoc */ import type { User } from '@nextcloud/cypress' -import path from 'path' -import { createShare, type ShareSetting } from '../files_sharing/filesSharingUtils' +import { createShare, type ShareSetting } from '../files_sharing/FilesSharingUtils' export const uploadThreeVersions = (user: User, fileName: string) => { // A new version will not be created if the changes occur diff --git a/cypress/e2e/files_versions/version_creation.cy.ts b/cypress/e2e/files_versions/version_creation.cy.ts index 8fef4376db1..a0441e96b29 100644 --- a/cypress/e2e/files_versions/version_creation.cy.ts +++ b/cypress/e2e/files_versions/version_creation.cy.ts @@ -30,4 +30,18 @@ describe('Versions creation', () => { cy.get('[data-files-versions-version]').eq(2).contains('Initial version') }) }) + + it('See yourself as version author', () => { + cy.visit('/apps/files') + openVersionsPanel(randomFileName) + + cy.findByRole('tabpanel', { name: 'Versions' }) + .findByRole('list', { name: 'File versions' }) + .findAllByRole('listitem') + .should('have.length', 3) + .first() + .find('[data-cy-files-version-author-name]') + .should('exist') + .and('contain.text', 'You') + }) }) diff --git a/cypress/e2e/files_versions/version_deletion.cy.ts b/cypress/e2e/files_versions/version_deletion.cy.ts index 944cc7a9fa8..b49aa872639 100644 --- a/cypress/e2e/files_versions/version_deletion.cy.ts +++ b/cypress/e2e/files_versions/version_deletion.cy.ts @@ -59,7 +59,6 @@ describe('Versions restoration', () => { }) it('Does not work without delete permission through direct API access', () => { - let hostname: string let fileId: string|undefined let versionId: string|undefined @@ -68,24 +67,30 @@ describe('Versions restoration', () => { navigateToFolder(folderName) openVersionsPanel(randomFilePath) - cy.url().then(url => { hostname = new URL(url).hostname }) - getRowForFile(randomFileName).invoke('attr', 'data-cy-files-list-row-fileid').then(_fileId => { fileId = _fileId }) - cy.get('[data-files-versions-version]').eq(1).invoke('attr', 'data-files-versions-version').then(_versionId => { versionId = _versionId }) + getRowForFile(randomFileName) + .should('be.visible') + .invoke('attr', 'data-cy-files-list-row-fileid') + .then(($fileId) => { fileId = $fileId }) + cy.get('[data-files-versions-version]') + .eq(1) + .invoke('attr', 'data-files-versions-version') + .then(($versionId) => { versionId = $versionId }) + + cy.logout() cy.then(() => { - cy.logout() - cy.request({ + const base = Cypress.config('baseUrl')!.replace(/\/index\.php\/?$/, '') + return cy.request({ method: 'DELETE', + url: `${base}/remote.php/dav/versions/${recipient.userId}/versions/${fileId}/${versionId}`, auth: { user: recipient.userId, pass: recipient.password }, headers: { cookie: '', }, - url: `http://${hostname}/remote.php/dav/versions/${recipient.userId}/versions/${fileId}/${versionId}`, failOnStatusCode: false, }) - .then(({ status }) => { - expect(status).to.equal(403) - }) + }).then(({ status }) => { + expect(status).to.equal(403) }) }) }) diff --git a/cypress/e2e/files_versions/version_download.cy.ts b/cypress/e2e/files_versions/version_download.cy.ts index e444749d56b..548cb86a207 100644 --- a/cypress/e2e/files_versions/version_download.cy.ts +++ b/cypress/e2e/files_versions/version_download.cy.ts @@ -14,6 +14,7 @@ describe('Versions download', () => { before(() => { randomFileName = Math.random().toString(36).replace(/[^a-z]+/g, '').substring(0, 10) + '.txt' + cy.runOccCommand('config:app:set --value no core shareapi_allow_view_without_download') cy.createRandomUser() .then((_user) => { user = _user @@ -24,6 +25,10 @@ describe('Versions download', () => { }) }) + after(() => { + cy.runOccCommand('config:app:delete core shareapi_allow_view_without_download') + }) + it('Download versions and assert their content', () => { assertVersionContent(0, 'v3') assertVersionContent(1, 'v2') @@ -52,31 +57,36 @@ describe('Versions download', () => { }) it('Does not work without download permission through direct API access', () => { - let hostname: string let fileId: string|undefined let versionId: string|undefined setupTestSharedFileFromUser(user, randomFileName, { download: false }) - .then(recipient => { + .then((recipient) => { openVersionsPanel(randomFileName) - cy.url().then(url => { hostname = new URL(url).hostname }) - getRowForFile(randomFileName).invoke('attr', 'data-cy-files-list-row-fileid').then(_fileId => { fileId = _fileId }) - cy.get('[data-files-versions-version]').eq(1).invoke('attr', 'data-files-versions-version').then(_versionId => { versionId = _versionId }) + getRowForFile(randomFileName) + .should('be.visible') + .invoke('attr', 'data-cy-files-list-row-fileid') + .then(($fileId) => { fileId = $fileId }) + + cy.get('[data-files-versions-version]') + .eq(1) + .invoke('attr', 'data-files-versions-version') + .then(($versionId) => { versionId = $versionId }) + cy.logout() cy.then(() => { - cy.logout() - cy.request({ + const base = Cypress.config('baseUrl')!.replace(/\/index\.php\/?$/, '') + return cy.request({ + url: `${base}/remote.php/dav/versions/${recipient.userId}/versions/${fileId}/${versionId}`, auth: { user: recipient.userId, pass: recipient.password }, headers: { cookie: '', }, - url: `http://${hostname}/remote.php/dav/versions/${recipient.userId}/versions/${fileId}/${versionId}`, failOnStatusCode: false, }) - .then(({ status }) => { - expect(status).to.equal(403) - }) + }).then(({ status }) => { + expect(status).to.equal(403) }) }) }) diff --git a/cypress/e2e/files_versions/version_expiration.cy.ts b/cypress/e2e/files_versions/version_expiration.cy.ts index 6fa432e0499..118ac01532f 100644 --- a/cypress/e2e/files_versions/version_expiration.cy.ts +++ b/cypress/e2e/files_versions/version_expiration.cy.ts @@ -21,7 +21,7 @@ describe('Versions expiration', () => { }) it('Expire all versions', () => { - cy.runOccCommand('config:system:set versions_retention_obligation --value "0, 0"') + cy.runOccCommand('config:system:set versions_retention_obligation --value \'0, 0\'') cy.runOccCommand('versions:expire') cy.runOccCommand('config:system:set versions_retention_obligation --value auto') cy.visit('/apps/files') @@ -38,7 +38,7 @@ describe('Versions expiration', () => { it('Expire versions v2', () => { nameVersion(2, 'v1') - cy.runOccCommand('config:system:set versions_retention_obligation --value "0, 0"') + cy.runOccCommand('config:system:set versions_retention_obligation --value \'0, 0\'') cy.runOccCommand('versions:expire') cy.runOccCommand('config:system:set versions_retention_obligation --value auto') cy.visit('/apps/files') diff --git a/cypress/e2e/files_versions/version_naming.cy.ts b/cypress/e2e/files_versions/version_naming.cy.ts index 980ae338490..ff299c53227 100644 --- a/cypress/e2e/files_versions/version_naming.cy.ts +++ b/cypress/e2e/files_versions/version_naming.cy.ts @@ -69,10 +69,17 @@ describe('Versions naming', () => { }) context('without edit permission', () => { - it('Does not show action', () => { + let recipient: User + + beforeEach(() => { setupTestSharedFileFromUser(user, randomFileName, { update: false }) - openVersionsPanel(randomFileName) + .then(($recipient) => { + recipient = $recipient + openVersionsPanel(randomFileName) + }) + }) + it('Does not show action', () => { cy.get('[data-files-versions-version]').eq(0).find('.action-item__menutoggle').should('not.exist') cy.get('[data-files-versions-version]').eq(0).get('[data-cy-version-action="label"]').should('not.exist') @@ -81,45 +88,45 @@ describe('Versions naming', () => { }) it('Does not work without update permission through direct API access', () => { - let hostname: string let fileId: string|undefined let versionId: string|undefined - setupTestSharedFileFromUser(user, randomFileName, { update: false }) - .then(recipient => { - openVersionsPanel(randomFileName) - - cy.url().then(url => { hostname = new URL(url).hostname }) - getRowForFile(randomFileName).invoke('attr', 'data-cy-files-list-row-fileid').then(_fileId => { fileId = _fileId }) - cy.get('[data-files-versions-version]').eq(1).invoke('attr', 'data-files-versions-version').then(_versionId => { versionId = _versionId }) - - cy.then(() => { - cy.logout() - cy.request({ - method: 'PROPPATCH', - auth: { user: recipient.userId, pass: recipient.password }, - headers: { - cookie: '', - }, - body: `<?xml version="1.0"?> - <d:propertyupdate xmlns:d="DAV:" - xmlns:oc="http://owncloud.org/ns" - xmlns:nc="http://nextcloud.org/ns" - xmlns:ocs="http://open-collaboration-services.org/ns"> - <d:set> - <d:prop> - <nc:version-label>not authorized labeling</nc:version-label> - </d:prop> - </d:set> - </d:propertyupdate>`, - url: `http://${hostname}/remote.php/dav/versions/${recipient.userId}/versions/${fileId}/${versionId}`, - failOnStatusCode: false, - }) - .then(({ status }) => { - expect(status).to.equal(403) - }) - }) + getRowForFile(randomFileName) + .should('be.visible') + .invoke('attr', 'data-cy-files-list-row-fileid') + .then(($fileId) => { fileId = $fileId }) + + cy.get('[data-files-versions-version]') + .eq(1) + .invoke('attr', 'data-files-versions-version') + .then(($versionId) => { versionId = $versionId }) + + cy.logout() + cy.then(() => { + const base = Cypress.config('baseUrl')!.replace(/index\.php\/?/, '') + return cy.request({ + method: 'PROPPATCH', + url: `${base}/remote.php/dav/versions/${recipient.userId}/versions/${fileId}/${versionId}`, + auth: { user: recipient.userId, pass: recipient.password }, + headers: { + cookie: '', + }, + body: `<?xml version="1.0"?> + <d:propertyupdate xmlns:d="DAV:" + xmlns:oc="http://owncloud.org/ns" + xmlns:nc="http://nextcloud.org/ns" + xmlns:ocs="http://open-collaboration-services.org/ns"> + <d:set> + <d:prop> + <nc:version-label>not authorized labeling</nc:version-label> + </d:prop> + </d:set> + </d:propertyupdate>`, + failOnStatusCode: false, }) + }).then(({ status }) => { + expect(status).to.equal(403) + }) }) }) }) diff --git a/cypress/e2e/files_versions/version_restoration.cy.ts b/cypress/e2e/files_versions/version_restoration.cy.ts index 94c09bb9ffc..34360808f61 100644 --- a/cypress/e2e/files_versions/version_restoration.cy.ts +++ b/cypress/e2e/files_versions/version_restoration.cy.ts @@ -77,33 +77,38 @@ describe('Versions restoration', () => { }) it('Does not work without update permission through direct API access', () => { - let hostname: string let fileId: string|undefined let versionId: string|undefined setupTestSharedFileFromUser(user, randomFileName, { update: false }) - .then(recipient => { + .then((recipient) => { openVersionsPanel(randomFileName) - cy.url().then(url => { hostname = new URL(url).hostname }) - getRowForFile(randomFileName).invoke('attr', 'data-cy-files-list-row-fileid').then(_fileId => { fileId = _fileId }) - cy.get('[data-files-versions-version]').eq(1).invoke('attr', 'data-files-versions-version').then(_versionId => { versionId = _versionId }) + getRowForFile(randomFileName) + .should('be.visible') + .invoke('attr', 'data-cy-files-list-row-fileid') + .then(($fileId) => { fileId = $fileId }) + cy.get('[data-files-versions-version]') + .eq(1) + .invoke('attr', 'data-files-versions-version') + .then(($versionId) => { versionId = $versionId }) + + cy.logout() cy.then(() => { - cy.logout() - cy.request({ + const base = Cypress.config('baseUrl')!.replace(/\/index\.php\/?$/, '') + return cy.request({ method: 'MOVE', + url: `${base}/remote.php/dav/versions/${recipient.userId}/versions/${fileId}/${versionId}`, auth: { user: recipient.userId, pass: recipient.password }, headers: { cookie: '', - Destination: `http://${hostname}/remote.php/dav/versions/${recipient.userId}/restore/target`, + Destination: `${base}}/remote.php/dav/versions/${recipient.userId}/restore/target`, }, - url: `http://${hostname}/remote.php/dav/versions/${recipient.userId}/versions/${fileId}/${versionId}`, failOnStatusCode: false, }) - .then(({ status }) => { - expect(status).to.equal(403) - }) + }).then(({ status }) => { + expect(status).to.equal(403) }) }) }) diff --git a/cypress/e2e/files_versions/version_sharing.cy.ts b/cypress/e2e/files_versions/version_sharing.cy.ts new file mode 100644 index 00000000000..e978cb42fd9 --- /dev/null +++ b/cypress/e2e/files_versions/version_sharing.cy.ts @@ -0,0 +1,46 @@ +/** + * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +import type { User } from '@nextcloud/cypress' +import { openVersionsPanel, setupTestSharedFileFromUser, uploadThreeVersions } from './filesVersionsUtils.ts' +import { navigateToFolder, triggerActionForFile } from '../files/FilesUtils.ts' + +describe('Versions on shares', () => { + const randomSharedFolderName = Math.random().toString(36).replace(/[^a-z]+/g, '').substring(0, 10) + const randomFileName = Math.random().toString(36).replace(/[^a-z]+/g, '').substring(0, 10) + '.txt' + const randomFilePath = `${randomSharedFolderName}/${randomFileName}` + let alice: User + let bob: User + + before(() => { + cy.createRandomUser() + .then((user) => { + alice = user + }) + .then(() => { + cy.mkdir(alice, `/${randomSharedFolderName}`) + return setupTestSharedFileFromUser(alice, randomSharedFolderName, {}) + }) + .then((user) => { bob = user }) + .then(() => uploadThreeVersions(alice, randomFilePath)) + }) + + it('See sharees display name as author', () => { + cy.login(bob) + cy.visit('/apps/files') + + navigateToFolder(randomSharedFolderName) + + triggerActionForFile(randomFileName, 'details') + cy.findByRole('tab', { name: 'Versions' }).click() + + cy.findByRole('tabpanel', { name: 'Versions' }) + .findByRole('list', { name: 'File versions' }) + .findAllByRole('listitem') + .first() + .find('[data-cy-files-version-author-name]') + .should('be.visible') + .and('contain.text', alice.userId) + }) +}) |