Skip to content

Commit 058dfab

Browse files
committed
test(federation): Can not test local federation anymore with signed OCM notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
1 parent 719236a commit 058dfab

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

tests/integration/features/federation/invite.feature

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
Feature: federation/invite
22
Background:
3+
Given using server "REMOTE"
4+
Given user "participant2" exists
5+
And the following "spreed" app config is set
6+
| federation_enabled | yes |
7+
Given using server "LOCAL"
38
Given user "participant1" exists
49
Given user "participant2" exists
510

@@ -235,25 +240,26 @@ Feature: federation/invite
235240
Given user "participant1" creates room "room" (v4)
236241
| roomType | 3 |
237242
| roomName | room |
238-
And user "participant1" adds federated_user "participant2" to room "room" with 200 (v4)
243+
And user "participant1" adds federated_user "participant2@REMOTE" to room "room" with 200 (v4)
239244
When user "participant1" sees the following attendees in room "room" with 200 (v4)
240-
| actorType | actorId | participantType |
241-
| users | participant1 | 1 |
242-
| federated_users | participant2 | 3 |
245+
| actorType | actorId | participantType |
246+
| users | participant1 | 1 |
247+
| federated_users | participant2@{$REMOTE_URL} | 3 |
243248
Then user "participant1" sees the following system messages in room "room" with 200
244249
| room | actorType | actorId | systemMessage | message | messageParameters |
245-
| 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-displayname","server":"http:\/\/localhost:8180"}} |
250+
| 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-displayname","server":"http:\/\/localhost:8280"}} |
246251
| room | users | participant1 | conversation_created | You created the conversation | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname"}} |
247-
And user "participant1" adds federated_user "participant2" to room "room" with 200 (v4)
252+
And user "participant1" adds federated_user "participant2@REMOTE" to room "room" with 200 (v4)
248253
When user "participant1" sees the following attendees in room "room" with 200 (v4)
249-
| actorType | actorId | participantType |
250-
| users | participant1 | 1 |
251-
| federated_users | participant2 | 3 |
254+
| actorType | actorId | participantType |
255+
| users | participant1 | 1 |
256+
| federated_users | participant2@{$REMOTE_URL} | 3 |
252257
Then user "participant1" sees the following system messages in room "room" with 200
253258
| room | actorType | actorId | systemMessage | message | messageParameters |
254-
| 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-displayname","server":"http:\/\/localhost:8180"}} |
259+
| 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-displayname","server":"http:\/\/localhost:8280"}} |
255260
| room | users | participant1 | conversation_created | You created the conversation | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname"}} |
256261
And force run "OCA\Talk\BackgroundJob\RemoveEmptyRooms" background jobs
262+
And using server "REMOTE"
257263
And user "participant2" has the following invitations (v1)
258264
| remoteServerUrl | remoteToken | state | inviterCloudId | inviterDisplayName |
259265
| LOCAL | room | 0 | participant1@http://localhost:8080 | participant1-displayname |
@@ -270,14 +276,15 @@ Feature: federation/invite
270276
And user "participant2" removes themselves from room "LOCAL::room" with 200 (v4)
271277
And user "participant2" has the following invitations (v1)
272278
Then user "participant2" is participant of the following rooms (v4)
279+
And using server "LOCAL"
273280
When user "participant1" sees the following attendees in room "room" with 200 (v4)
274281
| actorType | actorId | participantType |
275282
| users | participant1 | 1 |
276283
Then user "participant1" sees the following system messages in room "room" with 200
277284
| room | actorType | actorId | systemMessage | message | messageParameters |
278-
| room | federated_users | participant2@http://localhost:8180 | federated_user_removed | {federated_user} declined the invitation | {"actor":{"type":"user","id":"participant2","name":"participant2@localhost:8180","server":"http:\/\/localhost:8180"},"federated_user":{"type":"user","id":"participant2","name":"participant2@localhost:8180","server":"http:\/\/localhost:8180"}} |
279-
| room | federated_users | participant2@http://localhost:8180 | federated_user_added | {federated_user} accepted the invitation | {"actor":{"type":"user","id":"participant2","name":"participant2@localhost:8180","server":"http:\/\/localhost:8180"},"federated_user":{"type":"user","id":"participant2","name":"participant2@localhost:8180","server":"http:\/\/localhost:8180"}} |
280-
| 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"}} |
285+
| room | federated_users | participant2@http://localhost:8280 | federated_user_removed | {federated_user} declined the invitation | {"actor":{"type":"user","id":"participant2","name":"participant2@localhost:8280","server":"http:\/\/localhost:8280"},"federated_user":{"type":"user","id":"participant2","name":"participant2@localhost:8280","server":"http:\/\/localhost:8280"}} |
286+
| room | federated_users | participant2@http://localhost:8280 | federated_user_added | {federated_user} accepted the invitation | {"actor":{"type":"user","id":"participant2","name":"participant2@localhost:8280","server":"http:\/\/localhost:8280"},"federated_user":{"type":"user","id":"participant2","name":"participant2@localhost:8280","server":"http:\/\/localhost:8280"}} |
287+
| 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:8280","server":"http:\/\/localhost:8280"}} |
281288
| room | users | participant1 | conversation_created | You created the conversation | {"actor":{"type":"user","id":"participant1","name":"participant1-displayname"}} |
282289

283290
Scenario: Federate conversation meta data

0 commit comments

Comments
 (0)