Skip to content

Commit

Permalink
Bump core and ocis commit id, add to expected to fail file
Browse files Browse the repository at this point in the history
  • Loading branch information
@SwikritiT
SwikritiT committed Jun 3, 2021
1 parent 72429e7 commit 6d506bd
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .drone.env
View file
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions .drone.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
}]

Expand All @@ -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",
],
}]

Expand Down
65 changes: 57 additions & 8 deletions tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -430,3 +422,60 @@ Other free text and markdown formatting can be used elsewhere in the document if
### [Trying to create a (public) link share of the Shares folder throws an error](https://github.com/owncloud/web/issues/5152)
- [webUISharingInternalUsers/shareWithUsers.feature:364](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L364)
- [webUISharingPublicBasic/publicLinkCreate.feature:195](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature#L195)

### [OCIS Response is empty when accepting a share](https://github.com/owncloud/product/issues/207)
- [webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature:68](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature#L68)
- [webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature:86](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature#L86)
- [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:98](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L98)
- [webUISharingInternalGroups/shareWithGroups.feature:245](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L245)
- [webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature#L50)
- [webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature:42](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsSharingIndicator/shareWithGroups.feature#L42)
- [webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature:107](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroupsEdgeCases/shareWithGroupsEdgeCases.feature#L107)
- [webUISharingInternalUsers/shareWithUsers.feature:112](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L112)
- [webUISharingInternalUsers/shareWithUsers.feature:130](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L130)
- [webUISharingInternalUsers/shareWithUsers.feature:321](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L321)
- [webUISharingInternalUsers/shareWithUsers.feature:82](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L82)
- [webUISharingInternalUsers/shareWithUsers.feature:216](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L216)
- [webUISharingInternalUsers/shareWithUsers.feature:330](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L330)
- [webUISharingInternalUsers/shareWithUsers.feature:318](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L318)
- [webUISharingInternalUsers/shareWithUsers.feature:319](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L319)
- [webUISharingInternalUsers/shareWithUsers.feature:317](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L317)
- [webUISharingInternalGroups/shareWithGroups.feature:100](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L317)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:17](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L17)
- [webUISharingInternalUsersCollaborator/shareWithUsers.feature:51](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersCollaborator/shareWithUsers.feature#L51)
- [webUISharingInternalUsersCollaborator/shareWithUsers.feature:41](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersCollaborator/shareWithUsers.feature#L41)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:70](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L70)
- [webUISharingInternalUsersSharingIndicator/shareWithUsers.feature:139](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersSharingIndicator/shareWithUsers.feature#L139)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:92](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L92)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:176](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L176)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:103](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L103)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:81](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L81)
- [webUISharingInternalUsersSharingIndicator/shareWithUsers.feature:58](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersSharingIndicator/shareWithUsers.feature#L58)
- [webUISharingInternalUsersSharingIndicator/shareWithUsers.feature:80](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersSharingIndicator/shareWithUsers.feature#L80)
- [webUISharingInternalUsersCollaborator/shareWithUsers.feature:65](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersCollaborator/shareWithUsers.feature#L65)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:31](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L31)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:136](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L136)
- [webUISharingPermissionsUsers/sharePermissionsUsers.feature:179](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L179)
- [webUISharingPermissionsUsers/sharePermissionsUsers.feature:170](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L170)
- [webUISharingPermissionsUsers/sharePermissionsUsers.feature:244](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L244)
- [webUISharingPermissionsUsers/sharePermissionsUsers.feature:126](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L126)
- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:61](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L61)
- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:62](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L62)
- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L63)
- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:67](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L67)
- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:68](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L68)
- [webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature:69](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionsGroups/shareAdvancePermissionsGroup.feature#L69)
- [webUIResharing1/reshareUsers.feature:124](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L124)
- [webUIResharing1/reshareUsers.feature:91](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L91)
- [webUIResharing1/reshareUsers.feature:134](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L134)
- [webUIResharing1/reshareUsers.feature:198](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L198)
- [webUIResharing1/reshareUsers.feature:107](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L107)
- [webUIResharing1/reshareUsers.feature:115](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L115)
- [webUIResharing1/reshareUsers.feature:214](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L214)
- [webUIResharing2/reshareUsers.feature:41](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L41)
- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:60](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L60)
- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:61](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L61)
- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:62](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L62)
- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:63](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L63)
- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:64](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L64)
- [webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature:65](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingFolderAdvancedPermissionMultipleUsers/sharedFolderWithMultipleUsersAdvancedPermissions.feature#L65)
11 changes: 0 additions & 11 deletions tests/acceptance/helpers/sharingHelper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,17 +357,6 @@ module.exports = {
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')
})
}
Expand Down

0 comments on commit 6d506bd

Please sign in to comment.