diff --git a/.drone.env b/.drone.env index e72d96658e2..c37e546931f 100644 --- a/.drone.env +++ b/.drone.env @@ -1,3 +1,3 @@ # The version of OCIS to use in pipelines that test against OCIS -OCIS_COMMITID=bac2256c5f8f9f2af3391c561bfa992bd3df6150 -OCIS_BRANCH=fix-denials-graph +OCIS_COMMITID=0fa52f26e9a9f81ffaab1c1922f16f3c43d75d2f +OCIS_BRANCH=master diff --git a/tests/e2e/cucumber/features/shares/denyShareAccess.feature b/tests/e2e/cucumber/features/shares/denyShareAccess.feature index 088ebf0203a..169c0e9dc17 100644 --- a/tests/e2e/cucumber/features/shares/denyShareAccess.feature +++ b/tests/e2e/cucumber/features/shares/denyShareAccess.feature @@ -18,8 +18,8 @@ Feature: deny share access And "Alice" opens folder "folder_to_shared" # deny access When "Alice" shares the following resource using the sidebar panel - | resource | recipient | type | role | resourceType | - | folder_to_deny | Brian | user | Cannot access. | folder | + | resource | recipient | type | role | resourceType | + | folder_to_deny | Brian | user | Cannot access | folder | And "Brian" logs in And "Brian" opens the "files" app And "Brian" navigates to the shared with me page diff --git a/tests/e2e/cucumber/features/spaces/denySpaceAccess.feature b/tests/e2e/cucumber/features/spaces/denySpaceAccess.feature index 3f26070a3f5..68058309e7a 100644 --- a/tests/e2e/cucumber/features/spaces/denySpaceAccess.feature +++ b/tests/e2e/cucumber/features/spaces/denySpaceAccess.feature @@ -23,8 +23,8 @@ Feature: deny space access When "Alice" navigates to the project space "sales" # deny access When "Alice" shares the following resource using the sidebar panel - | resource | recipient | type | role | resourceType | - | f1 | Brian | user | Cannot access. | folder | + | resource | recipient | type | role | resourceType | + | f1 | Brian | user | Cannot access | folder | And "Brian" logs in And "Brian" navigates to the project space "sales" Then following resources should not be displayed in the files list for user "Brian" diff --git a/tests/e2e/support/api/share/share.ts b/tests/e2e/support/api/share/share.ts index da9854cd48d..7e9501fa512 100644 --- a/tests/e2e/support/api/share/share.ts +++ b/tests/e2e/support/api/share/share.ts @@ -27,7 +27,7 @@ export const shareRoles: Readonly<{ 'Can edit': string 'Can view': string 'Secret File Drop': string - 'Cannot access.': string + 'Cannot access': string }> = { 'Invited people': 'internal', 'Can upload': 'contributor', @@ -35,7 +35,7 @@ export const shareRoles: Readonly<{ 'Can edit': 'editor', 'Can view': 'viewer', 'Secret File Drop': 'uploader', - 'Cannot access.': 'denied' + 'Cannot access': 'denied' } as const export const linkShareRoles: Readonly<{