From a164ab84d6ae889bcb89691a2a00e4571d68d64f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Thu, 20 Mar 2025 08:06:38 +0100 Subject: [PATCH] test: Check unique display name if provided in the response MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Calviño Sánchez --- .../integration/features/bootstrap/Sharing.php | 8 +++++++- .../openldap-uid-username.feature | 2 +- .../sharees_features/sharees.feature | 18 +++++++++--------- .../sharees_provisioningapiv2.feature | 16 ++++++++-------- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/build/integration/features/bootstrap/Sharing.php b/build/integration/features/bootstrap/Sharing.php index 0cc490ff110..be04c85f52d 100644 --- a/build/integration/features/bootstrap/Sharing.php +++ b/build/integration/features/bootstrap/Sharing.php @@ -734,7 +734,13 @@ trait Sharing { $sharees = []; foreach ($elements[$shareeType] as $element) { - $sharees[] = [$element['label'], $element['value']['shareType'], $element['value']['shareWith']]; + $sharee = [$element['label'], $element['value']['shareType'], $element['value']['shareWith']]; + + if (array_key_exists('shareWithDisplayNameUnique', $element)) { + $sharee[] = $element['shareWithDisplayNameUnique']; + } + + $sharees[] = $sharee; } return $sharees; } diff --git a/build/integration/openldap_features/openldap-uid-username.feature b/build/integration/openldap_features/openldap-uid-username.feature index bee4098972b..02336b05128 100644 --- a/build/integration/openldap_features/openldap-uid-username.feature +++ b/build/integration/openldap_features/openldap-uid-username.feature @@ -161,5 +161,5 @@ Feature: LDAP And the HTTP status code should be "200" And "exact users" sharees returned is empty And "users" sharees returned are - | Elisa | 0 | elisa | + | Elisa | 0 | elisa | elisa@nextcloud.ci | And "exact groups" sharees returned is empty diff --git a/build/integration/sharees_features/sharees.feature b/build/integration/sharees_features/sharees.feature index 9480ef997ae..d8e629532d0 100644 --- a/build/integration/sharees_features/sharees.feature +++ b/build/integration/sharees_features/sharees.feature @@ -18,7 +18,7 @@ Feature: sharees And the HTTP status code should be "200" And "exact users" sharees returned is empty And "users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "exact groups" sharees returned is empty And "groups" sharees returned are | ShareeGroup | 1 | ShareeGroup | @@ -34,7 +34,7 @@ Feature: sharees And the HTTP status code should be "200" And "exact users" sharees returned is empty And "users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "exact groups" sharees returned is empty And "groups" sharees returned are | ShareeGroup | 1 | ShareeGroup | @@ -68,7 +68,7 @@ Feature: sharees And the HTTP status code should be "200" And "exact users" sharees returned is empty And "users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "exact groups" sharees returned is empty And "groups" sharees returned are | ShareeGroup | 1 | ShareeGroup | @@ -85,7 +85,7 @@ Feature: sharees Then the OCS status code should be "100" And the HTTP status code should be "200" And "exact users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "users" sharees returned is empty And "exact groups" sharees returned is empty And "groups" sharees returned is empty @@ -131,7 +131,7 @@ Feature: sharees Then the OCS status code should be "100" And the HTTP status code should be "200" And "exact users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "users" sharees returned is empty And "exact groups" sharees returned is empty And "groups" sharees returned is empty @@ -162,7 +162,7 @@ Feature: sharees Then the OCS status code should be "100" And the HTTP status code should be "200" Then "exact users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | Then "users" sharees returned is empty Then "exact groups" sharees returned is empty Then "groups" sharees returned is empty @@ -177,7 +177,7 @@ Feature: sharees Then the OCS status code should be "100" And the HTTP status code should be "200" Then "exact users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | Then "users" sharees returned is empty Then "exact groups" sharees returned is empty Then "groups" sharees returned is empty @@ -207,7 +207,7 @@ Feature: sharees Then the OCS status code should be "100" And the HTTP status code should be "200" Then "exact users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | Then "users" sharees returned is empty Then "exact groups" sharees returned is empty Then "groups" sharees returned is empty @@ -254,7 +254,7 @@ Feature: sharees And the HTTP status code should be "200" And "exact users" sharees returned is empty And "users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "exact groups" sharees returned is empty And "groups" sharees returned is empty And "exact remotes" sharees returned is empty diff --git a/build/integration/sharees_features/sharees_provisioningapiv2.feature b/build/integration/sharees_features/sharees_provisioningapiv2.feature index b27bb7a4f21..c5a42f7b6a8 100644 --- a/build/integration/sharees_features/sharees_provisioningapiv2.feature +++ b/build/integration/sharees_features/sharees_provisioningapiv2.feature @@ -18,7 +18,7 @@ Feature: sharees_provisioningapiv2 And the HTTP status code should be "200" And "exact users" sharees returned is empty And "users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "exact groups" sharees returned is empty And "groups" sharees returned are | ShareeGroup | 1 | ShareeGroup | @@ -34,7 +34,7 @@ Feature: sharees_provisioningapiv2 And the HTTP status code should be "200" And "exact users" sharees returned is empty And "users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "exact groups" sharees returned is empty And "groups" sharees returned are | ShareeGroup | 1 | ShareeGroup | @@ -68,7 +68,7 @@ Feature: sharees_provisioningapiv2 And the HTTP status code should be "200" And "exact users" sharees returned is empty And "users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "exact groups" sharees returned is empty And "groups" sharees returned are | ShareeGroup | 1 | ShareeGroup | @@ -114,7 +114,7 @@ Feature: sharees_provisioningapiv2 Then the OCS status code should be "200" And the HTTP status code should be "200" And "exact users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "users" sharees returned is empty And "exact groups" sharees returned is empty And "groups" sharees returned is empty @@ -145,7 +145,7 @@ Feature: sharees_provisioningapiv2 Then the OCS status code should be "200" And the HTTP status code should be "200" Then "exact users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | Then "users" sharees returned is empty Then "exact groups" sharees returned is empty Then "groups" sharees returned is empty @@ -160,7 +160,7 @@ Feature: sharees_provisioningapiv2 Then the OCS status code should be "200" And the HTTP status code should be "200" Then "exact users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | Then "users" sharees returned is empty Then "exact groups" sharees returned is empty Then "groups" sharees returned is empty @@ -190,7 +190,7 @@ Feature: sharees_provisioningapiv2 Then the OCS status code should be "200" And the HTTP status code should be "200" Then "exact users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | Then "users" sharees returned is empty Then "exact groups" sharees returned is empty Then "groups" sharees returned is empty @@ -237,7 +237,7 @@ Feature: sharees_provisioningapiv2 And the HTTP status code should be "200" And "exact users" sharees returned is empty And "users" sharees returned are - | Sharee1 | 0 | Sharee1 | + | Sharee1 | 0 | Sharee1 | Sharee1 | And "exact groups" sharees returned is empty And "groups" sharees returned is empty And "exact remotes" sharees returned is empty