-
Notifications
You must be signed in to change notification settings - Fork 158
[full-ci] revaBump-v2.40.1 #1927
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.
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fschade
approved these changes
Nov 27, 2025
Contributor
Author
|
close to favor #1928 |
Contributor
Author
Contributor
Author
0b8ed41 to
8d07754
Compare
Contributor
This should be fixed by: opencloud-eu/reva#442 |
Closed
Contributor
|
@ScharfViktor can you try with: diff --git a/tests/acceptance/bootstrap/SharingNgContext.php b/tests/acceptance/bootstrap/SharingNgContext.php
index 1229e78ba91..e7752c4ab09 100644
--- a/tests/acceptance/bootstrap/SharingNgContext.php
+++ b/tests/acceptance/bootstrap/SharingNgContext.php
@@ -327,12 +327,11 @@ class SharingNgContext implements Context {
if ($shareType === "user") {
$shareeId = $this->featureContext->getAttributeOfCreatedUser($sharee, 'id');
if ($federatedShare) {
- $shareeId = (
- $this->featureContext->ocmContext->getAcceptedUserByName(
- $user,
- $sharee
- )
- )['user_id'];
+ $federatedUser = $this->featureContext->ocmContext->getAcceptedUserByName(
+ $user,
+ $sharee
+ );
+ $shareeId = $federatedUser['user_id']+"@"+$federatedUser['idp'];
}
} elseif ($shareType === "group") {
$shareeId = $this->featureContext->getAttributeOfCreatedGroup($sharee, 'id');
@@ -403,7 +402,11 @@ class SharingNgContext implements Context {
if ($shareType === "user") {
$shareeId = $this->featureContext->getAttributeOfCreatedUser($sharee, 'id');
if ($federatedShare) {
- $shareeId = ($this->featureContext->ocmContext->getAcceptedUserByName($user, $sharee))['user_id'];
+ $federatedUser = $this->featureContext->ocmContext->getAcceptedUserByName(
+ $user,
+ $sharee
+ );
+ $shareeId = $federatedUser['user_id']+"@"+$federatedUser['idp'];
}
} elseif ($shareType === "group") {
$shareeId = $this->featureContext->getAttributeOfCreatedGroup($sharee, 'id'); |
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
Closed
micbar
approved these changes
Nov 28, 2025
butonic
approved these changes
Nov 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.


reva bump for rc.3