Skip to content

Commit a164ab8

Browse files
danxuliudanxuliu
committed
test: Check unique display name if provided in the response
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
1 parent 3d7b3ad commit a164ab8

File tree

4 files changed

+25
-19
lines changed

4 files changed

+25
-19
lines changed

‎build/integration/features/bootstrap/Sharing.php‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,13 @@ public function getArrayOfShareesResponded(ResponseInterface $response, $shareeT
734734

735735
$sharees = [];
736736
foreach ($elements[$shareeType] as $element) {
737-
$sharees[] = [$element['label'], $element['value']['shareType'], $element['value']['shareWith']];
737+
$sharee = [$element['label'], $element['value']['shareType'], $element['value']['shareWith']];
738+
739+
if (array_key_exists('shareWithDisplayNameUnique', $element)) {
740+
$sharee[] = $element['shareWithDisplayNameUnique'];
741+
}
742+
743+
$sharees[] = $sharee;
738744
}
739745
return $sharees;
740746
}

‎build/integration/openldap_features/openldap-uid-username.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,5 +161,5 @@ Feature: LDAP
161161
And the HTTP status code should be "200"
162162
And "exact users" sharees returned is empty
163163
And "users" sharees returned are
164-
| Elisa | 0 | elisa |
164+
| Elisa | 0 | elisa | elisa@nextcloud.ci |
165165
And "exact groups" sharees returned is empty

‎build/integration/sharees_features/sharees.feature‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Feature: sharees
1818
And the HTTP status code should be "200"
1919
And "exact users" sharees returned is empty
2020
And "users" sharees returned are
21-
| Sharee1 | 0 | Sharee1 |
21+
| Sharee1 | 0 | Sharee1 | Sharee1 |
2222
And "exact groups" sharees returned is empty
2323
And "groups" sharees returned are
2424
| ShareeGroup | 1 | ShareeGroup |
@@ -34,7 +34,7 @@ Feature: sharees
3434
And the HTTP status code should be "200"
3535
And "exact users" sharees returned is empty
3636
And "users" sharees returned are
37-
| Sharee1 | 0 | Sharee1 |
37+
| Sharee1 | 0 | Sharee1 | Sharee1 |
3838
And "exact groups" sharees returned is empty
3939
And "groups" sharees returned are
4040
| ShareeGroup | 1 | ShareeGroup |
@@ -68,7 +68,7 @@ Feature: sharees
6868
And the HTTP status code should be "200"
6969
And "exact users" sharees returned is empty
7070
And "users" sharees returned are
71-
| Sharee1 | 0 | Sharee1 |
71+
| Sharee1 | 0 | Sharee1 | Sharee1 |
7272
And "exact groups" sharees returned is empty
7373
And "groups" sharees returned are
7474
| ShareeGroup | 1 | ShareeGroup |
@@ -85,7 +85,7 @@ Feature: sharees
8585
Then the OCS status code should be "100"
8686
And the HTTP status code should be "200"
8787
And "exact users" sharees returned are
88-
| Sharee1 | 0 | Sharee1 |
88+
| Sharee1 | 0 | Sharee1 | Sharee1 |
8989
And "users" sharees returned is empty
9090
And "exact groups" sharees returned is empty
9191
And "groups" sharees returned is empty
@@ -131,7 +131,7 @@ Feature: sharees
131131
Then the OCS status code should be "100"
132132
And the HTTP status code should be "200"
133133
And "exact users" sharees returned are
134-
| Sharee1 | 0 | Sharee1 |
134+
| Sharee1 | 0 | Sharee1 | Sharee1 |
135135
And "users" sharees returned is empty
136136
And "exact groups" sharees returned is empty
137137
And "groups" sharees returned is empty
@@ -162,7 +162,7 @@ Feature: sharees
162162
Then the OCS status code should be "100"
163163
And the HTTP status code should be "200"
164164
Then "exact users" sharees returned are
165-
| Sharee1 | 0 | Sharee1 |
165+
| Sharee1 | 0 | Sharee1 | Sharee1 |
166166
Then "users" sharees returned is empty
167167
Then "exact groups" sharees returned is empty
168168
Then "groups" sharees returned is empty
@@ -177,7 +177,7 @@ Feature: sharees
177177
Then the OCS status code should be "100"
178178
And the HTTP status code should be "200"
179179
Then "exact users" sharees returned are
180-
| Sharee1 | 0 | Sharee1 |
180+
| Sharee1 | 0 | Sharee1 | Sharee1 |
181181
Then "users" sharees returned is empty
182182
Then "exact groups" sharees returned is empty
183183
Then "groups" sharees returned is empty
@@ -207,7 +207,7 @@ Feature: sharees
207207
Then the OCS status code should be "100"
208208
And the HTTP status code should be "200"
209209
Then "exact users" sharees returned are
210-
| Sharee1 | 0 | Sharee1 |
210+
| Sharee1 | 0 | Sharee1 | Sharee1 |
211211
Then "users" sharees returned is empty
212212
Then "exact groups" sharees returned is empty
213213
Then "groups" sharees returned is empty
@@ -254,7 +254,7 @@ Feature: sharees
254254
And the HTTP status code should be "200"
255255
And "exact users" sharees returned is empty
256256
And "users" sharees returned are
257-
| Sharee1 | 0 | Sharee1 |
257+
| Sharee1 | 0 | Sharee1 | Sharee1 |
258258
And "exact groups" sharees returned is empty
259259
And "groups" sharees returned is empty
260260
And "exact remotes" sharees returned is empty

