Skip to content

Commit 03eb9ec

Browse files
committed
fix: Adjust test for mention-id
Signed-off-by: Marcel Müller <[email protected]>
1 parent b26a784 commit 03eb9ec

File tree

6 files changed

+35
-34
lines changed

6 files changed

+35
-34
lines changed

lib/Chat/Parser/SystemMessage.php

+1
Original file line numberDiff line numberDiff line change
@@ -985,6 +985,7 @@ protected function getCircle(string $circleId): array {
985985
'id' => $circleId,
986986
'name' => $this->circleNames[$circleId],
987987
'url' => $this->circleLinks[$circleId],
988+
'mention' => 'team/' . $circleId,
988989
];
989990
}
990991

tests/integration/features/chat-1/note-to-self.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ Feature: chat/note-to-self
2121
| Note to self | 6 | Note to self |
2222
Then user "participant1" sees the following system messages in room "Note to self" with 200
2323
| room | actorType | actorId | actorDisplayName | message | messageParameters | systemMessage |
24-
| Note to self | guests | system | | System created the conversation | {"actor":{"type":"guest","id":"guest\/system","name":"Guest"}} | conversation_created |
24+
| Note to self | guests | system | | System created the conversation | {"actor":{"type":"guest","id":"guest\/system","name":"Guest","mention-id":"guest\/system"}} | conversation_created |

tests/integration/features/chat-2/poll.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -804,4 +804,4 @@ Feature: chat-2/poll
804804
And user "participant1" sees the following messages in room "room" with 200 (v1)
805805
Then user "participant1" sees the following system messages in room "room" with 200 (v1)
806806
| room | actorType | actorId | systemMessage | message | silent | messageParameters |
807-
| room | users | participant1 | history_cleared | You cleared the history of the conversation | !ISSET | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname"}} |
807+
| room | users | participant1 | history_cleared | You cleared the history of the conversation | !ISSET | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname","mention-id":"participant1"}} |

tests/integration/features/federation/chat.feature

+4-4
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ Feature: federation/chat
126126
And user "participant2" deletes message "Message 1-1 - Edit 1" from room "LOCAL::room" with 200
127127
Then user "participant1" sees the following messages in room "room" with 200
128128
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
129-
| room | federated_users | participant2@{$REMOTE_URL} | participant2-displayname | Message deleted by author | {"actor":{"type":"user","id":"participant2","name":"participant2-displayname","server":"{$REMOTE_URL}"}} | Message deleted by you |
130-
| room | users | participant1 | participant1-displayname | Message deleted by you | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname"}} | |
129+
| room | federated_users | participant2@{$REMOTE_URL} | participant2-displayname | Message deleted by author | {"actor":{"type":"user","id":"participant2","name":"participant2-displayname","server":"{$REMOTE_URL}","mention-id":"federated_user\/participant2@{$LOCAL_REMOTE_URL}"}} | Message deleted by you |
130+
| room | users | participant1 | participant1-displayname | Message deleted by you | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname","mention-id":"participant1"}} | |
131131
When next message request has the following parameters set
132132
| timeout | 0 |
133133
And user "participant2" sees the following messages in room "LOCAL::room" with 200
134134
| room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage |
135-
| LOCAL::room | users | participant2 | participant2-displayname | Message deleted by you | {"actor":{"type":"user","id":"participant2","name":"participant2-displayname"}} | Message deleted by author |
136-
| LOCAL::room | federated_users | participant1@{$BASE_URL} | participant1-displayname | Message deleted by author | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname","server":"{$BASE_URL}"}} | |
135+
| LOCAL::room | users | participant2 | participant2-displayname | Message deleted by you | {"actor":{"type":"user","id":"participant2","name":"participant2-displayname","mention-id":"federated_user\/participant2@{$LOCAL_REMOTE_URL}"}} | Message deleted by author |
136+
| LOCAL::room | federated_users | participant1@{$BASE_URL} | participant1-displayname | Message deleted by author | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname","mention-id":"participant1","server":"{$BASE_URL}"}} | |
137137
Then user "participant2" is participant of the following rooms (v4)
138138
| id | type | lastMessage |
139139
| LOCAL::room | 2 | Message deleted by author |

0 commit comments

Comments
 (0)