Skip to content

Commit 2b5b187

Browse files
SystemKeepernickvergessen
authored andcommitted
fix: Adjust federation tests for mention-id
Signed-off-by: Marcel Müller <[email protected]>
1 parent 89c90c4 commit 2b5b187

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tests/integration/features/federation/chat.feature

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ 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}","mention-id":"federated_user\/participant2@{$LOCAL_REMOTE_URL}"}} | Message deleted by you |
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@{$REMOTE_URL}"}} | Message deleted by you |
130130
| 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","mention-id":"federated_user\/participant2@{$LOCAL_REMOTE_URL}"}} | Message deleted by author |
135+
| LOCAL::room | users | participant2 | participant2-displayname | Message deleted by you | {"actor":{"type":"user","id":"participant2","name":"participant2-displayname","mention-id":"federated_user\/participant2@{$REMOTE_URL}"}} | Message deleted by author |
136136
| 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 |

tests/integration/features/federation/invite.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Feature: federation/invite
173173
| federated_users | participant2 | 3 |
174174
Then user "participant1" sees the following system messages in room "room" with 200
175175
| room | actorType | actorId | systemMessage | message | messageParameters |
176-
| room | users | participant1 | federated_user_added | You invited {federated_user} | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname"},"federated_user":{"type":"user","id":"participant2","name":"participant2@localhost:8180","server":"http:\/\/localhost:8180","mention-id":"federated_user\/participant2@http:\/\/localhost:8180"}} |
176+
| room | users | participant1 | federated_user_added | You invited {federated_user} | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname","mention-id":"participant1"},"federated_user":{"type":"user","id":"participant2","name":"participant2@localhost:8180","server":"http:\/\/localhost:8180","mention-id":"federated_user\/participant2@http:\/\/localhost:8180"}} |
177177
| room | users | participant1 | conversation_created | You created the conversation | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname","mention-id":"participant1"}} |
178178
And user "participant2" has the following invitations (v1)
179179
| remoteServerUrl | remoteToken | state | inviterCloudId | inviterDisplayName |

0 commit comments

Comments
 (0)