‎build/integration/sharees_features/sharees_provisioningapiv2.feature‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Feature: sharees_provisioningapiv2
1818
And the HTTP status code should be "200"
1919
And "exact users" sharees returned is empty
2020
And "users" sharees returned are
21-
| Sharee1 | 0 | Sharee1 |
21+
| Sharee1 | 0 | Sharee1 | Sharee1 |
2222
And "exact groups" sharees returned is empty
2323
And "groups" sharees returned are
2424
| ShareeGroup | 1 | ShareeGroup |
@@ -34,7 +34,7 @@ Feature: sharees_provisioningapiv2
3434
And the HTTP status code should be "200"
3535
And "exact users" sharees returned is empty
3636
And "users" sharees returned are
37-
| Sharee1 | 0 | Sharee1 |
37+
| Sharee1 | 0 | Sharee1 | Sharee1 |
3838
And "exact groups" sharees returned is empty
3939
And "groups" sharees returned are
4040
| ShareeGroup | 1 | ShareeGroup |
@@ -68,7 +68,7 @@ Feature: sharees_provisioningapiv2
6868
And the HTTP status code should be "200"
6969
And "exact users" sharees returned is empty
7070
And "users" sharees returned are
71-
| Sharee1 | 0 | Sharee1 |
71+
| Sharee1 | 0 | Sharee1 | Sharee1 |
7272
And "exact groups" sharees returned is empty
7373
And "groups" sharees returned are
7474
| ShareeGroup | 1 | ShareeGroup |
@@ -114,7 +114,7 @@ Feature: sharees_provisioningapiv2
114114
Then the OCS status code should be "200"
115115
And the HTTP status code should be "200"
116116
And "exact users" sharees returned are
117-
| Sharee1 | 0 | Sharee1 |
117+
| Sharee1 | 0 | Sharee1 | Sharee1 |
118118
And "users" sharees returned is empty
119119
And "exact groups" sharees returned is empty
120120
And "groups" sharees returned is empty
@@ -145,7 +145,7 @@ Feature: sharees_provisioningapiv2
145145
Then the OCS status code should be "200"
146146
And the HTTP status code should be "200"
147147
Then "exact users" sharees returned are
148-
| Sharee1 | 0 | Sharee1 |
148+
| Sharee1 | 0 | Sharee1 | Sharee1 |
149149
Then "users" sharees returned is empty
150150
Then "exact groups" sharees returned is empty
151151
Then "groups" sharees returned is empty
@@ -160,7 +160,7 @@ Feature: sharees_provisioningapiv2
160160
Then the OCS status code should be "200"
161161
And the HTTP status code should be "200"
162162
Then "exact users" sharees returned are
163-
| Sharee1 | 0 | Sharee1 |
163+
| Sharee1 | 0 | Sharee1 | Sharee1 |
164164
Then "users" sharees returned is empty
165165
Then "exact groups" sharees returned is empty
166166
Then "groups" sharees returned is empty
@@ -190,7 +190,7 @@ Feature: sharees_provisioningapiv2
190190
Then the OCS status code should be "200"
191191
And the HTTP status code should be "200"
192192
Then "exact users" sharees returned are
193-
| Sharee1 | 0 | Sharee1 |
193+
| Sharee1 | 0 | Sharee1 | Sharee1 |
194194
Then "users" sharees returned is empty
195195
Then "exact groups" sharees returned is empty
196196
Then "groups" sharees returned is empty
@@ -237,7 +237,7 @@ Feature: sharees_provisioningapiv2
237237
And the HTTP status code should be "200"
238238
And "exact users" sharees returned is empty
239239
And "users" sharees returned are
240-
| Sharee1 | 0 | Sharee1 |
240+
| Sharee1 | 0 | Sharee1 | Sharee1 |
241241
And "exact groups" sharees returned is empty
242242
And "groups" sharees returned is empty
243243
And "exact remotes" sharees returned is empty

0 commit comments

Comments
 (0)