Skip to content

[stable18] Fix user management in password request rooms #4796

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

Merged
nickvergessen merged 8 commits into from
Dec 18, 2020
Merged

[stable18] Fix user management in password request rooms #4796

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fefefc0
Make possible to verify a subset of the room properties
nickvergessen Oct 27, 2020
3d1cd1d
Make possible to verify room data also for single rooms
danxuliu Nov 12, 2020
a7e4e71
Add integration tests for password request rooms
danxuliu Nov 20, 2020
c2096c5
Fix additional participants being able to join a password request room
danxuliu Nov 20, 2020
73838b0
Fix owner being able to add more users to a password request room
danxuliu Nov 24, 2020
c12ba28
Inform the user if an error occurred when adding participants
danxuliu Nov 24, 2020
0508992
Do not show the search box in password request rooms
danxuliu Nov 24, 2020
8b54033
No participants means everything is okay
nickvergessen Nov 27, 2020
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
Next Next commit
Make possible to verify a subset of the room properties 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @danxuliu
nickvergessen authored and danxuliu committed Dec 18, 2020
commit fefefc0a1b77eba82af44b86a7b6311320990fcc
30 changes: 24 additions & 6 deletions tests/integration/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,30 @@ public function userIsParticipantOfRooms($user, TableNode $formData = null) {
$participantNames[$lastParticipantKey] .= ' [exact order]';
}

return [
'id' => self::$tokenToIdentifier[$room['token']],
'type' => (string) $room['type'],
'participantType' => (string) $room['participantType'],
'participants' => implode(', ', $participantNames),
];
$data = [];
if (isset($expectedRoom['id'])) {
$data['id'] = self::$tokenToIdentifier[$room['token']];
}
if (isset($expectedRoom['name'])) {
$data['name'] = $room['name'];
}
if (isset($expectedRoom['type'])) {
$data['type'] = (string) $room['type'];
}
if (isset($expectedRoom['hasPassword'])) {
$data['hasPassword'] = (string) $room['hasPassword'];
}
if (isset($expectedRoom['readOnly'])) {
$data['readOnly'] = (string) $room['readOnly'];
}
if (isset($expectedRoom['participantType'])) {
$data['participantType'] = (string) $room['participantType'];
}
if (isset($expectedRoom['participants'])) {
$data['participants'] = implode(', ', $participantNames);
}

return $data;
}, $rooms, $formData->getHash()));
}

Expand Down