Skip to content

Commit 6866f5a

Browse files
authored
Merge pull request #10737 from owncloud/tests/update-issue-tag
[tests-only] update issue tags
2 parents 154feaa + ad2e310 commit 6866f5a

File tree

5 files changed

+485
-151
lines changed

5 files changed

+485
-151
lines changed

tests/acceptance/TestHelpers/GraphHelper.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,14 @@ public static function getEtagRegex(): string {
126126
* @return string
127127
*/
128128
public static function getFederatedUserRegex(): string {
129-
return '^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})$';
129+
return '(?=(.{4})*$)[A-Za-z0-9+/]*={0,2}$';
130+
}
131+
132+
/**
133+
* @return string
134+
*/
135+
public static function getFederatedFileIdRegex(): string {
136+
return self::getSpaceIdRegex() . '!(?=(.{4})*$)[A-Za-z0-9+/]*={0,2}';
130137
}
131138

132139
/**

tests/acceptance/bootstrap/FeatureContext.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2339,6 +2339,14 @@ public function substituteInLineCodes(
23392339
],
23402340
"parameter" => []
23412341
],
2342+
[
2343+
"code" => "%federated_file_id_pattern%",
2344+
"function" => [
2345+
__NAMESPACE__ . '\TestHelpers\GraphHelper',
2346+
"getFederatedFileIdRegex"
2347+
],
2348+
"parameter" => []
2349+
],
23422350
[
23432351
"code" => "%group_id_pattern%",
23442352
"function" => [

tests/acceptance/features/apiOcm/searchFederationUsers.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Feature: search federation users
1212
And using server "REMOTE"
1313
And user "Brian" has been created with default attributes
1414

15-
15+
@issue-9813
1616
Scenario: users search for federation users by display name
1717
Given using server "LOCAL"
1818
And "Alice" has created the federation share invitation
@@ -142,7 +142,7 @@ Feature: search federation users
142142
}
143143
"""
144144

145-
145+
@issue-9813
146146
Scenario: user search for federation users by email
147147
Given using server "LOCAL"
148148
And "Alice" has created the federation share invitation

0 commit comments

Comments
 (0)