diff --git a/.drone.env b/.drone.env index ac61697f4b5..55cb162bda9 100644 --- a/.drone.env +++ b/.drone.env @@ -1,7 +1,7 @@ # The version of OCIS to use in pipelines that test against OCIS -OCIS_COMMITID=202c6ce4faa2188dbe9c2064b0bd4ef376fa6c78 +OCIS_COMMITID=279c73fbb5c8d8345bad8914cb733e91b7a80d2e OCIS_BRANCH=master # The test runner source for API tests -CORE_COMMITID=510f5c79c0233e2ac716a033a5377aa63a5fcb91 +CORE_COMMITID=7e5c455616a2303fa823d6a0555cb2a4a058866c CORE_BRANCH=master diff --git a/.drone.star b/.drone.star index 53174b4756f..c6c2b7bf2a5 100644 --- a/.drone.star +++ b/.drone.star @@ -1823,6 +1823,7 @@ def setupServerAndAppsForIntegrationApp(logLevel): "php occ config:system:set enable_previews --type=boolean --value=false", 'php occ config:system:set web.baseUrl --value="http://owncloud/index.php/apps/web"', "php occ config:system:set sharing.federation.allowHttpFallback --value=true --type=bool", + "php occ config:system:set web.rewriteLinks --value=true", ], }] @@ -1842,6 +1843,7 @@ def setupServerAndApp(logLevel): "php occ config:system:set skeletondirectory --value=/var/www/owncloud/server/apps/testing/data/webUISkeleton", 'php occ config:system:set web.baseUrl --value="http://web"', "php occ config:system:set sharing.federation.allowHttpFallback --value=true --type=bool", + "php occ config:system:set web.rewriteLinks --value=true", ], }] diff --git a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md index f06a82e810a..37fd180b356 100644 --- a/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md +++ b/tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md @@ -155,10 +155,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUIRestrictSharing/restrictSharing.feature:40](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRestrictSharing/restrictSharing.feature#L40) - [webUIRestrictSharing/restrictSharing.feature:56](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRestrictSharing/restrictSharing.feature#L56) -### [Accept and decline pending share does not work in UI](https://github.com/owncloud/ocis/issues/1950) -- [webUISharingAcceptShares/acceptShares.feature:16](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L16) -- [webUISharingAcceptShares/acceptShares.feature:235](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L235) - ### [First request with a recreated user returns a 401 error](https://github.com/owncloud/ocis/issues/1675) - [webUISharingAutocompletion/shareAutocompletion.feature:56](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L56) - [webUISharingAutocompletion/shareAutocompletion.feature:66](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAutocompletion/shareAutocompletion.feature#L66) @@ -236,8 +232,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:361](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L361) - [webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:370](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature#L370) -### [[OCIS] declining a received share gives 500 error even if the share is declined](https://github.com/owncloud/product/issues/276) -- [webUISharingAcceptShares/acceptShares.feature:135](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L135) ### [Cannot delete a received share](https://github.com/owncloud/ocis/issues/714) - [webUISharingAcceptShares/acceptShares.feature:203](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L203) @@ -408,8 +402,6 @@ Other free text and markdown formatting can be used elsewhere in the document if - [webUIFilesList/sort.feature:51](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesList/sort.feature#L51) - [webUIFilesList/sort.feature:72](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesList/sort.feature#L72) -- [webUISharingAcceptShares/acceptShares.feature:100](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L100) -- [webUISharingAcceptShares/acceptShares.feature:116](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingAcceptShares/acceptShares.feature#L116) ### [Comments in sidebar] (https://github.com/owncloud/web/issues/1158) - [webUIComments/comments.feature:24](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIComments/comments.feature#L24) diff --git a/tests/acceptance/helpers/sharingHelper.js b/tests/acceptance/helpers/sharingHelper.js index a479cc4511e..dfe9fd6fbaa 100644 --- a/tests/acceptance/helpers/sharingHelper.js +++ b/tests/acceptance/helpers/sharingHelper.js @@ -349,27 +349,11 @@ module.exports = { for (const element of elementsToAccept) { const shareID = element.id const apiURL = `apps/files_sharing/api/v1/shares/pending/${shareID}` - return httpHelper - .postOCS(apiURL, user) - .then(res => { - res = httpHelper.checkStatus(res, 'The response status is not the expected value') - if (client.globals.ocis) return res.text() - return res.json() - }) - .then(res => { - if (client.globals.ocis) { - if (res !== '') { - throw new Error(` - This is a good error, seems like a bug in ocis has been fixed, - just fire up your text editor and remove this line, - dont forget to keep your fingers crossed in the meantime. - More on https://github.com/owncloud/product/issues/207 - `) - } - return - } - httpHelper.checkOCSStatus(res, 'Could not perform the accept action') - }) + return httpHelper.postOCS(apiURL, user).then(res => { + res = httpHelper.checkStatus(res, 'The response status is not the expected value') + if (client.globals.ocis) return res.text() + return res.json() + }) } },