Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[tests-only] update issue tags #10737

Merged
merged 3 commits into from
Dec 10, 2024
Merged

[tests-only] update issue tags #10737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66f4204
test: update issue tags
saw-jan Dec 3, 2024
c6859cc
test: check etag
saw-jan Dec 4, 2024
ad2e310
tests: more checks
saw-jan Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion tests/acceptance/TestHelpers/GraphHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,14 @@ public static function getEtagRegex(): string {
* @return string
*/
public static function getFederatedUserRegex(): string {
return '^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})$';
return '(?=(.{4})*$)[A-Za-z0-9+/]*={0,2}$';
}

/**
* @return string
*/
public static function getFederatedFileIdRegex(): string {
return self::getSpaceIdRegex() . '!(?=(.{4})*$)[A-Za-z0-9+/]*={0,2}';
}

/**
Expand Down
8 changes: 8 additions & 0 deletions tests/acceptance/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2339,6 +2339,14 @@ public function substituteInLineCodes(
],
"parameter" => []
],
[
"code" => "%federated_file_id_pattern%",
"function" => [
__NAMESPACE__ . '\TestHelpers\GraphHelper',
"getFederatedFileIdRegex"
],
"parameter" => []
],
[
"code" => "%group_id_pattern%",
"function" => [
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/features/apiOcm/searchFederationUsers.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Feature: search federation users
And using server "REMOTE"
And user "Brian" has been created with default attributes


@issue-9813
Scenario: users search for federation users by display name
Given using server "LOCAL"
And "Alice" has created the federation share invitation
Expand Down Expand Up @@ -142,7 +142,7 @@ Feature: search federation users
}
"""


@issue-9813
Scenario: user search for federation users by email
Given using server "LOCAL"
And "Alice" has created the federation share invitation
Expand Down
Loading