Skip to content

[stable27] fix(polls): Remove actor info from system message #12342

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 5 commits into from
May 16, 2024
Merged

[stable27] fix(polls): Remove actor info from system message #12342

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5530521
fix(polls): Remove actor info from system message
nickvergessen May 10, 2024
c84d0e5
fix(tests): Remove silent flag from tests
nickvergessen May 13, 2024
4996dac
fix(tests): Adjust fake actor id
nickvergessen May 13, 2024
bfad64d
fix(polls): Replace unexisting constant
nickvergessen May 13, 2024
5d6a666
fix(tests): Fix system handling in tests
nickvergessen May 16, 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
Prev Previous commit
fix(tests): Fix system handling in tests 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed May 16, 2024
commit 5d6a6662290c7d02272902519109896bdb85ff82
2 changes: 1 addition & 1 deletion tests/integration/features/bootstrap/FeatureContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2506,7 +2506,7 @@ public function userSeesTheFollowingSystemMessagesInRoom($user, $identifier, $st
$data = [
'room' => self::$tokenToIdentifier[$message['token']],
'actorType' => (string) $message['actorType'],
'actorId' => ($message['actorType'] === 'guests') ? self::$sessionIdToUser[$message['actorId']] : (string) $message['actorId'],
'actorId' => ($message['actorType'] === 'guests' && $message['actorId'] !== 'system') ? self::$sessionIdToUser[$message['actorId']] : (string) $message['actorId'],
'systemMessage' => (string) $message['systemMessage'],
];

Expand Down