From 71257ebb9205d7cc9abe68404f39efabbbb3a73d Mon Sep 17 00:00:00 2001 From: Prajwol Amatya <83579989+PrajwolAmatya@users.noreply.github.com> Date: Thu, 3 Aug 2023 13:51:22 +0545 Subject: [PATCH] refactored acceptance test code to store response data related to public shares on single store (#6930) --- .../apiAccountsHashDifficulty/addUser.feature | 2 +- .../assignRole.feature | 5 +- .../createShareToSharesFolder.feature | 2 +- .../uploadFile.feature | 2 +- .../webDavPUTAuthInvalid.feature | 2 +- .../features/apiAntivirus/antivirus.feature | 2 +- .../features/apiArchiver/downloadById.feature | 1 - .../apiArchiver/downloadByPath.feature | 3 +- .../delayPostprocessing.feature | 2 +- .../features/apiContract/copy.feature | 1 - .../features/apiContract/propfind.feature | 1 - .../features/apiContract/sharesReport.feature | 1 - .../features/apiContract/spacesReport.feature | 1 - .../apiContract/spacesSharesReport.feature | 1 - .../acceptance/features/apiCors/cors.feature | 2 +- .../features/apiDownloads/download.feature | 1 - .../apiDownloads/spaceDownload.feature | 1 - .../features/apiFullTextSearch/search.feature | 1 - .../features/apiGraph/addUserToGroup.feature | 1 - .../features/apiGraph/assignRole.feature | 2 +- .../apiGraph/changeOwnPassword.feature | 1 - .../features/apiGraph/changeRole.feature | 1 - .../features/apiGraph/createGroup.feature | 1 - .../apiGraph/createGroupCaseSensitive.feature | 1 - .../features/apiGraph/createUser.feature | 1 - .../features/apiGraph/deleteGroup.feature | 1 - .../features/apiGraph/deleteUser.feature | 1 - .../features/apiGraph/editGroup.feature | 1 - .../features/apiGraph/editUser.feature | 1 - .../enforcePasswordPublicLink.feature | 2 +- .../features/apiGraph/fullSearch.feature | 1 - .../features/apiGraph/getApplications.feature | 2 +- .../features/apiGraph/getGroup.feature | 1 - .../features/apiGraph/getUser.feature | 1 - .../apiGraph/getUserOwnInformation.feature | 1 - .../apiGraph/removeUserFromGroup.feature | 1 - .../features/apiGraph/unassignRole.feature | 1 - .../features/apiGraph/userGDPRExport.feature | 1 - .../deleteNotification.feature | 1 - .../apiNotification/emailNotification.feature | 2 +- .../apiNotification/notification.feature | 1 - .../apiNotification/spaceNotification.feature | 1 - .../apiReshare/disableReshare.feature | 2 +- .../features/apiReshare/resharing.feature | 1 - .../features/apiSpaces/changeSpaces.feature | 1 - .../features/apiSpaces/createSpace.feature | 1 - .../apiSpaces/disableAndDeleteSpaces.feature | 1 - .../apiSpaces/editPublicLinkOfSpace.feature | 1 - .../features/apiSpaces/filePreviews.feature | 1 - .../features/apiSpaces/listSpaces.feature | 1 - .../features/apiSpaces/publicLink.feature | 1 - .../features/apiSpaces/quota.feature | 1 - .../apiSpaces/removeSpaceObjects.feature | 1 - .../features/apiSpaces/restoreSpaces.feature | 1 - .../features/apiSpaces/search.feature | 1 - .../features/apiSpaces/setQuota.feature | 1 - .../apiSpaces/spaceManagement.feature | 1 - .../acceptance/features/apiSpaces/tag.feature | 2 +- .../features/apiSpaces/trashBin.feature | 1 - .../features/apiSpaces/tusUpload.feature | 1 - .../features/apiSpaces/uploadSpaces.feature | 1 - .../changingFilesShare.feature | 1 - .../features/apiSpacesShares/checksum.feature | 1 - .../apiSpacesShares/copySpaces.feature | 1 - ...eateFileFolderWhenSharesSpaceExist.feature | 1 - .../apiSpacesShares/etagPropagation.feature | 1 - .../features/apiSpacesShares/favorite.feature | 1 - .../apiSpacesShares/moveSpaces.feature | 1 - .../publicLinkDownload.feature | 1 - .../apiSpacesShares/shareOperations.feature | 1 - .../apiSpacesShares/shareSpaces.feature | 1 - .../shareSpacesViaLink.feature | 1 - .../shareSubItemOfSpace.feature | 1 - .../shareSubItemOfSpaceViaPublicLink.feature | 1 - .../apiSpacesShares/shareUploadTUS.feature | 1 - .../features/bootstrap/FeatureContext.php | 2 +- .../bootstrap/PublicWebDavContext.php | 26 +- .../acceptance/features/bootstrap/Sharing.php | 248 +++--------------- .../features/bootstrap/SpacesContext.php | 30 +-- .../acceptance/features/bootstrap/WebDav.php | 8 +- .../bootstrap/WebDavLockingContext.php | 16 +- .../bootstrap/WebDavPropertiesContext.php | 4 +- .../features/coreApiAuth/webDavAuth.feature | 1 - .../coreApiAuthOcs/ocsDELETEAuth.feature | 1 - .../coreApiAuthOcs/ocsGETAuth.feature | 1 - .../coreApiAuthOcs/ocsPOSTAuth.feature | 1 - .../coreApiAuthOcs/ocsPUTAuth.feature | 1 - .../coreApiAuthWebDav/webDavCOPYAuth.feature | 1 - .../webDavDELETEAuth.feature | 1 - .../coreApiAuthWebDav/webDavLOCKAuth.feature | 1 - .../coreApiAuthWebDav/webDavMKCOLAuth.feature | 1 - .../coreApiAuthWebDav/webDavMOVEAuth.feature | 1 - .../coreApiAuthWebDav/webDavPOSTAuth.feature | 1 - .../webDavPROPFINDAuth.feature | 1 - .../webDavPROPPATCHAuth.feature | 1 - .../coreApiAuthWebDav/webDavPUTAuth.feature | 1 - .../webDavSpecialURLs.feature | 1 - .../coreApiCapabilities/capabilities.feature | 1 - .../capabilitiesWithNormalUser.feature | 1 - .../coreApiFavorites/favorites.feature | 1 - .../favoritesSharingToShares.feature | 1 - .../features/coreApiMain/checksums.feature | 1 - .../features/coreApiMain/main.feature | 1 - .../features/coreApiMain/status.feature | 1 - ...eateShareResourceCaseSensitiveName.feature | 1 - .../createShareUniqueReceivedNames.feature | 1 - ...hareDefaultFolderForReceivedShares.feature | 2 +- ...reateShareGroupAndUserWithSameName.feature | 1 - .../createShareReceivedInMultipleWays.feature | 1 - .../createShareWithDisabledUser.feature | 2 +- .../createShareWithInvalidPermissions.feature | 1 - .../createShareToSharesFolder.feature | 1 - .../deleteShareFromShares.feature | 2 +- .../acceptShares.feature | 2 +- .../acceptSharesToSharesFolder.feature | 1 - .../mergeShare.feature | 2 +- .../moveReceivedShare.feature | 2 +- .../moveShareInsideAnotherShare.feature | 1 - .../accessToShare.feature | 1 - .../changingFilesShare.feature | 2 +- .../gettingShares.feature | 1 - .../gettingSharesPendingFiltered.feature | 1 - .../gettingSharesReceivedFiltered.feature | 1 - ...gettingSharesReceivedFilteredEmpty.feature | 1 - .../gettingSharesSharedFiltered.feature | 1 - .../gettingSharesSharedFilteredEmpty.feature | 1 - .../getWebDAVSharePermissions.feature | 1 - .../shareAccessByID.feature | 1 - .../uploadToShare.feature | 1 - .../accessToPublicLinkShare.feature | 1 - .../changingPublicLinkShare.feature | 2 +- .../createPublicLinkShare.feature | 2 +- .../createPublicLinkShareToShares.feature | 1 - .../deletePublicLinkShare.feature | 1 - .../copyFromPublicLink.feature | 1 - .../multilinkSharing.feature | 1 - .../reShareAsPublicLinkToSharesNewDav.feature | 1 - .../updatePublicLinkShare.feature | 1 - .../uploadToPublicLinkShare.feature | 2 +- .../reShare.feature | 2 +- .../reShareChain.feature | 2 +- .../reShareDisabled.feature | 2 +- .../reShareSubfolder.feature | 2 +- .../reShareUpdate.feature | 2 +- .../reShareWithExpiryDate.feature | 2 +- .../updateShare.feature | 1 - ...pdateShareGroupAndUserWithSameName.feature | 2 +- .../features/coreApiSharees/sharees.feature | 1 - .../coreApiTrashbin/trashbinDelete.feature | 2 +- .../trashbinFilesFolders.feature | 2 +- .../trashbinSharingToShares.feature | 1 - .../trashbinRestore.feature | 2 +- .../coreApiVersions/fileVersionAuthor.feature | 2 +- .../coreApiVersions/fileVersions.feature | 1 - .../coreApiWebdavDelete/deleteFile.feature | 1 - .../coreApiWebdavDelete/deleteFolder.feature | 1 - .../deleteFolderContents.feature | 1 - .../deleteFileFolder.feature | 1 - .../moveFileFolder.feature | 1 - .../copyFileFolder.feature | 1 - .../createFolder.feature | 1 - .../restoreFromTrash.feature | 1 - .../restoreVersion.feature | 2 +- .../upload.feature | 1 - .../coreApiWebdavLocks/exclusiveLocks.feature | 2 +- .../requestsWithToken.feature | 2 +- .../independentLocks.feature | 2 +- .../independentLocksShareToShares.feature | 2 +- .../coreApiWebdavLocksUnlock/unlock.feature | 2 +- .../unlockSharingToShares.feature | 2 +- .../coreApiWebdavMove1/moveFolder.feature | 1 - .../moveFolderToBlacklistedName.feature | 1 - .../coreApiWebdavMove2/moveFile.feature | 1 - .../moveFileToBlacklistedName.feature | 1 - .../moveShareOnOcis.feature | 1 - .../downloadFile.feature | 1 - .../coreApiWebdavOperations/listFiles.feature | 1 - .../coreApiWebdavOperations/propfind.feature | 1 - .../refuseAccess.feature | 1 - .../coreApiWebdavOperations/search.feature | 2 +- .../coreApiWebdavPreviews/previews.feature | 2 +- .../previewsAutoAdustedSizing.feature | 2 +- .../coreApiWebdavProperties1/copyFile.feature | 1 - .../createFileFolder.feature | 1 - .../createFileFolderWhenSharesExist.feature | 1 - .../coreApiWebdavProperties1/getQuota.feature | 2 +- .../setFileProperties.feature | 1 - .../getFileProperties.feature | 1 - .../coreApiWebdavUpload1/uploadFile.feature | 1 - .../uploadFileUsingOldChunking.feature | 2 +- .../coreApiWebdavUploadTUS/checksums.feature | 1 - .../creationWithUploadExtension.feature | 1 - .../lowLevelCreationExtension.feature | 1 - .../lowLevelUpload.feature | 1 - .../optionsRequest.feature | 1 - .../coreApiWebdavUploadTUS/uploadFile.feature | 1 - .../uploadFileMtime.feature | 1 - .../uploadFileMtimeShares.feature | 1 - .../uploadToMoveFolder.feature | 1 - .../uploadToNonExistingFolder.feature | 1 - .../uploadToShare.feature | 1 - tests/acceptance/run.sh | 23 +- .../apiShareManagement/acceptShares.feature | 1 - .../apiWebdavOperations/downloadFile.feature | 1 - 204 files changed, 130 insertions(+), 475 deletions(-) diff --git a/tests/acceptance/features/apiAccountsHashDifficulty/addUser.feature b/tests/acceptance/features/apiAccountsHashDifficulty/addUser.feature index d009b9b36af..4d7b03b80bf 100644 --- a/tests/acceptance/features/apiAccountsHashDifficulty/addUser.feature +++ b/tests/acceptance/features/apiAccountsHashDifficulty/addUser.feature @@ -1,4 +1,4 @@ -@api @provisioning_api-app-required @skipOnGraph @skipOnReva +@provisioning_api-app-required @skipOnGraph @skipOnReva Feature: add user As an admin I want to be able to add users and store their password with the full hash difficulty diff --git a/tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature b/tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature index 26bb74d92c8..cdcd2710663 100644 --- a/tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature +++ b/tests/acceptance/features/apiAccountsHashDifficulty/assignRole.feature @@ -1,10 +1,9 @@ -@api Feature: assign role As an admin, I want to assign roles to users - So that I can provide them different authority + So that I can provide them different authority + - Scenario Outline: only admin user can see all existing roles Given user "Alice" has been created with default attributes and without skeleton files And the administrator has given "Alice" the role "" using the settings api diff --git a/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature b/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature index eb26c6e9b10..62712bd1ce0 100644 --- a/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature +++ b/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature @@ -1,4 +1,4 @@ -@api @skipOnReva +@skipOnReva Feature: sharing As a user I want to be able to share files when passwords are stored with the full hash difficulty diff --git a/tests/acceptance/features/apiAccountsHashDifficulty/uploadFile.feature b/tests/acceptance/features/apiAccountsHashDifficulty/uploadFile.feature index e41e714b3a0..df9a0aa3f88 100644 --- a/tests/acceptance/features/apiAccountsHashDifficulty/uploadFile.feature +++ b/tests/acceptance/features/apiAccountsHashDifficulty/uploadFile.feature @@ -1,4 +1,4 @@ -@api @skipOnReva +@skipOnReva Feature: upload file As a user I want to be able to upload files when passwords are stored with the full hash difficulty diff --git a/tests/acceptance/features/apiAccountsHashDifficulty/webDavPUTAuthInvalid.feature b/tests/acceptance/features/apiAccountsHashDifficulty/webDavPUTAuthInvalid.feature index 8825f948af2..65a7c2a993a 100644 --- a/tests/acceptance/features/apiAccountsHashDifficulty/webDavPUTAuthInvalid.feature +++ b/tests/acceptance/features/apiAccountsHashDifficulty/webDavPUTAuthInvalid.feature @@ -1,4 +1,4 @@ -@api @skipOnReva +@skipOnReva Feature: attempt to PUT files with invalid password As an admin I want the system to be secure when passwords are stored with the full hash difficulty diff --git a/tests/acceptance/features/apiAntivirus/antivirus.feature b/tests/acceptance/features/apiAntivirus/antivirus.feature index f906d1c06e8..667c8fbedc7 100644 --- a/tests/acceptance/features/apiAntivirus/antivirus.feature +++ b/tests/acceptance/features/apiAntivirus/antivirus.feature @@ -1,4 +1,4 @@ -@api @antivirus @skipOnReva +@skip @antivirus @skipOnReva Feature: antivirus As a system administrator and user I want to protect myself and others from known viruses diff --git a/tests/acceptance/features/apiArchiver/downloadById.feature b/tests/acceptance/features/apiArchiver/downloadById.feature index 46f4187c8ee..5fe8519550f 100644 --- a/tests/acceptance/features/apiArchiver/downloadById.feature +++ b/tests/acceptance/features/apiArchiver/downloadById.feature @@ -1,4 +1,3 @@ -@api Feature: download multiple resources bundled into an archive As a user I want to be able to download multiple items at once diff --git a/tests/acceptance/features/apiArchiver/downloadByPath.feature b/tests/acceptance/features/apiArchiver/downloadByPath.feature index b33d802858b..0c812e7fcfe 100644 --- a/tests/acceptance/features/apiArchiver/downloadByPath.feature +++ b/tests/acceptance/features/apiArchiver/downloadByPath.feature @@ -1,4 +1,3 @@ -@api Feature: download multiple resources bundled into an archive As a user I want to be able to download multiple items at once @@ -65,7 +64,7 @@ Feature: download multiple resources bundled into an archive | my_data/textfile2.txt | some data | | more_data/an_other_file.txt | more data | - + Scenario: download a not existing single file When user "Alice" downloads the archive of "/doesnotexist.txt" of user "Alice" using the resource path Then the HTTP status code should be "404" diff --git a/tests/acceptance/features/apiAsyncUpload/delayPostprocessing.feature b/tests/acceptance/features/apiAsyncUpload/delayPostprocessing.feature index fb494233627..1a40a8990fe 100644 --- a/tests/acceptance/features/apiAsyncUpload/delayPostprocessing.feature +++ b/tests/acceptance/features/apiAsyncUpload/delayPostprocessing.feature @@ -1,4 +1,4 @@ -@api @env-config +@env-config Feature: delay post-processing of uploaded files As a user I want to delay the post-processing of uploaded files diff --git a/tests/acceptance/features/apiContract/copy.feature b/tests/acceptance/features/apiContract/copy.feature index 665597b0a23..f51180240ad 100644 --- a/tests/acceptance/features/apiContract/copy.feature +++ b/tests/acceptance/features/apiContract/copy.feature @@ -1,4 +1,3 @@ -@api Feature: Copy test As a user I want to check the PROPFIND response diff --git a/tests/acceptance/features/apiContract/propfind.feature b/tests/acceptance/features/apiContract/propfind.feature index acc5115e033..ebd028d1770 100644 --- a/tests/acceptance/features/apiContract/propfind.feature +++ b/tests/acceptance/features/apiContract/propfind.feature @@ -1,4 +1,3 @@ -@api Feature: Propfind test As a user I want to check the PROPFIND response diff --git a/tests/acceptance/features/apiContract/sharesReport.feature b/tests/acceptance/features/apiContract/sharesReport.feature index 7e1c22d5221..8a8a675b2a1 100644 --- a/tests/acceptance/features/apiContract/sharesReport.feature +++ b/tests/acceptance/features/apiContract/sharesReport.feature @@ -1,4 +1,3 @@ -@api Feature: REPORT request to Shares space As a user I want to check the share REPORT response diff --git a/tests/acceptance/features/apiContract/spacesReport.feature b/tests/acceptance/features/apiContract/spacesReport.feature index 2f0aa78549c..00a58fae250 100644 --- a/tests/acceptance/features/apiContract/spacesReport.feature +++ b/tests/acceptance/features/apiContract/spacesReport.feature @@ -1,4 +1,3 @@ -@api Feature: REPORT request to project space As a user I want to check the REPORT response of project spaces diff --git a/tests/acceptance/features/apiContract/spacesSharesReport.feature b/tests/acceptance/features/apiContract/spacesSharesReport.feature index feb12bd6194..48216a3d963 100644 --- a/tests/acceptance/features/apiContract/spacesSharesReport.feature +++ b/tests/acceptance/features/apiContract/spacesSharesReport.feature @@ -1,4 +1,3 @@ -@api Feature: Report test As a user I want to check the share REPORT response diff --git a/tests/acceptance/features/apiCors/cors.feature b/tests/acceptance/features/apiCors/cors.feature index 1c74fd10b12..a0a8da4cde8 100644 --- a/tests/acceptance/features/apiCors/cors.feature +++ b/tests/acceptance/features/apiCors/cors.feature @@ -1,5 +1,5 @@ # NOTE: set env OCIS_CORS_ALLOW_ORIGINS=https://aphno.badal while running ocis server -@api @env-config +@env-config Feature: CORS headers As a user I want to send a cross-origin request diff --git a/tests/acceptance/features/apiDownloads/download.feature b/tests/acceptance/features/apiDownloads/download.feature index 40dd9dfd5ca..c0d09748d78 100644 --- a/tests/acceptance/features/apiDownloads/download.feature +++ b/tests/acceptance/features/apiDownloads/download.feature @@ -1,4 +1,3 @@ -@api Feature: Download file in project space As a user with different role I want to be able to download files diff --git a/tests/acceptance/features/apiDownloads/spaceDownload.feature b/tests/acceptance/features/apiDownloads/spaceDownload.feature index dee327260fc..04fd930dc7a 100644 --- a/tests/acceptance/features/apiDownloads/spaceDownload.feature +++ b/tests/acceptance/features/apiDownloads/spaceDownload.feature @@ -1,4 +1,3 @@ -@api Feature: Download space As a user I want to download space diff --git a/tests/acceptance/features/apiFullTextSearch/search.feature b/tests/acceptance/features/apiFullTextSearch/search.feature index edba6eead60..bf061c08239 100644 --- a/tests/acceptance/features/apiFullTextSearch/search.feature +++ b/tests/acceptance/features/apiFullTextSearch/search.feature @@ -1,4 +1,3 @@ -@api Feature: full text search As a user I want to do full text search diff --git a/tests/acceptance/features/apiGraph/addUserToGroup.feature b/tests/acceptance/features/apiGraph/addUserToGroup.feature index bcb57ef0e12..ec69869ce77 100644 --- a/tests/acceptance/features/apiGraph/addUserToGroup.feature +++ b/tests/acceptance/features/apiGraph/addUserToGroup.feature @@ -1,4 +1,3 @@ -@api Feature: add users to group As a admin I want to be able to add users to a group diff --git a/tests/acceptance/features/apiGraph/assignRole.feature b/tests/acceptance/features/apiGraph/assignRole.feature index b14533c93f2..9cb68ce3c0e 100644 --- a/tests/acceptance/features/apiGraph/assignRole.feature +++ b/tests/acceptance/features/apiGraph/assignRole.feature @@ -1,4 +1,4 @@ -@api @skipOnStable2.0 +@skipOnStable2.0 Feature: assign role As an admin, I want to assign roles to users. diff --git a/tests/acceptance/features/apiGraph/changeOwnPassword.feature b/tests/acceptance/features/apiGraph/changeOwnPassword.feature index 5266c63e57e..325d40debbc 100644 --- a/tests/acceptance/features/apiGraph/changeOwnPassword.feature +++ b/tests/acceptance/features/apiGraph/changeOwnPassword.feature @@ -1,4 +1,3 @@ -@api Feature: an user changes its own password As a user I want to change my password diff --git a/tests/acceptance/features/apiGraph/changeRole.feature b/tests/acceptance/features/apiGraph/changeRole.feature index ce1d5f0915a..c9b65c3b378 100644 --- a/tests/acceptance/features/apiGraph/changeRole.feature +++ b/tests/acceptance/features/apiGraph/changeRole.feature @@ -1,4 +1,3 @@ -@api Feature: change role As an admin I want to change the role of user diff --git a/tests/acceptance/features/apiGraph/createGroup.feature b/tests/acceptance/features/apiGraph/createGroup.feature index 57a0687c475..40195f037fa 100644 --- a/tests/acceptance/features/apiGraph/createGroup.feature +++ b/tests/acceptance/features/apiGraph/createGroup.feature @@ -1,4 +1,3 @@ -@api Feature: create group As an admin I want to create a group diff --git a/tests/acceptance/features/apiGraph/createGroupCaseSensitive.feature b/tests/acceptance/features/apiGraph/createGroupCaseSensitive.feature index 263baf5b257..13101811a7d 100644 --- a/tests/acceptance/features/apiGraph/createGroupCaseSensitive.feature +++ b/tests/acceptance/features/apiGraph/createGroupCaseSensitive.feature @@ -1,4 +1,3 @@ -@api Feature: create groups, group names are case insensitive As an admin I want to create groups with similar cases diff --git a/tests/acceptance/features/apiGraph/createUser.feature b/tests/acceptance/features/apiGraph/createUser.feature index 9d9b5b555e0..6b11b3fc831 100644 --- a/tests/acceptance/features/apiGraph/createUser.feature +++ b/tests/acceptance/features/apiGraph/createUser.feature @@ -1,4 +1,3 @@ -@api Feature: create user As a admin I want to create a user diff --git a/tests/acceptance/features/apiGraph/deleteGroup.feature b/tests/acceptance/features/apiGraph/deleteGroup.feature index c6c70789aa1..0e77dd97790 100644 --- a/tests/acceptance/features/apiGraph/deleteGroup.feature +++ b/tests/acceptance/features/apiGraph/deleteGroup.feature @@ -1,4 +1,3 @@ -@api Feature: delete groups As an admin I want to be able to delete groups diff --git a/tests/acceptance/features/apiGraph/deleteUser.feature b/tests/acceptance/features/apiGraph/deleteUser.feature index 2920ed3fb24..3579c887b18 100644 --- a/tests/acceptance/features/apiGraph/deleteUser.feature +++ b/tests/acceptance/features/apiGraph/deleteUser.feature @@ -1,4 +1,3 @@ -@api Feature: delete user As an admin I want to be able to delete users diff --git a/tests/acceptance/features/apiGraph/editGroup.feature b/tests/acceptance/features/apiGraph/editGroup.feature index ff7c831ccb5..40a83e01d31 100644 --- a/tests/acceptance/features/apiGraph/editGroup.feature +++ b/tests/acceptance/features/apiGraph/editGroup.feature @@ -1,4 +1,3 @@ -@api Feature: edit group name As an admin I want to be able to edit group name diff --git a/tests/acceptance/features/apiGraph/editUser.feature b/tests/acceptance/features/apiGraph/editUser.feature index 85f3b84e576..c21933cbea8 100644 --- a/tests/acceptance/features/apiGraph/editUser.feature +++ b/tests/acceptance/features/apiGraph/editUser.feature @@ -1,4 +1,3 @@ -@api Feature: edit user As an admin I want to be able to edit user information diff --git a/tests/acceptance/features/apiGraph/enforcePasswordPublicLink.feature b/tests/acceptance/features/apiGraph/enforcePasswordPublicLink.feature index c0feb39e650..666dfdd0e0f 100644 --- a/tests/acceptance/features/apiGraph/enforcePasswordPublicLink.feature +++ b/tests/acceptance/features/apiGraph/enforcePasswordPublicLink.feature @@ -1,4 +1,4 @@ -@api @env-config +@env-config Feature: enforce password on public link As a user I want to enforce passwords on public links shared with upload, edit, or contribute permission diff --git a/tests/acceptance/features/apiGraph/fullSearch.feature b/tests/acceptance/features/apiGraph/fullSearch.feature index 28a991d76f2..abb3e8a6f56 100644 --- a/tests/acceptance/features/apiGraph/fullSearch.feature +++ b/tests/acceptance/features/apiGraph/fullSearch.feature @@ -1,4 +1,3 @@ -@api Feature: full text search As a user I want to do full text search diff --git a/tests/acceptance/features/apiGraph/getApplications.feature b/tests/acceptance/features/apiGraph/getApplications.feature index 8ab7fa13845..8287e5822b2 100644 --- a/tests/acceptance/features/apiGraph/getApplications.feature +++ b/tests/acceptance/features/apiGraph/getApplications.feature @@ -1,4 +1,4 @@ -@api @skipOnStable2.0 +@skipOnStable2.0 Feature: get applications As a user I want to be able to get application information with existing roles diff --git a/tests/acceptance/features/apiGraph/getGroup.feature b/tests/acceptance/features/apiGraph/getGroup.feature index 50548f72e2d..d46d2078cff 100644 --- a/tests/acceptance/features/apiGraph/getGroup.feature +++ b/tests/acceptance/features/apiGraph/getGroup.feature @@ -1,4 +1,3 @@ -@api Feature: get groups and their members As an admin I want to be able to get groups diff --git a/tests/acceptance/features/apiGraph/getUser.feature b/tests/acceptance/features/apiGraph/getUser.feature index fee9d72cd62..89b26bfd120 100644 --- a/tests/acceptance/features/apiGraph/getUser.feature +++ b/tests/acceptance/features/apiGraph/getUser.feature @@ -1,4 +1,3 @@ -@api Feature: get users As an admin I want to be able to retrieve user information diff --git a/tests/acceptance/features/apiGraph/getUserOwnInformation.feature b/tests/acceptance/features/apiGraph/getUserOwnInformation.feature index ca872e11965..373eb7a9c7e 100644 --- a/tests/acceptance/features/apiGraph/getUserOwnInformation.feature +++ b/tests/acceptance/features/apiGraph/getUserOwnInformation.feature @@ -1,4 +1,3 @@ -@api Feature: get user's own information As user I want to be able to retrieve my own information diff --git a/tests/acceptance/features/apiGraph/removeUserFromGroup.feature b/tests/acceptance/features/apiGraph/removeUserFromGroup.feature index 111c588ee30..4ed276104d2 100644 --- a/tests/acceptance/features/apiGraph/removeUserFromGroup.feature +++ b/tests/acceptance/features/apiGraph/removeUserFromGroup.feature @@ -1,4 +1,3 @@ -@api Feature: remove a user from a group As an admin I want to be able to remove a user from a group diff --git a/tests/acceptance/features/apiGraph/unassignRole.feature b/tests/acceptance/features/apiGraph/unassignRole.feature index 43088e793c5..f9848353864 100644 --- a/tests/acceptance/features/apiGraph/unassignRole.feature +++ b/tests/acceptance/features/apiGraph/unassignRole.feature @@ -1,4 +1,3 @@ -@api Feature: unassign user role As an admin I want to unassign the role of user diff --git a/tests/acceptance/features/apiGraph/userGDPRExport.feature b/tests/acceptance/features/apiGraph/userGDPRExport.feature index 6afe2a20dde..767807822cb 100644 --- a/tests/acceptance/features/apiGraph/userGDPRExport.feature +++ b/tests/acceptance/features/apiGraph/userGDPRExport.feature @@ -1,4 +1,3 @@ -@api Feature: user GDPR (General Data Protection Regulation) report As a user I want to generate my GDPR report diff --git a/tests/acceptance/features/apiNotification/deleteNotification.feature b/tests/acceptance/features/apiNotification/deleteNotification.feature index bb32c544ea0..de7268e612d 100644 --- a/tests/acceptance/features/apiNotification/deleteNotification.feature +++ b/tests/acceptance/features/apiNotification/deleteNotification.feature @@ -1,4 +1,3 @@ -@api Feature: Delete notification As a user I want to delete notifications diff --git a/tests/acceptance/features/apiNotification/emailNotification.feature b/tests/acceptance/features/apiNotification/emailNotification.feature index ba6d752a602..69a83d2f196 100644 --- a/tests/acceptance/features/apiNotification/emailNotification.feature +++ b/tests/acceptance/features/apiNotification/emailNotification.feature @@ -1,4 +1,4 @@ -@api @email +@email Feature: Email notification As a user I want to get email notification of events related to me diff --git a/tests/acceptance/features/apiNotification/notification.feature b/tests/acceptance/features/apiNotification/notification.feature index 4d522b33f8c..606d74b1d3f 100644 --- a/tests/acceptance/features/apiNotification/notification.feature +++ b/tests/acceptance/features/apiNotification/notification.feature @@ -1,4 +1,3 @@ -@api Feature: Notification As a user I want to be notified of various events diff --git a/tests/acceptance/features/apiNotification/spaceNotification.feature b/tests/acceptance/features/apiNotification/spaceNotification.feature index 41b967d5da3..889f536ffcd 100644 --- a/tests/acceptance/features/apiNotification/spaceNotification.feature +++ b/tests/acceptance/features/apiNotification/spaceNotification.feature @@ -1,4 +1,3 @@ -@api Feature: Notification As a user I want to be notified of actions related to space diff --git a/tests/acceptance/features/apiReshare/disableReshare.feature b/tests/acceptance/features/apiReshare/disableReshare.feature index c0e35e86f28..132aef132fb 100644 --- a/tests/acceptance/features/apiReshare/disableReshare.feature +++ b/tests/acceptance/features/apiReshare/disableReshare.feature @@ -1,4 +1,4 @@ -@api @env-config +@env-config Feature: share by disabling re-share As a user I want to share resources diff --git a/tests/acceptance/features/apiReshare/resharing.feature b/tests/acceptance/features/apiReshare/resharing.feature index 879960b993f..b0d9a07cec2 100644 --- a/tests/acceptance/features/apiReshare/resharing.feature +++ b/tests/acceptance/features/apiReshare/resharing.feature @@ -1,4 +1,3 @@ -@api Feature: Resharing As a user I want to reshare resources diff --git a/tests/acceptance/features/apiSpaces/changeSpaces.feature b/tests/acceptance/features/apiSpaces/changeSpaces.feature index 7eb82e8b485..95355e47340 100644 --- a/tests/acceptance/features/apiSpaces/changeSpaces.feature +++ b/tests/acceptance/features/apiSpaces/changeSpaces.feature @@ -1,4 +1,3 @@ -@api Feature: Change data of space As a user with space admin rights I want to be able to change the meta-data of a created space (increase the quota, change name, etc.) diff --git a/tests/acceptance/features/apiSpaces/createSpace.feature b/tests/acceptance/features/apiSpaces/createSpace.feature index 26658473001..f3f2b6b3b42 100644 --- a/tests/acceptance/features/apiSpaces/createSpace.feature +++ b/tests/acceptance/features/apiSpaces/createSpace.feature @@ -1,4 +1,3 @@ -@api Feature: create space As an admin and space admin I want to create new spaces diff --git a/tests/acceptance/features/apiSpaces/disableAndDeleteSpaces.feature b/tests/acceptance/features/apiSpaces/disableAndDeleteSpaces.feature index 7056cad2486..5ebb233873b 100644 --- a/tests/acceptance/features/apiSpaces/disableAndDeleteSpaces.feature +++ b/tests/acceptance/features/apiSpaces/disableAndDeleteSpaces.feature @@ -1,4 +1,3 @@ -@api Feature: Disabling and deleting space As a manager of space I want to be able to disable the space first, then delete it. diff --git a/tests/acceptance/features/apiSpaces/editPublicLinkOfSpace.feature b/tests/acceptance/features/apiSpaces/editPublicLinkOfSpace.feature index fb7be66a2e5..8eb99ccf0aa 100644 --- a/tests/acceptance/features/apiSpaces/editPublicLinkOfSpace.feature +++ b/tests/acceptance/features/apiSpaces/editPublicLinkOfSpace.feature @@ -1,4 +1,3 @@ -@api Feature: A manager of the space can edit public link As an user with manager space role I want to be able to edit a public link. diff --git a/tests/acceptance/features/apiSpaces/filePreviews.feature b/tests/acceptance/features/apiSpaces/filePreviews.feature index b0f7a2f561a..bf79be4bc67 100644 --- a/tests/acceptance/features/apiSpaces/filePreviews.feature +++ b/tests/acceptance/features/apiSpaces/filePreviews.feature @@ -1,4 +1,3 @@ -@api Feature: Preview file in project space As a user I want to be able to download different files for the preview diff --git a/tests/acceptance/features/apiSpaces/listSpaces.feature b/tests/acceptance/features/apiSpaces/listSpaces.feature index 606e76d3a0c..87d0d459587 100644 --- a/tests/acceptance/features/apiSpaces/listSpaces.feature +++ b/tests/acceptance/features/apiSpaces/listSpaces.feature @@ -1,4 +1,3 @@ -@api Feature: List and create spaces As a user I want to be able to list project spaces diff --git a/tests/acceptance/features/apiSpaces/publicLink.feature b/tests/acceptance/features/apiSpaces/publicLink.feature index 13486f35dab..8fe2bc8202b 100644 --- a/tests/acceptance/features/apiSpaces/publicLink.feature +++ b/tests/acceptance/features/apiSpaces/publicLink.feature @@ -1,4 +1,3 @@ -@api Feature: public link for a space Background: diff --git a/tests/acceptance/features/apiSpaces/quota.feature b/tests/acceptance/features/apiSpaces/quota.feature index e784ba48de3..a7743fe30db 100644 --- a/tests/acceptance/features/apiSpaces/quota.feature +++ b/tests/acceptance/features/apiSpaces/quota.feature @@ -1,4 +1,3 @@ -@api Feature: State of the quota As a user I want to be able to see the state of the quota diff --git a/tests/acceptance/features/apiSpaces/removeSpaceObjects.feature b/tests/acceptance/features/apiSpaces/removeSpaceObjects.feature index 0ac78bbe2a1..2edb31e927e 100644 --- a/tests/acceptance/features/apiSpaces/removeSpaceObjects.feature +++ b/tests/acceptance/features/apiSpaces/removeSpaceObjects.feature @@ -1,4 +1,3 @@ -@api Feature: Remove files, folder As a user I want to be able to remove files, folders diff --git a/tests/acceptance/features/apiSpaces/restoreSpaces.feature b/tests/acceptance/features/apiSpaces/restoreSpaces.feature index 82afcc7417d..4ffd3aa322f 100644 --- a/tests/acceptance/features/apiSpaces/restoreSpaces.feature +++ b/tests/acceptance/features/apiSpaces/restoreSpaces.feature @@ -1,4 +1,3 @@ -@api Feature: Restoring space As a manager of space I want to be able to restore a disabled space diff --git a/tests/acceptance/features/apiSpaces/search.feature b/tests/acceptance/features/apiSpaces/search.feature index 47cbe77ffd4..d156824e698 100644 --- a/tests/acceptance/features/apiSpaces/search.feature +++ b/tests/acceptance/features/apiSpaces/search.feature @@ -1,4 +1,3 @@ -@api Feature: Search As a user I want to search for resources in the space diff --git a/tests/acceptance/features/apiSpaces/setQuota.feature b/tests/acceptance/features/apiSpaces/setQuota.feature index 3f977cdf4d6..61582413c20 100644 --- a/tests/acceptance/features/apiSpaces/setQuota.feature +++ b/tests/acceptance/features/apiSpaces/setQuota.feature @@ -1,4 +1,3 @@ -@api Feature: Set quota As a user I want to set quota to different users diff --git a/tests/acceptance/features/apiSpaces/spaceManagement.feature b/tests/acceptance/features/apiSpaces/spaceManagement.feature index 975c0414b32..3bddc5073b1 100644 --- a/tests/acceptance/features/apiSpaces/spaceManagement.feature +++ b/tests/acceptance/features/apiSpaces/spaceManagement.feature @@ -1,4 +1,3 @@ -@api Feature: Space management As a user with space admin permission I want to be able to manage all existing project spaces diff --git a/tests/acceptance/features/apiSpaces/tag.feature b/tests/acceptance/features/apiSpaces/tag.feature index e14cfb5bcde..8fde56e1d25 100644 --- a/tests/acceptance/features/apiSpaces/tag.feature +++ b/tests/acceptance/features/apiSpaces/tag.feature @@ -1,4 +1,4 @@ -@api @skipOnStable2.0 +@skipOnStable2.0 Feature: Tag As a user I want to tag resources diff --git a/tests/acceptance/features/apiSpaces/trashBin.feature b/tests/acceptance/features/apiSpaces/trashBin.feature index 701a383b97c..e4a15bb6d23 100644 --- a/tests/acceptance/features/apiSpaces/trashBin.feature +++ b/tests/acceptance/features/apiSpaces/trashBin.feature @@ -1,4 +1,3 @@ -@api Feature: Restore files, folder As a user with manager and editor role I want to be able to restore files, folders diff --git a/tests/acceptance/features/apiSpaces/tusUpload.feature b/tests/acceptance/features/apiSpaces/tusUpload.feature index da0ebbfb4d9..4a1cbccd07b 100644 --- a/tests/acceptance/features/apiSpaces/tusUpload.feature +++ b/tests/acceptance/features/apiSpaces/tusUpload.feature @@ -1,4 +1,3 @@ -@api Feature: upload resources using TUS protocol As a user I want to be able to upload files diff --git a/tests/acceptance/features/apiSpaces/uploadSpaces.feature b/tests/acceptance/features/apiSpaces/uploadSpaces.feature index 3c3a324587f..1bbe1a38de9 100644 --- a/tests/acceptance/features/apiSpaces/uploadSpaces.feature +++ b/tests/acceptance/features/apiSpaces/uploadSpaces.feature @@ -1,4 +1,3 @@ -@api Feature: Upload files into a space As a user I want to be able to create folders and files in the space diff --git a/tests/acceptance/features/apiSpacesShares/changingFilesShare.feature b/tests/acceptance/features/apiSpacesShares/changingFilesShare.feature index 21eb1cb837d..8ee4796fb26 100644 --- a/tests/acceptance/features/apiSpacesShares/changingFilesShare.feature +++ b/tests/acceptance/features/apiSpacesShares/changingFilesShare.feature @@ -1,4 +1,3 @@ -@api Feature: change shared resource As a user I want to change the shared resource diff --git a/tests/acceptance/features/apiSpacesShares/checksum.feature b/tests/acceptance/features/apiSpacesShares/checksum.feature index a38b49208e0..3114f142980 100644 --- a/tests/acceptance/features/apiSpacesShares/checksum.feature +++ b/tests/acceptance/features/apiSpacesShares/checksum.feature @@ -1,4 +1,3 @@ -@api Feature: checksums As a user I want to upload files with checksum diff --git a/tests/acceptance/features/apiSpacesShares/copySpaces.feature b/tests/acceptance/features/apiSpacesShares/copySpaces.feature index aaa0d89250b..208f4a02fb1 100644 --- a/tests/acceptance/features/apiSpacesShares/copySpaces.feature +++ b/tests/acceptance/features/apiSpacesShares/copySpaces.feature @@ -1,4 +1,3 @@ -@api Feature: copy file As a user I want to be able to copy files diff --git a/tests/acceptance/features/apiSpacesShares/createFileFolderWhenSharesSpaceExist.feature b/tests/acceptance/features/apiSpacesShares/createFileFolderWhenSharesSpaceExist.feature index 91e86f35244..9e37b3c5be6 100644 --- a/tests/acceptance/features/apiSpacesShares/createFileFolderWhenSharesSpaceExist.feature +++ b/tests/acceptance/features/apiSpacesShares/createFileFolderWhenSharesSpaceExist.feature @@ -1,4 +1,3 @@ -@api Feature: create file or folder named similar to Shares folder As a user I want to be able to create files and folders when the Shares folder exists diff --git a/tests/acceptance/features/apiSpacesShares/etagPropagation.feature b/tests/acceptance/features/apiSpacesShares/etagPropagation.feature index cbf6e5d4277..a4600268f54 100644 --- a/tests/acceptance/features/apiSpacesShares/etagPropagation.feature +++ b/tests/acceptance/features/apiSpacesShares/etagPropagation.feature @@ -1,4 +1,3 @@ -@api Feature: check etag propagation after different file alterations As a user I want to check the etag diff --git a/tests/acceptance/features/apiSpacesShares/favorite.feature b/tests/acceptance/features/apiSpacesShares/favorite.feature index 7dbde9b9560..f59b11fa3d5 100644 --- a/tests/acceptance/features/apiSpacesShares/favorite.feature +++ b/tests/acceptance/features/apiSpacesShares/favorite.feature @@ -1,4 +1,3 @@ -@api Feature: favorite As a user I want to favorite resources diff --git a/tests/acceptance/features/apiSpacesShares/moveSpaces.feature b/tests/acceptance/features/apiSpacesShares/moveSpaces.feature index 3dfaf0d6719..4ecc0c2f109 100644 --- a/tests/acceptance/features/apiSpacesShares/moveSpaces.feature +++ b/tests/acceptance/features/apiSpacesShares/moveSpaces.feature @@ -1,4 +1,3 @@ -@api Feature: move (rename) file As a user I want to be able to move and rename files diff --git a/tests/acceptance/features/apiSpacesShares/publicLinkDownload.feature b/tests/acceptance/features/apiSpacesShares/publicLinkDownload.feature index c2744d5f3c0..ccf40d75e94 100644 --- a/tests/acceptance/features/apiSpacesShares/publicLinkDownload.feature +++ b/tests/acceptance/features/apiSpacesShares/publicLinkDownload.feature @@ -1,4 +1,3 @@ -@api Feature: Public can download folders from project space public link As a public I want to be able to download folder from public link diff --git a/tests/acceptance/features/apiSpacesShares/shareOperations.feature b/tests/acceptance/features/apiSpacesShares/shareOperations.feature index 9c9c5bec6b1..c4a88e01095 100644 --- a/tests/acceptance/features/apiSpacesShares/shareOperations.feature +++ b/tests/acceptance/features/apiSpacesShares/shareOperations.feature @@ -1,4 +1,3 @@ -@api Feature: sharing As a user I want to share resources with different permissions diff --git a/tests/acceptance/features/apiSpacesShares/shareSpaces.feature b/tests/acceptance/features/apiSpacesShares/shareSpaces.feature index 5db7e9ce27d..57cfa790912 100644 --- a/tests/acceptance/features/apiSpacesShares/shareSpaces.feature +++ b/tests/acceptance/features/apiSpacesShares/shareSpaces.feature @@ -1,4 +1,3 @@ -@api Feature: Share spaces As the owner of a space I want to be able to add members to a space, and to remove access for them diff --git a/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature b/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature index 42605ac171b..317ca3f4653 100644 --- a/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature +++ b/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature @@ -1,4 +1,3 @@ -@api Feature: Share spaces via link As the manager of a space I want to be able to share a space via public link diff --git a/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpace.feature b/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpace.feature index 5c697e13a94..82a643b77d5 100644 --- a/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpace.feature +++ b/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpace.feature @@ -1,4 +1,3 @@ -@api Feature: Share a file or folder that is inside a space As a user with manager space role I want to be able to share the data inside the space diff --git a/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature b/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature index eed669352bf..df69680aba9 100644 --- a/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature +++ b/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature @@ -1,4 +1,3 @@ -@api Feature: Share a file or folder that is inside a space via public link As a user with manager space role I want to be able to share the data inside the space via public link diff --git a/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature b/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature index 20b50416ab4..0d4aefaaa57 100644 --- a/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature +++ b/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature @@ -1,4 +1,3 @@ -@api Feature: upload resources on share using TUS protocol As a user I want to be able to upload files diff --git a/tests/acceptance/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php index 0724f9da765..0f263e66b39 100644 --- a/tests/acceptance/features/bootstrap/FeatureContext.php +++ b/tests/acceptance/features/bootstrap/FeatureContext.php @@ -2793,7 +2793,7 @@ public function substituteInLineCodes( "code" => "%last_public_share_token%", "function" => [ $this, - "getLastPublicShareToken" + "getLastCreatedPublicShareToken" ], "parameter" => [] ], diff --git a/tests/acceptance/features/bootstrap/PublicWebDavContext.php b/tests/acceptance/features/bootstrap/PublicWebDavContext.php index 1d0e96270b6..8bb24e42a7d 100644 --- a/tests/acceptance/features/bootstrap/PublicWebDavContext.php +++ b/tests/acceptance/features/bootstrap/PublicWebDavContext.php @@ -51,7 +51,7 @@ public function downloadPublicFileWithRange(string $range, string $publicWebDAVA // accessing it as a public link using the "new" public webDAV API // the client needs to provide the public link share token followed // by just the name of the file - not the full path. - $fullPath = $this->featureContext->getLastPublicSharePath(); + $fullPath = (string) $this->featureContext->getLastCreatedPublicShare()->path; $fullPathParts = \explode("/", $fullPath); $path = \end($fullPathParts); } else { @@ -76,7 +76,7 @@ public function downloadPublicFileWithRange(string $range, string $publicWebDAVA */ public function downloadPublicFileWithRangeAndPassword(string $range, string $password, string $publicWebDAVAPIVersion):void { if ($publicWebDAVAPIVersion === "new") { - $path = $this->featureContext->getLastPublicShareData()->data->file_target; + $path = (string) $this->featureContext->getLastCreatedPublicShare()->file_target; } else { $path = ""; } @@ -124,7 +124,7 @@ public function deleteFileFromPublicShare(string $fileName, string $publicWebDAV if ($publicWebDAVAPIVersion === "old") { return; } - $token = $this->featureContext->getLastPublicShareToken(); + $token = $this->featureContext->getLastCreatedPublicShareToken(); $davPath = WebDavHelper::getDavPath( $token, 0, @@ -178,7 +178,7 @@ public function renameFileFromPublicShare(string $fileName, string $toFileName, if ($publicWebDAVAPIVersion === "old") { return; } - $token = $this->featureContext->getLastPublicShareToken(); + $token = $this->featureContext->getLastCreatedPublicShareToken(); $davPath = WebDavHelper::getDavPath( $token, 0, @@ -296,7 +296,7 @@ public function publicDownloadsTheFileInsideThePublicSharedFolderWithPasswordAnd ):void { $path = \ltrim($path, "/"); $password = $this->featureContext->getActualPassword($password); - $token = $this->featureContext->getLastPublicShareToken(); + $token = $this->featureContext->getLastCreatedPublicShareToken(); $davPath = WebDavHelper::getDavPath( $token, 0, @@ -401,7 +401,7 @@ public function publiclyCopyingFile( * @return void */ public function thePublicCopiesFileUsingTheWebDAVApi(string $source, string $destination, string $publicWebDAVAPIVersion):void { - $token = $this->featureContext->getLastPublicShareToken(); + $token = $this->featureContext->getLastCreatedPublicShareToken(); $davPath = WebDavHelper::getDavPath( $token, 0, @@ -1086,7 +1086,7 @@ public function publiclyUploadingShouldToSharedFileShouldFail( if ($publicWebDAVAPIVersion === "old") { return; } - $filename = (string)$this->featureContext->getLastPublicShareData()->data[0]->file_target; + $filename = (string)$this->featureContext->getLastCreatedPublicShare()->file_target; $this->publicUploadContent( $filename, @@ -1251,7 +1251,7 @@ public function publiclyUploadingToPublicLinkSharedFileShouldWork( if ($publicWebDAVAPIVersion === "old") { return; } elseif ($publicWebDAVAPIVersion === "new") { - $path = $this->featureContext->getLastPublicSharePath(); + $path = (string) $this->featureContext->getLastCreatedPublicShare()->path; } else { $path = ""; } @@ -1329,7 +1329,7 @@ public function publicCreatesFolderUsingPassword( string $destination, string $password ):void { - $token = $this->featureContext->getLastPublicShareToken(); + $token = $this->featureContext->getLastCreatedPublicShareToken(); $davPath = WebDavHelper::getDavPath( $token, 0, @@ -1421,7 +1421,7 @@ public function theMtimeOfFileInTheLastSharedPublicLinkUsingTheWebdavApiShouldBe string $fileName, string $mtime ):void { - $token = $this->featureContext->getLastPublicShareToken(); + $token = $this->featureContext->getLastCreatedPublicShareToken(); $baseUrl = $this->featureContext->getBaseUrl(); $mtime = \explode(" ", $mtime); \array_pop($mtime); @@ -1450,7 +1450,7 @@ public function theMtimeOfFileInTheLastSharedPublicLinkUsingTheWebdavApiShouldNo string $fileName, string $mtime ):void { - $token = $this->featureContext->getLastPublicShareToken(); + $token = $this->featureContext->getLastCreatedPublicShareToken(); $baseUrl = $this->featureContext->getBaseUrl(); Assert::assertNotEquals( $mtime, @@ -1487,7 +1487,7 @@ public function publicUploadContent( return; } $password = $this->featureContext->getActualPassword($password); - $token = $this->featureContext->getLastPublicShareToken(); + $token = $this->featureContext->getLastCreatedPublicShareToken(); $davPath = WebDavHelper::getDavPath( $token, 0, @@ -1593,7 +1593,7 @@ public function publicSendsRequestToLastPublicShare(string $method, string $publ } else { $body = null; } - $token = $this->featureContext->getLastPublicShareToken(); + $token = $this->featureContext->getLastCreatedPublicShareToken(); $davPath = WebDavHelper::getDavPath( null, null, diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php index 392ddd1e23a..84cdc753936 100644 --- a/tests/acceptance/features/bootstrap/Sharing.php +++ b/tests/acceptance/features/bootstrap/Sharing.php @@ -43,21 +43,6 @@ trait Sharing { */ private array $createdUserGroupShares = []; - private ?string $userWhoCreatedLastPublicShare = null; - - /** - * Contains the API response to the last public link share that was created - * by the test-runner using the Sharing API. - * Shares created on the webUI do not have an entry. - */ - private ?SimpleXMLElement $lastPublicShareData = null; - - /** - * Contains the share id of the last public link share that was created by - * the test-runner, either using the Sharing API or on the web UI. - */ - private ?string $lastPublicShareId = null; - private ?float $localLastShareTime = null; /** @@ -85,61 +70,32 @@ trait Sharing { 'attributes', 'permissions', 'share_with', 'share_with_displayname', 'share_with_additional_info' ]; - /* - * Contains information about the public links that have been created with the webUI. - * Each entry in the array has a "name", "url" and "path". - */ - private array $createdPublicLinks = []; - /** - * The end (last) entry will itself be an array with keys "name", "url" and "path" - * - * @return array - */ - public function getLastCreatedPublicLink():array { - return \end($this->createdPublicLinks); - } - - /** - * @return string - */ - public function getLastCreatedPublicLinkUrl():string { - $lastCreatedLink = $this->getLastCreatedPublicLink(); - return $lastCreatedLink["url"]; - } - - /** - * @return string + * @var array */ - public function getLastCreatedPublicLinkPath():string { - $lastCreatedLink = $this->getLastCreatedPublicLink(); - return $lastCreatedLink["path"]; - } + private array $createdPublicShares = []; /** * @return string */ - public function getLastCreatedPublicLinkToken():string { - $lastCreatedLinkUrl = $this->getLastCreatedPublicLinkUrl(); - // The token is the last part of the URL, delimited by "/" - $urlParts = \explode("/", $lastCreatedLinkUrl); - return \end($urlParts); + public function getLastCreatedPublicShareToken():string { + return (string) $this->getLastCreatedPublicShare()->token; } /** * @return SimpleXMLElement|null */ - public function getLastPublicShareData():?SimpleXMLElement { - return $this->lastPublicShareData; + public function getLastCreatedPublicShare():?SimpleXMLElement { + return \end($this->createdPublicShares); } /** - * @param SimpleXMLElement $responseXml + * @param SimpleXMLElement $shareData * * @return void */ - public function setLastPublicShareData(SimpleXMLElement $responseXml): void { - $this->lastPublicShareData = $responseXml; + public function addToCreatedPublicShares(SimpleXMLElement $shareData): void { + $this->createdPublicShares[] = $shareData; } /** @@ -169,10 +125,8 @@ public function getLastCreatedUserGroupShare(): SimpleXMLElement { /** * @return void */ - public function resetLastPublicShareData():void { - $this->lastPublicShareData = null; - $this->lastPublicShareId = null; - $this->userWhoCreatedLastPublicShare = null; + public function emptyCreatedPublicShares():void { + $this->createdPublicShares = []; } /** @@ -886,7 +840,7 @@ public function updateLastShareWithSettings( $user = $this->getActualUsername($user); if ($updateLastPublicLink) { - $share_id = $this->getLastPublicLinkShareId(); + $share_id = (string) $this->getLastCreatedPublicShare()->id; } else { if ($shareOwner === null) { $share_id = $this->getLastCreatedUserGroupShareId(); @@ -1003,17 +957,6 @@ public function userHasUpdatedTheLastShareOfWith(string $user, string $shareOwne } } - /** - * @param string $name - * @param string $url - * @param string $path - * - * @return void - */ - public function addToListOfCreatedPublicLinks(string $name, string $url, string $path = ""):void { - $this->createdPublicLinks[] = ["name" => $name, "url" => $url, "path" => $path]; - } - /** * @param string $user * @param string|null $path @@ -1074,26 +1017,19 @@ public function createShare( || (($httpStatusCode === 200) && ($this->ocsContext->getOCSResponseStatusCode($this->response) > 299)) ) { if ($shareType === 'public_link') { - $this->resetLastPublicShareData(); + $this->emptyCreatedPublicShares(); } else { $this->emptyCreatedUserGroupShares(); } } else { - if ($shareType === 'public_link') { - $this->setLastPublicShareData($this->getResponseXml(null, __METHOD__)); - $this->setLastPublicLinkShareId((string) $this->lastPublicShareData->data[0]->id); - $this->setUserWhoCreatedLastPublicShare($user); - if (isset($this->lastPublicShareData->data)) { - $linkName = (string) $this->lastPublicShareData->data[0]->name; - $linkUrl = (string) $this->lastPublicShareData->data[0]->url; - $this->addToListOfCreatedPublicLinks($linkName, $linkUrl, $path); - } - } else { - $response = $this->getResponseXml(null, __METHOD__); - if (isset($response->data)) { - $shareData = $response->data; + $response = $this->getResponseXml(null, __METHOD__); + if (isset($response->data)) { + $shareData = $response->data; + if ($shareType === 'public_link') { + $this->addToCreatedPublicShares($shareData); + } else { $sharer = (string) $response->data->uid_owner; - $this->addToCreatedUserGroupShares($sharer, $shareData); + $this->addToCreatedUserGroupshares($sharer, $shareData); } } } @@ -1933,7 +1869,7 @@ public function theUserHasDeletedLastShareUsingTheSharingAPI():void { public function deleteLastShareUsingSharingApi(string $user, string $sharer = null, bool $deleteLastPublicLink = false):void { $user = $this->getActualUsername($user); if ($deleteLastPublicLink) { - $shareId = $this->getLastPublicLinkShareId(); + $shareId = (string) $this->getLastCreatedPublicShare()->id; } else { if ($sharer === null) { $shareId = $this->getLastCreatedUserGroupShareId(); @@ -2042,7 +1978,7 @@ public function userGetsInfoOfLastShareUsingTheSharingApi(string $user, ?string * @throws Exception */ public function theUserGetsInfoOfLastPublicLinkShareUsingTheSharingApi():void { - $this->userGetsInfoOfLastPublicLinkShareUsingTheSharingApi($this->getUserWhoCreatedLastPublicShare()); + $this->userGetsInfoOfLastPublicLinkShareUsingTheSharingApi((string) $this->getLastCreatedPublicShare()->uid_owner); } /** @@ -2056,8 +1992,8 @@ public function theUserGetsInfoOfLastPublicLinkShareUsingTheSharingApi():void { * @throws Exception */ public function userGetsInfoOfLastPublicLinkShareUsingTheSharingApi(string $user, ?string $language = null):void { - if ($this->lastPublicShareId !== null) { - $shareId = $this->lastPublicShareId; + if ($this->getLastCreatedPublicShare()->id !== null) { + $shareId = (string) $this->getLastCreatedPublicShare()->id; } else { throw new Exception( __METHOD__ . " last public link share data was not found" @@ -2108,46 +2044,6 @@ public function theInfoAboutTheLastShareByUserWithUserShouldInclude( $this->asLastShareInfoAboutUserSharingWithUserShouldInclude($sharer, $sharer, $sharee, $table); } - /** - * Sets the id of the last public link shared file - * - * @param string $shareId - * - * @return void - */ - public function setLastPublicLinkShareId(string $shareId):void { - $this->lastPublicShareId = $shareId; - } - - /** - * Retrieves the id of the last public link shared file - * - * @return string|null - */ - public function getLastPublicLinkShareId():?string { - return $this->lastPublicShareId; - } - - /** - * Sets the user who created the last public link share - * - * @param string $user - * - * @return void - */ - public function setUserWhoCreatedLastPublicShare(string $user):void { - $this->userWhoCreatedLastPublicShare = $user; - } - - /** - * Gets the user who created the last public link share - * - * @return string|null - */ - public function getUserWhoCreatedLastPublicShare():?string { - return $this->userWhoCreatedLastPublicShare; - } - /** * Retrieves all the shares of the respective user * @@ -2223,7 +2119,7 @@ public function userGetsAllTheSharesSharedWithHimUsingTheSharingApi(string $user */ public function userGetsTheLastShareSharedWithHimUsingTheSharingApi(string $user, TableNode $table):void { $user = $this->getActualUsername($user); - $shareId = $this->getLastPublicLinkShareId(); + $shareId = (string) $this->getLastCreatedPublicShare()->id; $this->getShareData($user, $shareId); $this->checkFields($user, $table); } @@ -2429,7 +2325,7 @@ public function theResponseWhenUserGetsInfoOfLastPublicLinkShareShouldInclude( ):void { $user = $this->getActualUsername($user); $this->verifyTableNodeRows($body, [], $this->shareResponseFields); - $this->getShareData($user, (string)$this->getLastPublicLinkShareId()); + $this->getShareData($user, (string) $this->getLastCreatedPublicShare()->id); $this->theHTTPStatusCodeShouldBe( 200, "Error getting info of last public link share for user $user" @@ -2564,7 +2460,7 @@ public function checkLastShareIDIsNotIncluded():void { * @throws Exception */ public function checkLastPublicLinkShareIDIsNotIncluded():void { - $shareId = $this->getLastPublicLinkShareId(); + $shareId = (string) $this->getLastCreatedPublicShare()->id; if ($this->isFieldInResponse('id', $shareId, false)) { Assert::fail( "Public link share id $shareId has been found in response" @@ -2705,7 +2601,8 @@ public function checkFieldsOfSpaceSharingResponse(string $user, string $space, ? "space_id" ]; - $this->setLastPublicShareData($this->getResponseXml(null, __METHOD__)); + $response = $this->getResponseXml(null, __METHOD__); + $this->addToCreatedPublicShares($response->data); foreach ($bodyRows as $field => $value) { if (\in_array($field, $userRelatedFieldNames)) { $value = $this->substituteInLineCodes( @@ -2735,7 +2632,7 @@ public function checkFieldsOfSpaceSharingResponse(string $user, string $space, ? $value = $this->replaceValuesFromTable($field, $value); Assert::assertTrue( - $this->isFieldInResponse($field, $value, true, $this->getLastPublicShareData()->data[0]), + $this->isFieldInResponse($field, $value, true, $this->getLastCreatedPublicShare()), "$field doesn't have value '$value'" ); } @@ -3585,73 +3482,6 @@ private function getAllSharesSharedWithUser(string $user, ?string $state = "all" return $usersShares['ocs']['data']; } - /** - * The tests can create public link shares with the API or with the webUI. - * If lastPublicShareData is null, then there have not been any created with the API, - * so look for details of a public link share created with the webUI. - * - * @return string authorization token - */ - public function getLastPublicShareToken():string { - if ($this->lastPublicShareData === null) { - return $this->getLastCreatedPublicLinkToken(); - } else { - if (\count($this->lastPublicShareData->data->element) > 0) { - return (string)$this->lastPublicShareData->data[0]->token; - } - - return (string)$this->lastPublicShareData->data->token; - } - } - - /** - * Returns the attribute values from the last public link share data - * - * @param $attr - attribute name to get - * - * @return string - * @throws Exception - */ - public function getLastPublicShareAttribute(string $attr): string { - if ($this->lastPublicShareData === null) { - throw new Exception(__METHOD__ . "No public share data available."); - } - if (!\in_array($attr, $this->shareResponseFields)) { - throw new Exception( - __METHOD__ . " attribute $attr is not in the list of allowed attributes" - ); - } - if (\count($this->lastPublicShareData->data->element) > 0) { - if (!isset($this->lastPublicShareData->data[0]->$attr)) { - throw new Exception(__METHOD__ . " No attribute $attr available in the last share data."); - } - return (string)$this->lastPublicShareData->data[0]->{$attr}; - } - - if (!isset($this->lastPublicShareData->data->$attr)) { - throw new Exception(__METHOD__ . " No attribute $attr available in the last share data."); - } - - return (string)$this->lastPublicShareData->data->{$attr}; - } - - /** - * @return string path of file that was shared (relevant when a single file has been shared) - */ - public function getLastPublicSharePath():string { - if ($this->lastPublicShareData === null) { - // There have not been any public links created with the API - // so get the path of the last public link created with the webUI - return $this->getLastCreatedPublicLinkPath(); - } else { - if (\count($this->lastPublicShareData->data->element) > 0) { - return (string)$this->lastPublicShareData->data[0]->path; - } - - return (string)$this->lastPublicShareData->data->path; - } - } - /** * Send request for preview of a file in a public link * @@ -3678,8 +3508,7 @@ public function getPublicPreviewOfFile(string $fileName, string $token):void { * @return void */ public function thePublicAccessesThePreviewOfTheSharedFileUsingTheSharingApi(string $path):void { - $shareData = $this->getLastPublicShareData(); - $token = (string) $shareData->data->token; + $token = $this->getLastCreatedPublicShareToken(); $this->getPublicPreviewOfFile($path, $token); $this->pushToLastStatusCodesArrays(); } @@ -3700,8 +3529,7 @@ public function thePublicAccessesThePreviewOfTheFollowingSharedFileUsingTheShari $this->emptyLastHTTPStatusCodesArray(); $this->emptyLastOCSStatusCodesArray(); foreach ($paths as $path) { - $shareData = $this->getLastPublicShareData(); - $token = (string) $shareData->data->token; + $token = $this->getLastCreatedPublicShareToken(); $this->getPublicPreviewOfFile($path["path"], $token); $this->pushToLastStatusCodesArrays(); } @@ -3722,12 +3550,12 @@ public function saveLastSharedPublicLinkShare( $user = $this->getActualUsername($user); $userPassword = $this->getPasswordForUser($user); - $shareData = $this->getLastPublicShareData(); - $owner = (string) $shareData->data->uid_owner; - $name = $this->encodePath((string) $shareData->data->file_target); + $shareData = $this->getLastCreatedPublicShare(); + $owner = (string) $shareData->uid_owner; + $name = $this->encodePath((string) $shareData->file_target); $name = \trim($name, "/"); - $ownerDisplayName = (string) $shareData->data->displayname_owner; - $token = (string) $shareData->data->token; + $ownerDisplayName = (string) $shareData->displayname_owner; + $token = (string) $shareData->token; if (\strtolower($shareServer) == "remote") { $remote = $this->getRemoteBaseUrl(); @@ -3870,7 +3698,7 @@ public function userAddsPublicShareCreatedByUser(string $user, string $shareServ * @throws GuzzleException */ public function expireLastCreatedPublicLinkShare():void { - $shareId = $this->getLastPublicLinkShareId(); + $shareId = (string) $this->getLastCreatedPublicShare()->id; $this->expireShare($shareId); } diff --git a/tests/acceptance/features/bootstrap/SpacesContext.php b/tests/acceptance/features/bootstrap/SpacesContext.php index f460b5e4485..ba827dbb114 100644 --- a/tests/acceptance/features/bootstrap/SpacesContext.php +++ b/tests/acceptance/features/bootstrap/SpacesContext.php @@ -366,20 +366,6 @@ public function getETag(string $user, string $spaceName, string $fileName): stri return \str_replace('"', '\"', $fileData["Etag"][0]); } - /** - * using method from core to set share data - * - * @return void - */ - public function setLastShareData(): void { - // set last response as PublicShareData - $this->featureContext->setLastPublicShareData($this->featureContext->getResponseXml(null, __METHOD__)); - // set last shareId if ShareData exists - if (isset($this->featureContext->getLastPublicShareData()->data)) { - $this->featureContext->setLastPublicLinkShareId((string) $this->featureContext->getLastPublicShareData()->data[0]->id); - } - } - /** * @BeforeScenario * @@ -1927,7 +1913,8 @@ public function createShareResource( $body ) ); - $this->setLastShareData(); + $response = $this->featureContext->getResponseXml(null, __METHOD__); + $this->featureContext->addToCreatedPublicShares($response->data); } /** @@ -1980,7 +1967,7 @@ public function changeShareResourceWithSettings( * @throws JsonException */ public function updateSharedResource(string $user, array $rows):ResponseInterface { - $shareId = $this->featureContext->getLastPublicLinkShareId(); + $shareId = (string) $this->featureContext->getLastCreatedPublicShare()->id; $fullUrl = $this->baseUrl . $this->ocsApiUrl . '/' . $shareId; return HttpRequestHelper::sendRequest( $fullUrl, @@ -2050,7 +2037,8 @@ public function createPublicLinkToEntityInsideOfSpaceRequest( ) ); - $this->setLastShareData(); + $response = $this->featureContext->getResponseXml(null, __METHOD__); + $this->featureContext->addToCreatedPublicShares($response->data); } /** @@ -2882,7 +2870,8 @@ public function sendShareSpaceViaLinkRequest( ) ); - $this->setLastShareData(); + $response = $this->featureContext->getResponseXml(null, __METHOD__); + $this->featureContext->addToCreatedPublicShares($response->data); } /** @@ -2907,7 +2896,6 @@ public function userHasCreatedPublicLinkShareOfSpace( $expectedHTTPStatus, "Expected response status code should be $expectedHTTPStatus" ); - $this->featureContext->setLastPublicLinkShareId((string) $this->featureContext->getLastPublicShareData()->data[0]->id); } /** @@ -2952,7 +2940,7 @@ public function forUserSpaceShouldContainLinks( if ($should) { Assert::assertNotEmpty($responseArray, __METHOD__ . ' Response should contain a link, but it is empty'); foreach ($responseArray as $element) { - $expectedLinkId = $this->featureContext->getLastPublicLinkShareId(); + $expectedLinkId = (string) $this->featureContext->getLastCreatedPublicShare()->id; Assert::assertEquals($element["id"], $expectedLinkId, "link IDs are different"); } } else { @@ -3231,7 +3219,7 @@ public function theResponseShouldContain(string $method, string $user, string $s * @throws GuzzleException|JsonException */ public function publicDownloadsTheFolderFromTheLastCreatedPublicLink(string $resource) { - $token = $this->featureContext->getLastPublicShareToken(); + $token = $this->featureContext->getLastCreatedPublicShareToken(); $response = $this->featureContext->listFolderAndReturnResponseXml( $token, $resource, diff --git a/tests/acceptance/features/bootstrap/WebDav.php b/tests/acceptance/features/bootstrap/WebDav.php index 5088a8ef5f5..dbdef1e07b9 100644 --- a/tests/acceptance/features/bootstrap/WebDav.php +++ b/tests/acceptance/features/bootstrap/WebDav.php @@ -1499,7 +1499,7 @@ public function downloadFileAsUserUsingPassword( * @throws Exception */ public function publicGetsSizeOfLastSharedPublicLinkUsingTheWebdavApi():void { - $tokenArray = $this->getLastPublicShareData()->data->token; + $tokenArray = $this->getLastCreatedPublicShare()->token; $token = (string)$tokenArray[0]; $url = $this->getBaseUrl() . "/remote.php/dav/public-files/$token"; $this->response = HttpRequestHelper::sendRequest( @@ -5117,7 +5117,7 @@ public function theLastDavResponseShouldNotContainTheseNodes(string $user, Table * @throws Exception */ public function theLastPublicDavResponseShouldContainTheseNodes(TableNode $table):void { - $user = $this->getLastPublicShareToken(); + $user = $this->getLastCreatedPublicShareToken(); $this->verifyTableNodeColumns($table, ["name"]); $type = $this->usingOldDavPath ? "public-files" : "public-files-new"; foreach ($table->getHash() as $row) { @@ -5136,7 +5136,7 @@ public function theLastPublicDavResponseShouldContainTheseNodes(TableNode $table * @throws Exception */ public function theLastPublicDavResponseShouldNotContainTheseNodes(TableNode $table):void { - $user = $this->getLastPublicShareToken(); + $user = $this->getLastCreatedPublicShareToken(); $this->verifyTableNodeColumns($table, ["name"]); $type = $this->usingOldDavPath ? "public-files" : "public-files-new"; foreach ($table->getHash() as $row) { @@ -5155,7 +5155,7 @@ public function theLastPublicDavResponseShouldNotContainTheseNodes(TableNode $ta * @throws Exception */ public function thePublicListsTheResourcesInTheLastCreatedPublicLinkWithDepthUsingTheWebdavApi(string $depth):void { - $user = $this->getLastPublicShareToken(); + $user = $this->getLastCreatedPublicShareToken(); $response = $this->listFolder( $user, '/', diff --git a/tests/acceptance/features/bootstrap/WebDavLockingContext.php b/tests/acceptance/features/bootstrap/WebDavLockingContext.php index fd8c39f714c..df721cd645f 100644 --- a/tests/acceptance/features/bootstrap/WebDavLockingContext.php +++ b/tests/acceptance/features/bootstrap/WebDavLockingContext.php @@ -148,7 +148,7 @@ public function userHasLockedFile(string $user, string $file, TableNode $propert */ public function publicHasLockedLastSharedFile(TableNode $properties) { $this->lockFile( - $this->featureContext->getLastPublicShareToken(), + $this->featureContext->getLastCreatedPublicShareToken(), "/", $properties, true @@ -164,7 +164,7 @@ public function publicHasLockedLastSharedFile(TableNode $properties) { */ public function publicLocksLastSharedFile(TableNode $properties) { $this->lockFile( - $this->featureContext->getLastPublicShareToken(), + $this->featureContext->getLastCreatedPublicShareToken(), "/", $properties, true, @@ -185,7 +185,7 @@ public function publicHasLockedFileLastSharedFolder( TableNode $properties ) { $this->lockFile( - $this->featureContext->getLastPublicShareToken(), + $this->featureContext->getLastCreatedPublicShareToken(), $file, $properties, true @@ -207,7 +207,7 @@ public function publicLocksFileLastSharedFolder( TableNode $properties ) { $this->lockFile( - $this->featureContext->getLastPublicShareToken(), + $this->featureContext->getLastCreatedPublicShareToken(), $file, $properties, true, @@ -268,7 +268,7 @@ public function unlockItemWithLastPublicLockOfOtherItemUsingWebDavAPI( string $itemToUnlock, string $itemToUseLockOf ) { - $lockOwner = $this->featureContext->getLastPublicShareToken(); + $lockOwner = $this->featureContext->getLastCreatedPublicShareToken(); $this->unlockItemWithLastLockOfUserAndItemUsingWebDavAPI( $user, $itemToUnlock, @@ -419,7 +419,7 @@ public function unlockItemAsPublicWithLastLockOfUserAndItemUsingWebDavAPI( string $lockOwner, string $itemToUseLockOf ) { - $user = $this->featureContext->getLastPublicShareToken(); + $user = $this->featureContext->getLastCreatedPublicShareToken(); $this->unlockItemWithLastLockOfUserAndItemUsingWebDavAPI( $user, $itemToUnlock, @@ -437,7 +437,7 @@ public function unlockItemAsPublicWithLastLockOfUserAndItemUsingWebDavAPI( * @return void */ public function unlockItemAsPublicUsingWebDavAPI(string $itemToUnlock) { - $user = $this->featureContext->getLastPublicShareToken(); + $user = $this->featureContext->getLastCreatedPublicShareToken(); $this->unlockItemWithLastLockOfUserAndItemUsingWebDavAPI( $user, $itemToUnlock, @@ -592,7 +592,7 @@ public function publicUploadFileSendingLockTokenOfPublic( string $itemToUseLockOf, string $publicWebDAVAPIVersion ) { - $lockOwner = $this->featureContext->getLastPublicShareToken(); + $lockOwner = $this->featureContext->getLastCreatedPublicShareToken(); $this->publicUploadFileSendingLockTokenOfUser( $filename, $content, diff --git a/tests/acceptance/features/bootstrap/WebDavPropertiesContext.php b/tests/acceptance/features/bootstrap/WebDavPropertiesContext.php index beef5ebe5de..3abf131b89c 100644 --- a/tests/acceptance/features/bootstrap/WebDavPropertiesContext.php +++ b/tests/acceptance/features/bootstrap/WebDavPropertiesContext.php @@ -289,7 +289,7 @@ public function userGetsPropertiesOfFile( * @throws Exception */ public function publicGetsThePropertiesOfFolder(string $path, TableNode $propertiesTable):void { - $user = $this->featureContext->getLastPublicShareToken(); + $user = $this->featureContext->getLastCreatedPublicShareToken(); $properties = null; foreach ($propertiesTable->getRows() as $row) { $properties[] = $row[0]; @@ -890,7 +890,7 @@ public function assertValueOfItemInResponseToUserRegExp(string $xpath, ?string $ [ "code" => "%public_token%", "function" => - [$this->featureContext, "getLastPublicShareToken"], + [$this->featureContext, "getLastCreatedPublicShareToken"], "parameter" => [] ], ] diff --git a/tests/acceptance/features/coreApiAuth/webDavAuth.feature b/tests/acceptance/features/coreApiAuth/webDavAuth.feature index 1738a91fb4f..e19534ce935 100644 --- a/tests/acceptance/features/coreApiAuth/webDavAuth.feature +++ b/tests/acceptance/features/coreApiAuth/webDavAuth.feature @@ -1,4 +1,3 @@ -@api Feature: auth As a user I want to check the authentication of the application diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsDELETEAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsDELETEAuth.feature index 6dee5a4c2b1..c1fad2e7c12 100644 --- a/tests/acceptance/features/coreApiAuthOcs/ocsDELETEAuth.feature +++ b/tests/acceptance/features/coreApiAuthOcs/ocsDELETEAuth.feature @@ -1,4 +1,3 @@ -@api Feature: auth As a user I want to send delete request with wrong password diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsGETAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsGETAuth.feature index 3d9d08444c7..c350c4d6a06 100644 --- a/tests/acceptance/features/coreApiAuthOcs/ocsGETAuth.feature +++ b/tests/acceptance/features/coreApiAuthOcs/ocsGETAuth.feature @@ -1,4 +1,3 @@ -@api Feature: auth As a user I want to send GET request to various endpoints diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsPOSTAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsPOSTAuth.feature index d18ea766f89..e56d1979bd3 100644 --- a/tests/acceptance/features/coreApiAuthOcs/ocsPOSTAuth.feature +++ b/tests/acceptance/features/coreApiAuthOcs/ocsPOSTAuth.feature @@ -1,4 +1,3 @@ -@api Feature: auth As a user I want to send POST request to various endpoints diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsPUTAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsPUTAuth.feature index 4ca72511f31..71cbbd409b5 100644 --- a/tests/acceptance/features/coreApiAuthOcs/ocsPUTAuth.feature +++ b/tests/acceptance/features/coreApiAuthOcs/ocsPUTAuth.feature @@ -1,4 +1,3 @@ -@api Feature: auth As a user I want to send PUT request to various endpoints diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavCOPYAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavCOPYAuth.feature index 0101618ba9d..61051b484a5 100644 --- a/tests/acceptance/features/coreApiAuthWebDav/webDavCOPYAuth.feature +++ b/tests/acceptance/features/coreApiAuthWebDav/webDavCOPYAuth.feature @@ -1,4 +1,3 @@ -@api Feature: COPY file/folder As a user I want to copy a file or folder diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavDELETEAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavDELETEAuth.feature index 0e6f960dfe8..43e04058e62 100644 --- a/tests/acceptance/features/coreApiAuthWebDav/webDavDELETEAuth.feature +++ b/tests/acceptance/features/coreApiAuthWebDav/webDavDELETEAuth.feature @@ -1,4 +1,3 @@ -@api Feature: delete file/folder As a user I want to delete a file or folder diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavLOCKAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavLOCKAuth.feature index 8f6bd4ed7ee..76e108d2c13 100644 --- a/tests/acceptance/features/coreApiAuthWebDav/webDavLOCKAuth.feature +++ b/tests/acceptance/features/coreApiAuthWebDav/webDavLOCKAuth.feature @@ -1,4 +1,3 @@ -@api Feature: LOCK file/folder As a user I want to lock a file or folder diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavMKCOLAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavMKCOLAuth.feature index 31a3212da68..7b91ef9a1a2 100644 --- a/tests/acceptance/features/coreApiAuthWebDav/webDavMKCOLAuth.feature +++ b/tests/acceptance/features/coreApiAuthWebDav/webDavMKCOLAuth.feature @@ -1,4 +1,3 @@ -@api Feature: create folder using MKCOL As a user I want to create folders diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavMOVEAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavMOVEAuth.feature index a28437c2ed7..6f980e62438 100644 --- a/tests/acceptance/features/coreApiAuthWebDav/webDavMOVEAuth.feature +++ b/tests/acceptance/features/coreApiAuthWebDav/webDavMOVEAuth.feature @@ -1,4 +1,3 @@ -@api Feature: MOVE file/folder As a user I want to move resources diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavPOSTAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavPOSTAuth.feature index 461f78b5918..7828340c95d 100644 --- a/tests/acceptance/features/coreApiAuthWebDav/webDavPOSTAuth.feature +++ b/tests/acceptance/features/coreApiAuthWebDav/webDavPOSTAuth.feature @@ -1,4 +1,3 @@ -@api Feature: POST file/folder As a user I want to send POST request to various endpoints diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavPROPFINDAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavPROPFINDAuth.feature index f6c44a33e36..8997e836b42 100644 --- a/tests/acceptance/features/coreApiAuthWebDav/webDavPROPFINDAuth.feature +++ b/tests/acceptance/features/coreApiAuthWebDav/webDavPROPFINDAuth.feature @@ -1,4 +1,3 @@ -@api Feature: PROPFIND file/folder As a user I want to send PROPFIND request to various endpoints diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavPROPPATCHAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavPROPPATCHAuth.feature index 0f2ad70a658..2beb3164812 100644 --- a/tests/acceptance/features/coreApiAuthWebDav/webDavPROPPATCHAuth.feature +++ b/tests/acceptance/features/coreApiAuthWebDav/webDavPROPPATCHAuth.feature @@ -1,4 +1,3 @@ -@api Feature: PROPPATCH file/folder As a user I want to send PROPPATCH request to various endpoints diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavPUTAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavPUTAuth.feature index aa44b14b0c9..ceaf8aee2bf 100644 --- a/tests/acceptance/features/coreApiAuthWebDav/webDavPUTAuth.feature +++ b/tests/acceptance/features/coreApiAuthWebDav/webDavPUTAuth.feature @@ -1,4 +1,3 @@ -@api Feature: PUT file/folder As a user I want to send PUT request to various endpoints diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature index a79b2b91f6a..dde4c9d2a00 100644 --- a/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature +++ b/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature @@ -1,4 +1,3 @@ -@api Feature: make webdav request with special urls As a user I want to make webdav request with special urls diff --git a/tests/acceptance/features/coreApiCapabilities/capabilities.feature b/tests/acceptance/features/coreApiCapabilities/capabilities.feature index baf6f7ba992..8e6e78ac2b1 100644 --- a/tests/acceptance/features/coreApiCapabilities/capabilities.feature +++ b/tests/acceptance/features/coreApiCapabilities/capabilities.feature @@ -1,4 +1,3 @@ -@api Feature: capabilities As an admin I want to list the capabilities diff --git a/tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature b/tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature index 151bb760121..3307df15891 100644 --- a/tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature +++ b/tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature @@ -1,4 +1,3 @@ -@api Feature: default capabilities for normal user As a user I want to list capabilities diff --git a/tests/acceptance/features/coreApiFavorites/favorites.feature b/tests/acceptance/features/coreApiFavorites/favorites.feature index f6014061896..ff368f55a8e 100644 --- a/tests/acceptance/features/coreApiFavorites/favorites.feature +++ b/tests/acceptance/features/coreApiFavorites/favorites.feature @@ -1,4 +1,3 @@ -@api Feature: favorite As a user I want to favorite resources diff --git a/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature b/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature index 2cf4cf09149..020a00a8ce8 100644 --- a/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature +++ b/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature @@ -1,4 +1,3 @@ -@api Feature: favorite As a user I want to favorite the shared resources diff --git a/tests/acceptance/features/coreApiMain/checksums.feature b/tests/acceptance/features/coreApiMain/checksums.feature index 9c6c66edb86..f23e06db871 100644 --- a/tests/acceptance/features/coreApiMain/checksums.feature +++ b/tests/acceptance/features/coreApiMain/checksums.feature @@ -1,4 +1,3 @@ -@api Feature: checksums As a user I want to upload files with checksum diff --git a/tests/acceptance/features/coreApiMain/main.feature b/tests/acceptance/features/coreApiMain/main.feature index 83fe2f57398..81448d9fa99 100644 --- a/tests/acceptance/features/coreApiMain/main.feature +++ b/tests/acceptance/features/coreApiMain/main.feature @@ -1,4 +1,3 @@ -@api Feature: get robots.txt As a user I want to get file robots.txt diff --git a/tests/acceptance/features/coreApiMain/status.feature b/tests/acceptance/features/coreApiMain/status.feature index 275d05f3ed6..77b3043d7e0 100644 --- a/tests/acceptance/features/coreApiMain/status.feature +++ b/tests/acceptance/features/coreApiMain/status.feature @@ -1,4 +1,3 @@ -@api Feature: Status As a admin I want to check status of the server diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature index f20d9e95f0a..003a1bd08ed 100644 --- a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature +++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature @@ -1,4 +1,3 @@ -@api Feature: Sharing resources with different case names with the sharee and checking the coexistence of resources on sharee/receivers side As a user I want to share resources with case sensitive names diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature index a74e59c3ec6..f93ed6990db 100644 --- a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature +++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature @@ -1,4 +1,3 @@ -@api Feature: resources shared with the same name are received with unique names As a user I want to share resources with same name diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature index 186273c8797..2e95f702689 100644 --- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature +++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature @@ -1,4 +1,4 @@ -@api @issue-1327 +@issue-1327 Feature: shares are received in the default folder for received shares As a user I want to share the default Shares folder diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature index 0cc179c7d43..7a8b3db185e 100644 --- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature +++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature @@ -1,4 +1,3 @@ -@api Feature: sharing works when a username and group name are the same As a user I want to share resources with group and users having same name diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature index c0812611eb0..f5a520ed2be 100644 --- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature +++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature @@ -1,4 +1,3 @@ -@api Feature: share resources where the sharee receives the share in multiple ways As a user I want to receives the same resource share from multiple channels diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature index f5d5479f918..77853a09ab7 100644 --- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature +++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature @@ -1,4 +1,4 @@ -@api @issue-1328 +@issue-1328 Feature: share resources with a disabled user As a user I want to share resources to disabled user diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature index fd7d5246798..593bfb801df 100644 --- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature +++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature @@ -1,4 +1,3 @@ -@api Feature: cannot share resources with invalid permissions As a user I want to share resources with invalid permission diff --git a/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature b/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature index 69533063721..039dd1ab75e 100644 --- a/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature +++ b/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature @@ -1,4 +1,3 @@ -@api Feature: sharing As a user I want to share resources to others diff --git a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature index 2503ede9a67..bedbf7fe5c4 100644 --- a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature +++ b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature @@ -1,4 +1,4 @@ -@api @issue-1328 @issue-1289 +@issue-1328 @issue-1289 Feature: sharing As a user I want to delete shares diff --git a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature index 61364813605..081f3d28959 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature @@ -1,4 +1,4 @@ -@api @issue-1289 @issue-1328 +@issue-1289 @issue-1328 Feature: accept/decline shares coming from internal users As a user I want to have control of which received shares I accept diff --git a/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature b/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature index abcef37246c..9f3b6dc9edd 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature @@ -1,4 +1,3 @@ -@api Feature: accept/decline shares coming from internal users to the Shares folder As a user I want to have control of which received shares I accept diff --git a/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature index 47415b6b8a0..7c3e9c2a882 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature @@ -1,4 +1,4 @@ -@api @issue-1328 @issues-1289 +@issue-1328 @issues-1289 Feature: sharing Background: diff --git a/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature index 76c46d9fb00..6f2367d90ed 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature @@ -1,4 +1,4 @@ -@api @issue-1289 @issue-1328 +@issue-1289 @issue-1328 Feature: sharing Background: diff --git a/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature index 8a27bb5bd83..f15450e6eaf 100644 --- a/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature +++ b/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature @@ -1,4 +1,3 @@ -@api Feature: moving a share inside another share As a user I want to move a shared resource inside another shared resource diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature index 6853ee756e2..74a2e70ba3e 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature @@ -1,4 +1,3 @@ -@api Feature: sharing As a user I want to share resources with other users diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature index e0d923211bc..2a1da3f9df6 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature @@ -1,4 +1,4 @@ -@api @issue-1289 @issue-1328 +@issue-1289 @issue-1328 Feature: sharing As a user I want to move shares that I received diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature index d866e742b2e..6b61d3f324d 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature @@ -1,4 +1,3 @@ -@api Feature: sharing As a user I want to get all the shares diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature index b3720c57884..f6b63478abe 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature @@ -1,4 +1,3 @@ -@api Feature: get the pending shares filtered by type (user, group etc) As a user I want to filter the pending shares that I have received of a particular type (user, group etc) diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature index 2a489197b62..6b5adcc98d1 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature @@ -1,4 +1,3 @@ -@api Feature: get the received shares filtered by type (user, group etc) As a user I want to filter the shares that I have received of a particular type (user, group etc) diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature index b8785084b38..ebde6dca435 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature @@ -1,4 +1,3 @@ -@api Feature: get the received shares filtered by type (user, group etc) As a user I want to filter the shares that I have received of a particular type (user, group etc) diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature index 82cbf91be50..ff36f8c8a61 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature @@ -1,4 +1,3 @@ -@api Feature: get shares filtered by type (user, group etc) As a user I want to filter the shares that I have received of a particular type (user, group etc) diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFilteredEmpty.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFilteredEmpty.feature index eea4313a74e..4cadfc3bc27 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFilteredEmpty.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFilteredEmpty.feature @@ -1,4 +1,3 @@ -@api Feature: get shares filtered by type (user, group etc) As a user I want to filter the shares that I have received of a particular type (user, group etc) diff --git a/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature b/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature index e451eb26d50..57a15e14e4d 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature @@ -1,4 +1,3 @@ -@api Feature: sharing As a user I want to check the webdav share permissions diff --git a/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature b/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature index 8884d080fb0..f9c5a7a049b 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature @@ -1,4 +1,3 @@ -@api Feature: share access by ID As an API consumer (app) I want to access a share by its id diff --git a/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature index 11a6832e40c..8f8e540f3fd 100644 --- a/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature +++ b/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature @@ -1,4 +1,3 @@ -@api Feature: sharing As a user I want to upload resources to a folder shared to me diff --git a/tests/acceptance/features/coreApiSharePublicLink1/accessToPublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink1/accessToPublicLinkShare.feature index b93faf05ee5..e36d9ac0b5c 100644 --- a/tests/acceptance/features/coreApiSharePublicLink1/accessToPublicLinkShare.feature +++ b/tests/acceptance/features/coreApiSharePublicLink1/accessToPublicLinkShare.feature @@ -1,4 +1,3 @@ -@api Feature: accessing a public link share As a person who knows a public link I want be able to access the preview of a public link file diff --git a/tests/acceptance/features/coreApiSharePublicLink1/changingPublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink1/changingPublicLinkShare.feature index f856080b47e..53d160f0d0d 100644 --- a/tests/acceptance/features/coreApiSharePublicLink1/changingPublicLinkShare.feature +++ b/tests/acceptance/features/coreApiSharePublicLink1/changingPublicLinkShare.feature @@ -1,4 +1,4 @@ -@api @issue-1276 @issue-1277 @issue-1269 +@issue-1276 @issue-1277 @issue-1269 Feature: changing a public link share As a user diff --git a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature index c886f7ea218..f8bc8ad5ef0 100644 --- a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature +++ b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature @@ -1,4 +1,4 @@ -@api @issue-1269 @issue-1293 +@issue-1269 @issue-1293 Feature: create a public link share As a user diff --git a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature index ecbd2127b4b..9a85b3e7d56 100644 --- a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature +++ b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature @@ -1,4 +1,3 @@ -@api Feature: create a public link share when share_folder is set to Shares As a user I want to create public links diff --git a/tests/acceptance/features/coreApiSharePublicLink1/deletePublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink1/deletePublicLinkShare.feature index ed1aa7ece30..7a57e3e47bf 100644 --- a/tests/acceptance/features/coreApiSharePublicLink1/deletePublicLinkShare.feature +++ b/tests/acceptance/features/coreApiSharePublicLink1/deletePublicLinkShare.feature @@ -1,4 +1,3 @@ -@api Feature: delete a public link share As a user I want to delete a public link diff --git a/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature b/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature index 0a1dbe5dd1f..188f8fbcec2 100644 --- a/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature +++ b/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature @@ -1,4 +1,3 @@ -@api Feature: copying from public link share As a user I want to make a copy of a resource within a public link diff --git a/tests/acceptance/features/coreApiSharePublicLink2/multilinkSharing.feature b/tests/acceptance/features/coreApiSharePublicLink2/multilinkSharing.feature index af09bf6c5d7..d718d9bb3c2 100644 --- a/tests/acceptance/features/coreApiSharePublicLink2/multilinkSharing.feature +++ b/tests/acceptance/features/coreApiSharePublicLink2/multilinkSharing.feature @@ -1,4 +1,3 @@ -@api Feature: multi-link sharing As a user I want to create multiple public links for a single resource diff --git a/tests/acceptance/features/coreApiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature b/tests/acceptance/features/coreApiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature index e1eac3261cc..2793fd062b2 100644 --- a/tests/acceptance/features/coreApiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature +++ b/tests/acceptance/features/coreApiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature @@ -1,4 +1,3 @@ -@api Feature: reshare as public link As a user I want to create public link shares from files/folders shared with me diff --git a/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature index 961d3faeb91..6403fb5586b 100644 --- a/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature +++ b/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature @@ -1,4 +1,3 @@ -@api Feature: update a public link share As a user I want to update a public link diff --git a/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature index e6f5d6a8977..7675fbb5c7a 100644 --- a/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature +++ b/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature @@ -1,4 +1,4 @@ -@api @issue-1276 @issue-1277 +@issue-1276 @issue-1277 Feature: upload to a public link share As a user diff --git a/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature b/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature index c84136819fd..734f23d8a11 100644 --- a/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature +++ b/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature @@ -1,4 +1,4 @@ -@api @issue-1328 +@issue-1328 Feature: sharing As a user I want to re-share a resource diff --git a/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature b/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature index 9a3fe06421a..89b385beaaf 100644 --- a/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature +++ b/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature @@ -1,4 +1,4 @@ -@api @issue-2141 +@issue-2141 Feature: resharing can be done on a reshared resource As a user I want to re-share a resource diff --git a/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature b/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature index a66a17d2a9b..49381081e70 100644 --- a/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature +++ b/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature @@ -1,4 +1,4 @@ -@api @issue-1328 +@issue-1328 Feature: resharing can be disabled As a user I want to share a resource without reshare permission diff --git a/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature b/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature index b2ee4c9a64a..c11034458ef 100644 --- a/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature +++ b/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature @@ -1,4 +1,4 @@ -@api @issue-1328 +@issue-1328 Feature: a subfolder of a received share can be reshared As a user I want to re-share a resource diff --git a/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature b/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature index 867d12cba75..353f2d25488 100644 --- a/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature +++ b/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature @@ -1,4 +1,4 @@ -@api @issue-1328 +@issue-1328 Feature: sharing As a user I want to update share permissions diff --git a/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature b/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature index 9ae14d57fca..610e6c99c40 100644 --- a/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature +++ b/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature @@ -1,4 +1,4 @@ -@api @issue-1328 +@issue-1328 Feature: resharing a resource with an expiration date As a user I want to reshare resources with expiration date diff --git a/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature b/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature index 79a5255eea0..5a4e1334df5 100644 --- a/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature +++ b/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature @@ -1,4 +1,3 @@ -@api Feature: sharing As a user I want to update share permissions diff --git a/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature b/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature index ed2f02a4fea..261367a4999 100644 --- a/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature +++ b/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature @@ -1,4 +1,4 @@ -@api @issue-1289 @issue-1328 +@issue-1289 @issue-1328 Feature: updating shares to users and groups that have the same name As a user I want to update share permissions diff --git a/tests/acceptance/features/coreApiSharees/sharees.feature b/tests/acceptance/features/coreApiSharees/sharees.feature index a0bda6677d7..069bd6e22f9 100644 --- a/tests/acceptance/features/coreApiSharees/sharees.feature +++ b/tests/acceptance/features/coreApiSharees/sharees.feature @@ -1,4 +1,3 @@ -@api Feature: search sharees As a user I want to search sharees diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinDelete.feature b/tests/acceptance/features/coreApiTrashbin/trashbinDelete.feature index 4f76aea2bdc..65787767665 100644 --- a/tests/acceptance/features/coreApiTrashbin/trashbinDelete.feature +++ b/tests/acceptance/features/coreApiTrashbin/trashbinDelete.feature @@ -1,4 +1,4 @@ -@api @issue-1324 +@issue-1324 Feature: files and folders can be deleted from the trashbin As a user I want to delete files and folders from the trashbin diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature index 7653c0359ba..a475f967ba3 100644 --- a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature +++ b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature @@ -1,4 +1,4 @@ -@api @issue-1324 +@issue-1324 Feature: files and folders exist in the trashbin after being deleted As a user I want deleted files and folders to be available in the trashbin diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature b/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature index 4d38b8e7186..e038ed49111 100644 --- a/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature +++ b/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature @@ -1,4 +1,3 @@ -@api Feature: using trashbin together with sharing As a user I want the deletion of the resources that I shared to end up in my trashbin diff --git a/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature b/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature index da7f8a0719a..ab911fd2330 100644 --- a/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature +++ b/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature @@ -1,4 +1,4 @@ -@api @issue-1324 +@issue-1324 Feature: restore deleted files/folders As a user I would like to restore files/folders diff --git a/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature b/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature index a5cab861f61..448efc3f070 100644 --- a/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature +++ b/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature @@ -1,4 +1,4 @@ -@api @issue-2914 +@issue-2914 Feature: file versions remember the author of each version As a user I want to know the author of each version of a file diff --git a/tests/acceptance/features/coreApiVersions/fileVersions.feature b/tests/acceptance/features/coreApiVersions/fileVersions.feature index 3c237765834..40e5b48bf18 100644 --- a/tests/acceptance/features/coreApiVersions/fileVersions.feature +++ b/tests/acceptance/features/coreApiVersions/fileVersions.feature @@ -1,4 +1,3 @@ -@api Feature: dav-versions As a user I want the versions of files to be available diff --git a/tests/acceptance/features/coreApiWebdavDelete/deleteFile.feature b/tests/acceptance/features/coreApiWebdavDelete/deleteFile.feature index 8a8bb9cdaf4..2e8f14cc107 100644 --- a/tests/acceptance/features/coreApiWebdavDelete/deleteFile.feature +++ b/tests/acceptance/features/coreApiWebdavDelete/deleteFile.feature @@ -1,4 +1,3 @@ -@api Feature: delete file As a user I want to be able to delete files diff --git a/tests/acceptance/features/coreApiWebdavDelete/deleteFolder.feature b/tests/acceptance/features/coreApiWebdavDelete/deleteFolder.feature index 23557c4d997..f86ee25811f 100644 --- a/tests/acceptance/features/coreApiWebdavDelete/deleteFolder.feature +++ b/tests/acceptance/features/coreApiWebdavDelete/deleteFolder.feature @@ -1,4 +1,3 @@ -@api Feature: delete folder As a user I want to be able to delete folders diff --git a/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature b/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature index e308d960e08..8e7b90c270f 100644 --- a/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature +++ b/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature @@ -1,4 +1,3 @@ -@api Feature: delete folder contents As a user I want to be able to delete all files and folders in a folder diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation1/deleteFileFolder.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation1/deleteFileFolder.feature index 24bb7825afe..2e6ebcf4ea1 100644 --- a/tests/acceptance/features/coreApiWebdavEtagPropagation1/deleteFileFolder.feature +++ b/tests/acceptance/features/coreApiWebdavEtagPropagation1/deleteFileFolder.feature @@ -1,4 +1,3 @@ -@api Feature: propagation of etags when deleting a file or folder As a client app I want metadata (etags) of parent folders to change when a file or folder is deleted diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation1/moveFileFolder.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation1/moveFileFolder.feature index 8b211340ed5..c20b8060c5d 100644 --- a/tests/acceptance/features/coreApiWebdavEtagPropagation1/moveFileFolder.feature +++ b/tests/acceptance/features/coreApiWebdavEtagPropagation1/moveFileFolder.feature @@ -1,4 +1,3 @@ -@api Feature: propagation of etags when moving files or folders As a client app I want metadata (etags) of parent folder(s) to change when a file or folder is moved diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature index 1fab3b63767..f321e5c4bfb 100644 --- a/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature +++ b/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature @@ -1,4 +1,3 @@ -@api Feature: propagation of etags when copying files or folders As a client app I want metadata (etags) of parent folders to change when a file of folder is copied diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation2/createFolder.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation2/createFolder.feature index d18cdf6dea6..255c52da54f 100644 --- a/tests/acceptance/features/coreApiWebdavEtagPropagation2/createFolder.feature +++ b/tests/acceptance/features/coreApiWebdavEtagPropagation2/createFolder.feature @@ -1,4 +1,3 @@ -@api Feature: propagation of etags when creating folders As a client app I want metadata (etags) of parent folders to change when a sub-folder is created diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation2/restoreFromTrash.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation2/restoreFromTrash.feature index 376b0664d4d..0b078703a59 100644 --- a/tests/acceptance/features/coreApiWebdavEtagPropagation2/restoreFromTrash.feature +++ b/tests/acceptance/features/coreApiWebdavEtagPropagation2/restoreFromTrash.feature @@ -1,4 +1,3 @@ -@api Feature: propagation of etags when restoring a file or folder from trash As a client app I want metadata (etags) of parent folders to change when a file or folder is restored diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation2/restoreVersion.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation2/restoreVersion.feature index 0d9250b3573..04057361439 100644 --- a/tests/acceptance/features/coreApiWebdavEtagPropagation2/restoreVersion.feature +++ b/tests/acceptance/features/coreApiWebdavEtagPropagation2/restoreVersion.feature @@ -1,4 +1,4 @@ -@api @issue-4251 +@issue-4251 Feature: propagation of etags when restoring a version of a file As a client app I want metadata (etags) of parent folders to change when a file version is restored diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation2/upload.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation2/upload.feature index cff186945cf..c7cdf11876b 100644 --- a/tests/acceptance/features/coreApiWebdavEtagPropagation2/upload.feature +++ b/tests/acceptance/features/coreApiWebdavEtagPropagation2/upload.feature @@ -1,4 +1,3 @@ -@api Feature: propagation of etags when uploading data As a client app I want metadata (etags) of parent folders to change when a file is uploaded diff --git a/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature b/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature index 57b1dfdaf8e..5b91eda7d78 100644 --- a/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature +++ b/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature @@ -1,4 +1,4 @@ -@api @issue-1284 +@issue-1284 Feature: there can be only one exclusive lock on a resource As a user I want to lock a resource diff --git a/tests/acceptance/features/coreApiWebdavLocks/requestsWithToken.feature b/tests/acceptance/features/coreApiWebdavLocks/requestsWithToken.feature index bc71b80e9e0..eeea0474e3e 100644 --- a/tests/acceptance/features/coreApiWebdavLocks/requestsWithToken.feature +++ b/tests/acceptance/features/coreApiWebdavLocks/requestsWithToken.feature @@ -1,4 +1,4 @@ -@api @issue-1284 +@issue-1284 Feature: actions on a locked item are possible if the token is sent with the request As a user I want to share the lock token of a resource diff --git a/tests/acceptance/features/coreApiWebdavLocks2/independentLocks.feature b/tests/acceptance/features/coreApiWebdavLocks2/independentLocks.feature index ee5cad04649..81465caf0f8 100644 --- a/tests/acceptance/features/coreApiWebdavLocks2/independentLocks.feature +++ b/tests/acceptance/features/coreApiWebdavLocks2/independentLocks.feature @@ -1,4 +1,4 @@ -@api @issue-1284 +@issue-1284 Feature: independent locks - make sure all locks are independent and don't interact with other items that have the same name As a user I want to lock resources independently diff --git a/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature b/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature index 29784094bef..24ffadebef1 100644 --- a/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature +++ b/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature @@ -1,4 +1,4 @@ -@api @issue-1284 +@issue-1284 Feature: independent locks - make sure all locks are independent and don't interact with other items that have the same name As a user I want to independently lock resources shared with me diff --git a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature index f347be6d96a..f8c0d61ef73 100644 --- a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature +++ b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature @@ -1,4 +1,4 @@ -@api @issue-1284 +@issue-1284 Feature: Unlock locked items As a user I want to unlock the resources previously locked by myself diff --git a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature index e15c877a274..404aad7b221 100644 --- a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature +++ b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature @@ -1,4 +1,4 @@ -@api @issue-1284 +@issue-1284 Feature: UNLOCK locked items (sharing) As a user I want to unlock a shared resource that has been locked by me to be restricted diff --git a/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature b/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature index 05822e07814..d7760ef2694 100644 --- a/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature +++ b/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature @@ -1,4 +1,3 @@ -@api Feature: move (rename) folder As a user I want to be able to move and rename folders diff --git a/tests/acceptance/features/coreApiWebdavMove1/moveFolderToBlacklistedName.feature b/tests/acceptance/features/coreApiWebdavMove1/moveFolderToBlacklistedName.feature index 4650eebafd3..031df92e7d3 100644 --- a/tests/acceptance/features/coreApiWebdavMove1/moveFolderToBlacklistedName.feature +++ b/tests/acceptance/features/coreApiWebdavMove1/moveFolderToBlacklistedName.feature @@ -1,4 +1,3 @@ -@api Feature: users cannot move (rename) a folder to a blacklisted name As an administrator I want to be able to prevent users from moving (renaming) folders to specified names diff --git a/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature b/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature index b16c1cb92f1..2344ba408c0 100644 --- a/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature +++ b/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature @@ -1,4 +1,3 @@ -@api Feature: move (rename) file As a user I want to be able to move and rename files diff --git a/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature b/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature index 603971485f7..04b72ec8f99 100644 --- a/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature +++ b/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature @@ -1,4 +1,3 @@ -@api Feature: users cannot move (rename) a file to a blacklisted name As an administrator I want to be able to prevent users from moving (renaming) files to specified file names diff --git a/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature b/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature index b51474662d5..01febe88415 100644 --- a/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature +++ b/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature @@ -1,4 +1,3 @@ -@api Feature: move (rename) file As a user I want to be able to move and rename files diff --git a/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature b/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature index 2d2444e04a8..34b7be65f03 100644 --- a/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature +++ b/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature @@ -1,4 +1,3 @@ -@api Feature: download file As a user I want to be able to download files diff --git a/tests/acceptance/features/coreApiWebdavOperations/listFiles.feature b/tests/acceptance/features/coreApiWebdavOperations/listFiles.feature index 5344537f20a..9c71531d82d 100644 --- a/tests/acceptance/features/coreApiWebdavOperations/listFiles.feature +++ b/tests/acceptance/features/coreApiWebdavOperations/listFiles.feature @@ -1,4 +1,3 @@ -@api Feature: list files As a user I want to be able to list my files and folders (resources) diff --git a/tests/acceptance/features/coreApiWebdavOperations/propfind.feature b/tests/acceptance/features/coreApiWebdavOperations/propfind.feature index afd394d03fd..d870004829b 100644 --- a/tests/acceptance/features/coreApiWebdavOperations/propfind.feature +++ b/tests/acceptance/features/coreApiWebdavOperations/propfind.feature @@ -1,4 +1,3 @@ -@api Feature: PROPFIND As a user I want to retrieve all properties of a resource diff --git a/tests/acceptance/features/coreApiWebdavOperations/refuseAccess.feature b/tests/acceptance/features/coreApiWebdavOperations/refuseAccess.feature index 64127e0d03d..4ab673c13b9 100644 --- a/tests/acceptance/features/coreApiWebdavOperations/refuseAccess.feature +++ b/tests/acceptance/features/coreApiWebdavOperations/refuseAccess.feature @@ -1,4 +1,3 @@ -@api Feature: refuse access As an administrator I want to refuse access to unauthenticated and disabled users diff --git a/tests/acceptance/features/coreApiWebdavOperations/search.feature b/tests/acceptance/features/coreApiWebdavOperations/search.feature index c5ab132ae9b..3329cfc208e 100644 --- a/tests/acceptance/features/coreApiWebdavOperations/search.feature +++ b/tests/acceptance/features/coreApiWebdavOperations/search.feature @@ -1,4 +1,4 @@ -@api @issue-1330 +@issue-1330 Feature: Search As a user I would like to be able to search for files diff --git a/tests/acceptance/features/coreApiWebdavPreviews/previews.feature b/tests/acceptance/features/coreApiWebdavPreviews/previews.feature index 5dccdb552d9..80b3e5776bb 100644 --- a/tests/acceptance/features/coreApiWebdavPreviews/previews.feature +++ b/tests/acceptance/features/coreApiWebdavPreviews/previews.feature @@ -1,4 +1,4 @@ -@api @skipOnReva +@skipOnReva Feature: previews of files downloaded through the webdav API As a user I want to be able to download the preview of the files diff --git a/tests/acceptance/features/coreApiWebdavPreviews/previewsAutoAdustedSizing.feature b/tests/acceptance/features/coreApiWebdavPreviews/previewsAutoAdustedSizing.feature index 1ec74647ba6..a6566dee206 100644 --- a/tests/acceptance/features/coreApiWebdavPreviews/previewsAutoAdustedSizing.feature +++ b/tests/acceptance/features/coreApiWebdavPreviews/previewsAutoAdustedSizing.feature @@ -1,4 +1,4 @@ -@api @skipOnReva +@skipOnReva Feature: sizing of previews of files downloaded through the webdav API As a user I want the aspect-ratio of previews to be preserved even when I ask for an unusual preview size diff --git a/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature b/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature index 64cf4dbc5f0..93d5ca7a4be 100644 --- a/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature +++ b/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature @@ -1,4 +1,3 @@ -@api Feature: copy file As a user I want to be able to copy files diff --git a/tests/acceptance/features/coreApiWebdavProperties1/createFileFolder.feature b/tests/acceptance/features/coreApiWebdavProperties1/createFileFolder.feature index cdb070ae9b8..e8960b7cdc3 100644 --- a/tests/acceptance/features/coreApiWebdavProperties1/createFileFolder.feature +++ b/tests/acceptance/features/coreApiWebdavProperties1/createFileFolder.feature @@ -1,4 +1,3 @@ -@api Feature: create files and folder As a user I want to be able to create files and folders diff --git a/tests/acceptance/features/coreApiWebdavProperties1/createFileFolderWhenSharesExist.feature b/tests/acceptance/features/coreApiWebdavProperties1/createFileFolderWhenSharesExist.feature index 0a2b76a7f93..3649f7e19b9 100644 --- a/tests/acceptance/features/coreApiWebdavProperties1/createFileFolderWhenSharesExist.feature +++ b/tests/acceptance/features/coreApiWebdavProperties1/createFileFolderWhenSharesExist.feature @@ -1,4 +1,3 @@ -@api Feature: create file or folder named similar to Shares folder As a user I want to be able to create files and folders when the Shares folder exists diff --git a/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature b/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature index f23ac727614..fec64b8198c 100644 --- a/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature +++ b/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature @@ -1,4 +1,4 @@ -@api @issue-1313 @skipOnGraph +@issue-1313 @skipOnGraph Feature: get quota As a user I want to be able to find out my available storage quota diff --git a/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature b/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature index 72ccbeaee3c..8d7f2bcbd68 100644 --- a/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature +++ b/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature @@ -1,4 +1,3 @@ -@api Feature: set file properties As a user I want to be able to set meta-information about files diff --git a/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature b/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature index bdbdce1a6a1..a2c8eef1bde 100644 --- a/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature +++ b/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature @@ -1,4 +1,3 @@ -@api Feature: get file properties As a user I want to be able to get meta-information about files diff --git a/tests/acceptance/features/coreApiWebdavUpload1/uploadFile.feature b/tests/acceptance/features/coreApiWebdavUpload1/uploadFile.feature index 8bc50d55974..b5e4812010e 100644 --- a/tests/acceptance/features/coreApiWebdavUpload1/uploadFile.feature +++ b/tests/acceptance/features/coreApiWebdavUpload1/uploadFile.feature @@ -1,4 +1,3 @@ -@api Feature: upload file As a user I want to be able to upload files diff --git a/tests/acceptance/features/coreApiWebdavUpload2/uploadFileUsingOldChunking.feature b/tests/acceptance/features/coreApiWebdavUpload2/uploadFileUsingOldChunking.feature index 21b844e281f..e8a41eacb65 100644 --- a/tests/acceptance/features/coreApiWebdavUpload2/uploadFileUsingOldChunking.feature +++ b/tests/acceptance/features/coreApiWebdavUpload2/uploadFileUsingOldChunking.feature @@ -1,4 +1,4 @@ -@api @issue-1343 +@issue-1343 Feature: upload file using old chunking As a user I want to be able to upload "large" files in chunks diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature index 9919f155eda..75e4aefb5bc 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature @@ -1,4 +1,3 @@ -@api Feature: checksums As a user I want to upload resources with checksum diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/creationWithUploadExtension.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/creationWithUploadExtension.feature index 0b4a6cb0b16..6cc68292b62 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/creationWithUploadExtension.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/creationWithUploadExtension.feature @@ -1,4 +1,3 @@ -@api Feature: tests of the creation extension see https://tus.io/protocols/resumable-upload.html#creation-with-upload As a user I want to be able to include parts of upload while creating resources diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelCreationExtension.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelCreationExtension.feature index e06d85a952b..cf8a528980e 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelCreationExtension.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelCreationExtension.feature @@ -1,4 +1,3 @@ -@api Feature: low level tests of the creation extension see https://tus.io/protocols/resumable-upload.html#creation As a user I want to able to create resources diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelUpload.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelUpload.feature index 5dd7dc1adea..a7f198d4d90 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelUpload.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelUpload.feature @@ -1,4 +1,3 @@ -@api Feature: low level tests for upload of chunks As a user I want to be able to upload resources in chunks diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/optionsRequest.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/optionsRequest.feature index 8f036896fd7..1c70a36b082 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/optionsRequest.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/optionsRequest.feature @@ -1,4 +1,3 @@ -@api Feature: OPTIONS request As a user I want to check OPTIONS request diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature index e67376f8f42..894ebbc3ade 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature @@ -1,4 +1,3 @@ -@api Feature: upload file As a user I want to be able to upload files diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature index beea276efda..132cf6c957f 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature @@ -1,4 +1,3 @@ -@api Feature: upload file As a user I want the mtime of an uploaded file to be the creation date on upload source not the upload date diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature index f8ed60adfa0..ed1ff43a597 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature @@ -1,4 +1,3 @@ -@api Feature: upload file As a user I want the mtime of an uploaded file to be the creation date on upload source not the upload date diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToMoveFolder.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToMoveFolder.feature index 07545f48b0e..48671155172 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToMoveFolder.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToMoveFolder.feature @@ -1,4 +1,3 @@ -@api Feature: move folders As a user I want to be able to move and upload files/folders diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature index 974bb920d04..e3af40df57a 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature @@ -1,4 +1,3 @@ -@api Feature: upload file As a user I want to try uploading files to a nonexistent folder diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature index 7168d0bda28..9a9ad2ae0d1 100644 --- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature +++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature @@ -1,4 +1,3 @@ -@api Feature: upload file to shared folder As a user I want to upload files on a shared folder diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh index a896c6f8c86..d43f2aaaabb 100755 --- a/tests/acceptance/run.sh +++ b/tests/acceptance/run.sh @@ -201,7 +201,7 @@ function run_behat_tests() { fi echo "Using behat config '${BEHAT_YML}'" - ${BEHAT} ${COLORS_OPTION} ${STOP_OPTION} --strict ${STEP_THROUGH_OPTION} -c ${BEHAT_YML} -f pretty ${BEHAT_SUITE_OPTION} --tags ${BEHAT_FILTER_TAGS} ${BEHAT_FEATURE} -v 2>&1 | tee -a ${TEST_LOG_FILE} + ${BEHAT} ${COLORS_OPTION} ${STOP_OPTION} --strict ${STEP_THROUGH_OPTION} -c ${BEHAT_YML} -f pretty ${BEHAT_SUITE_OPTION} ${BEHAT_FEATURE} -v 2>&1 | tee -a ${TEST_LOG_FILE} BEHAT_EXIT_STATUS=${PIPESTATUS[0]} @@ -368,7 +368,7 @@ function run_behat_tests() { # Report them in a dry-run so they can be seen # Big red error output is displayed if there are no matching scenarios - send it to null DRY_RUN_FILE=$(mktemp) - SKIP_TAGS="${TEST_TYPE_TAG}&&@skip" + SKIP_TAGS="@skip" ${BEHAT} --dry-run {$COLORS_OPTION} -c ${BEHAT_YML} -f pretty ${BEHAT_SUITE_OPTION} --tags "${SKIP_TAGS}" ${BEHAT_FEATURE} 1>${DRY_RUN_FILE} 2>/dev/null if grep -q -m 1 'No scenarios' "${DRY_RUN_FILE}" then @@ -477,22 +477,8 @@ else fi fi -TEST_TYPE_TAG="@api" TEST_TYPE_TEXT="API" -# Always have "@api" -if [ -z "${BEHAT_FILTER_TAGS}" ] -then - BEHAT_FILTER_TAGS="${TEST_TYPE_TAG}" -else - # Be nice to the caller - # Remove any extra "&&" at the end of their tags list - BEHAT_FILTER_TAGS="${BEHAT_FILTER_TAGS%&&}" - # Remove any extra "&&" at the beginning of their tags list - BEHAT_FILTER_TAGS="${BEHAT_FILTER_TAGS#&&}" - BEHAT_FILTER_TAGS="${BEHAT_FILTER_TAGS}&&${TEST_TYPE_TAG}" -fi - # EMAIL_HOST defines where the system-under-test can find the email server (inbucket) # for sending email. if [ -z "${EMAIL_HOST}" ] @@ -517,9 +503,12 @@ fi # If the caller did not mention specific tags, skip the skipped tests by default if [ "${BEHAT_TAGS_OPTION_FOUND}" = false ] then + if [ -z "${BEHAT_FILTER_TAGS}" ] + then + BEHAT_FILTER_TAGS="@skip" # If the caller has already specified specifically to run "@skip" scenarios # then do not append "not @skip" - if [[ ! ${BEHAT_FILTER_TAGS} =~ "&&@skip&&" ]] + elif [[ ! ${BEHAT_FILTER_TAGS} =~ "&&@skip&&" ]] then BEHAT_FILTER_TAGS="${BEHAT_FILTER_TAGS}&&~@skip" fi diff --git a/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature b/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature index 829a6505dea..2da65fb7d6c 100644 --- a/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature +++ b/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature @@ -1,4 +1,3 @@ -@api Feature: sharing files and folders As a user I want to share files/folders with other users diff --git a/tests/parallelDeployAcceptance/features/apiWebdavOperations/downloadFile.feature b/tests/parallelDeployAcceptance/features/apiWebdavOperations/downloadFile.feature index 763ac39cea2..ed9034d6c82 100644 --- a/tests/parallelDeployAcceptance/features/apiWebdavOperations/downloadFile.feature +++ b/tests/parallelDeployAcceptance/features/apiWebdavOperations/downloadFile.feature @@ -1,4 +1,3 @@ -@api Feature: download file As a user I want to be able to download files