diff options
| author | Joas Schilling <coding@schilljs.com> | 2021-03-04 15:34:06 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2021-03-08 13:56:20 +0300 |
| commit | 4aee4e9969fc2c9944fc212c6b628c2a1aff4468 (patch) | |
| tree | 02777a0651f1cefccbe49e82b1753b40a0efe9dc /tests | |
| parent | 0aedba550316636c6e33e9143c2972cf7f86135a (diff) | |
Move other participant handling to API v4
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'tests')
37 files changed, 371 insertions, 389 deletions
diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php index 111029556..47e8a2ce6 100644 --- a/tests/integration/features/bootstrap/FeatureContext.php +++ b/tests/integration/features/bootstrap/FeatureContext.php @@ -936,34 +936,16 @@ class FeatureContext implements Context, SnippetAcceptingContext { } /** - * @Then /^user "([^"]*)" adds "([^"]*)" to room "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/ - * - * @param string $user - * @param string $newUser - * @param string $identifier - * @param string $statusCode - * @param string $apiVersion - */ - public function userAddUserToRoom($user, $newUser, $identifier, $statusCode, $apiVersion = 'v1') { - $this->setCurrentUser($user); - $this->sendRequest( - 'POST', '/apps/spreed/api/' . $apiVersion . '/room/' . self::$identifierToToken[$identifier] . '/participants', - new TableNode([['newParticipant', $newUser]]) - ); - $this->assertStatusCode($this->response, $statusCode); - } - - /** - * @Then /^user "([^"]*)" adds (user|group|email|circle) "([^"]*)" to room "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/ + * @Then /^user "([^"]*)" adds (user|group|email|circle) "([^"]*)" to room "([^"]*)" with (\d+) \((v4)\)$/ * * @param string $user * @param string $newType * @param string $newId * @param string $identifier - * @param string $statusCode + * @param int $statusCode * @param string $apiVersion */ - public function userAddAttendeeToRoom($user, $newType, $newId, $identifier, $statusCode, $apiVersion = 'v1') { + public function userAddAttendeeToRoom(string $user, string $newType, string $newId, string $identifier, int $statusCode, string $apiVersion) { $this->setCurrentUser($user); $this->sendRequest( 'POST', '/apps/spreed/api/' . $apiVersion . '/room/' . self::$identifierToToken[$identifier] . '/participants', @@ -976,16 +958,16 @@ class FeatureContext implements Context, SnippetAcceptingContext { } /** - * @Then /^user "([^"]*)" (promotes|demotes) "([^"]*)" in room "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/ + * @Then /^user "([^"]*)" (promotes|demotes) "([^"]*)" in room "([^"]*)" with (\d+) \((v4)\)$/ * * @param string $user * @param string $isPromotion * @param string $participant * @param string $identifier - * @param string $statusCode + * @param int $statusCode * @param string $apiVersion */ - public function userPromoteDemoteInRoom($user, $isPromotion, $participant, $identifier, $statusCode, $apiVersion = 'v1') { + public function userPromoteDemoteInRoom(string $user, string $isPromotion, string $participant, string $identifier, int $statusCode, string $apiVersion) { $requestParameters = [['participant', $participant]]; if (substr($participant, 0, strlen('guest')) === 'guest') { diff --git a/tests/integration/features/callapi/password.feature b/tests/integration/features/callapi/password.feature index 7b0a019a8..c89d66bd9 100644 --- a/tests/integration/features/callapi/password.feature +++ b/tests/integration/features/callapi/password.feature @@ -14,7 +14,7 @@ Feature: callapi/public | roomType | 3 | | roomName | room | And user "participant1" sets password "foobar" for room "room" with 200 (v4) - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) And user "participant2" is participant of room "room" (v4) Then user "participant1" sees 0 peers in call "room" with 200 @@ -43,7 +43,7 @@ Feature: callapi/public | roomType | 3 | | roomName | room | And user "participant1" sets password "foobar" for room "room" with 200 (v4) - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) Then user "participant3" is not participant of room "room" (v4) And user "participant3" sees 0 peers in call "room" with 404 @@ -77,7 +77,7 @@ Feature: callapi/public | roomType | 3 | | roomName | room | And user "participant1" sets password "foobar" for room "room" with 200 (v4) - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) Then user "participant3" is not participant of room "room" (v4) And user "participant3" sees 0 peers in call "room" with 404 @@ -112,7 +112,7 @@ Feature: callapi/public | roomType | 3 | | roomName | room | And user "participant1" sets password "foobar" for room "room" with 200 (v4) - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) And user "guest" sees 0 peers in call "room" with 404 Then user "participant1" joins room "room" with 200 (v4) @@ -139,7 +139,7 @@ Feature: callapi/public | roomType | 3 | | roomName | room | And user "participant1" sets password "foobar" for room "room" with 200 (v4) - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) And user "guest" sees 0 peers in call "room" with 404 Then user "participant1" joins room "room" with 200 (v4) diff --git a/tests/integration/features/callapi/public-read-only.feature b/tests/integration/features/callapi/public-read-only.feature index 1e780d81d..61cf2fce2 100644 --- a/tests/integration/features/callapi/public-read-only.feature +++ b/tests/integration/features/callapi/public-read-only.feature @@ -8,7 +8,7 @@ Feature: callapi/public-read-only When user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) And user "participant2" is participant of room "room" (v4) Then user "participant1" sees 0 peers in call "room" with 200 @@ -30,7 +30,7 @@ Feature: callapi/public-read-only When user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) Then user "participant3" is not participant of room "room" (v4) When user "participant1" locks room "room" with 200 (v4) @@ -50,7 +50,7 @@ Feature: callapi/public-read-only When user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) When user "participant1" locks room "room" with 200 (v4) And user "guest" sees 0 peers in call "room" with 404 diff --git a/tests/integration/features/callapi/public.feature b/tests/integration/features/callapi/public.feature index 479379a32..ab55a384a 100644 --- a/tests/integration/features/callapi/public.feature +++ b/tests/integration/features/callapi/public.feature @@ -13,7 +13,7 @@ Feature: callapi/public When user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) And user "participant2" is participant of room "room" (v4) Then user "participant1" sees 0 peers in call "room" with 200 @@ -47,7 +47,7 @@ Feature: callapi/public When user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) Then user "participant3" is not participant of room "room" (v4) And user "participant3" sees 0 peers in call "room" with 404 @@ -80,7 +80,7 @@ Feature: callapi/public When user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of room "room" (v4) And user "guest" sees 0 peers in call "room" with 404 Then user "participant1" joins room "room" with 200 (v4) diff --git a/tests/integration/features/chat/commands.feature b/tests/integration/features/chat/commands.feature index c062c6b7c..a853e2cca 100644 --- a/tests/integration/features/chat/commands.feature +++ b/tests/integration/features/chat/commands.feature @@ -7,7 +7,7 @@ Feature: chat/commands Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) When user "participant1" sends message "/help" to room "group room" with 201 Then user "participant1" sees the following messages in room "group room" with 200 | room | actorType | actorId | actorDisplayName | message | messageParameters | @@ -18,7 +18,7 @@ Feature: chat/commands Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) When user "participant1" sends message "Message 1" to room "group room" with 201 And user "participant1" sends message "/help" to room "group room" with 201 And user "participant1" sends message "Message 2" to room "group room" with 201 @@ -36,7 +36,7 @@ Feature: chat/commands Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) When user "participant1" sends message "//help" to room "group room" with 201 Then user "participant1" sees the following messages in room "group room" with 200 | room | actorType | actorId | actorDisplayName | message | messageParameters | diff --git a/tests/integration/features/chat/delete.feature b/tests/integration/features/chat/delete.feature index 73f99121e..904f7b0ea 100644 --- a/tests/integration/features/chat/delete.feature +++ b/tests/integration/features/chat/delete.feature @@ -7,7 +7,7 @@ Feature: chat/reply Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds user "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" sends message "Message 1" to room "group room" with 201 Then user "participant1" sees the following messages in room "group room" with 200 | room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | @@ -29,7 +29,7 @@ Feature: chat/reply Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds user "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" sends message "Message 1" to room "group room" with 201 Then user "participant1" sees the following messages in room "group room" with 200 | room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | @@ -51,7 +51,7 @@ Feature: chat/reply Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds user "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" sends message "Message 1" to room "group room" with 201 Then user "participant1" sees the following messages in room "group room" with 200 | room | actorType | actorId | actorDisplayName | message | messageParameters | parentMessage | @@ -70,7 +70,7 @@ Feature: chat/reply Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds user "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" sends message "Message 1" to room "group room" with 201 When user "participant1" sends reply "Message 1-1" on message "Message 1" to room "group room" with 201 Then user "participant1" sees the following messages in room "group room" with 200 @@ -97,7 +97,7 @@ Feature: chat/reply Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds user "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" sends message "Message 1" to room "group room" with 201 When user "participant1" sends reply "Message 1-1" on message "Message 1" to room "group room" with 201 Then user "participant1" sees the following messages in room "group room" with 200 @@ -124,7 +124,7 @@ Feature: chat/reply Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds user "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" sends message "Message 1" to room "group room" with 201 When user "participant1" sends reply "Message 1-1" on message "Message 1" to room "group room" with 201 Then user "participant1" sees the following messages in room "group room" with 200 diff --git a/tests/integration/features/chat/mentions.feature b/tests/integration/features/chat/mentions.feature index db12287b7..16a21d4fe 100644 --- a/tests/integration/features/chat/mentions.feature +++ b/tests/integration/features/chat/mentions.feature @@ -55,8 +55,8 @@ Feature: chat/mentions When user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) Then user "participant1" gets the following candidate mentions in room "group room" for "" with 200 | id | label | source | | all | room | calls | @@ -77,8 +77,8 @@ Feature: chat/mentions When user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) Then user "participant1" gets the following candidate mentions in room "group room" for "part" with 200 | id | label | source | | participant2 | participant2-displayname | users | @@ -96,8 +96,8 @@ Feature: chat/mentions When user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) Then user "participant1" gets the following candidate mentions in room "group room" for "unknown" with 200 And user "participant2" gets the following candidate mentions in room "group room" for "unknown" with 200 And user "participant3" gets the following candidate mentions in room "group room" for "unknown" with 200 @@ -106,8 +106,8 @@ Feature: chat/mentions When user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) Then user "participant4" gets the following candidate mentions in room "group room" for "" with 404 @@ -124,7 +124,7 @@ Feature: chat/mentions When user "participant1" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) And user "participant3" joins room "public room" with 200 (v4) And user "guest" joins room "public room" with 200 (v4) Then user "participant1" gets the following candidate mentions in room "public room" for "" with 200 @@ -156,7 +156,7 @@ Feature: chat/mentions When user "participant1" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) And user "participant3" joins room "public room" with 200 (v4) And user "guest" joins room "public room" with 200 (v4) Then user "participant1" gets the following candidate mentions in room "public room" for "part" with 200 @@ -181,7 +181,7 @@ Feature: chat/mentions When user "participant1" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) And user "participant3" joins room "public room" with 200 (v4) And user "guest1" joins room "public room" with 200 (v4) And user "guest2" joins room "public room" with 200 (v4) @@ -208,7 +208,7 @@ Feature: chat/mentions When user "participant1" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) And user "participant3" joins room "public room" with 200 (v4) And user "guest1" joins room "public room" with 200 (v4) And guest "guest1" sets name to "FooBar" in room "public room" with 200 @@ -232,7 +232,7 @@ Feature: chat/mentions When user "participant1" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) And user "participant3" joins room "public room" with 200 (v4) And user "guest" joins room "public room" with 200 (v4) Then user "participant1" gets the following candidate mentions in room "public room" for "unknown" with 200 @@ -244,7 +244,7 @@ Feature: chat/mentions When user "participant1" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) And user "participant3" joins room "public room" with 200 (v4) And user "guest" joins room "public room" with 200 (v4) Then user "participant4" gets the following candidate mentions in room "public room" for "" with 404 diff --git a/tests/integration/features/chat/password.feature b/tests/integration/features/chat/password.feature index aaf4a37d5..4c45438ca 100644 --- a/tests/integration/features/chat/password.feature +++ b/tests/integration/features/chat/password.feature @@ -19,7 +19,7 @@ Feature: chat/password | roomType | 3 | | roomName | room | And user "participant1" sets password "foobar" for room "public password protected room" with 200 (v4) - And user "participant1" adds "participant2" to room "public password protected room" with 200 + And user "participant1" adds user "participant2" to room "public password protected room" with 200 (v4) When user "participant2" sends message "Message 1" to room "public password protected room" with 201 Then user "participant2" sees the following messages in room "public password protected room" with 200 | room | actorType | actorId | actorDisplayName | message | messageParameters | @@ -72,7 +72,7 @@ Feature: chat/password | roomType | 3 | | roomName | room | And user "participant1" sets password "foobar" for room "public password protected room" with 200 (v4) - And user "participant1" adds "participant2" to room "public password protected room" with 200 + And user "participant1" adds user "participant2" to room "public password protected room" with 200 (v4) And user "participant3" joins room "public password protected room" with 200 (v4) | password | foobar | And user "guest" joins room "public password protected room" with 200 (v4) diff --git a/tests/integration/features/chat/public-read-only.feature b/tests/integration/features/chat/public-read-only.feature index f29200151..c53d23e2e 100644 --- a/tests/integration/features/chat/public-read-only.feature +++ b/tests/integration/features/chat/public-read-only.feature @@ -30,7 +30,7 @@ Feature: chat/public-read-only Given user "participant1" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) When user "participant2" sends message "Message 1" to room "public room" with 201 Then user "participant2" sees the following messages in room "public room" with 200 | room | actorType | actorId | actorDisplayName | message | messageParameters | diff --git a/tests/integration/features/chat/public.feature b/tests/integration/features/chat/public.feature index 530871a7f..d0617b456 100644 --- a/tests/integration/features/chat/public.feature +++ b/tests/integration/features/chat/public.feature @@ -17,7 +17,7 @@ Feature: chat/public Given user "participant1" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) When user "participant2" sends message "Message 1" to room "public room" with 201 Then user "participant2" sees the following messages in room "public room" with 200 | room | actorType | actorId | actorDisplayName | message | messageParameters | @@ -63,7 +63,7 @@ Feature: chat/public Given user "participant1" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) And user "guest" joins room "public room" with 200 (v4) When user "participant1" sends message "Message 1" to room "public room" with 201 And user "participant2" sends message "Message 2" to room "public room" with 201 diff --git a/tests/integration/features/chat/read-status.feature b/tests/integration/features/chat/read-status.feature index bf78eeca3..536165bfd 100644 --- a/tests/integration/features/chat/read-status.feature +++ b/tests/integration/features/chat/read-status.feature @@ -32,7 +32,7 @@ Feature: public Given user "participant1" creates room "chatting" (v3) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "chatting" with 200 + And user "participant1" adds user "participant2" to room "chatting" with 200 (v4) When user "participant1" sets setting "read_status_privacy" to "1" with 200 (v1) Then user "participant1" has capability "spreed=>config=>chat=>read-privacy" set to "1" @@ -59,7 +59,7 @@ Feature: public Given user "participant1" creates room "chatting" (v3) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "chatting" with 200 + And user "participant1" adds user "participant2" to room "chatting" with 200 (v4) When user "participant1" sets setting "read_status_privacy" to "0" with 200 (v1) Then user "participant1" has capability "spreed=>config=>chat=>read-privacy" set to "0" @@ -87,7 +87,7 @@ Feature: public Given user "participant1" creates room "chatting" (v3) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "chatting" with 200 + And user "participant1" adds user "participant2" to room "chatting" with 200 (v4) When user "participant1" sets setting "read_status_privacy" to "0" with 200 (v1) Then user "participant1" has capability "spreed=>config=>chat=>read-privacy" set to "0" @@ -103,7 +103,7 @@ Feature: public When user "participant1" reads message "Message 2" in room "chatting" with 200 Then last response has last common read message header set to "Message 2" - And user "participant1" adds "participant3" to room "chatting" with 200 + And user "participant1" adds user "participant3" to room "chatting" with 200 (v4) When user "participant1" reads message "Message 2" in room "chatting" with 200 Then last response has last common read message header set to "Message 2" diff --git a/tests/integration/features/chat/system-messages.feature b/tests/integration/features/chat/system-messages.feature index c64eb6305..b2ea311d2 100644 --- a/tests/integration/features/chat/system-messages.feature +++ b/tests/integration/features/chat/system-messages.feature @@ -101,7 +101,7 @@ Feature: System messages Given user "participant1" creates room "room" (v4) | roomType | 2 | | roomName | room | - When user "participant1" adds "participant2" to room "room" with 200 + When user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" sees the following system messages in room "room" with 200 | room | actorType | actorId | actorDisplayName | systemMessage | | room | users | participant1 | participant1-displayname | user_added | @@ -184,18 +184,18 @@ Feature: System messages Then user "participant1" sees the following system messages in room "room" with 200 | room | actorType | actorId | actorDisplayName | systemMessage | | room | users | participant1 | participant1-displayname | conversation_created | - When user "participant1" adds "participant2" to room "room" with 200 + When user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" sees the following system messages in room "room" with 200 | room | actorType | actorId | actorDisplayName | systemMessage | | room | users | participant1 | participant1-displayname | user_added | | room | users | participant1 | participant1-displayname | conversation_created | - When user "participant1" promotes "participant2" in room "room" with 200 + When user "participant1" promotes "participant2" in room "room" with 200 (v4) Then user "participant1" sees the following system messages in room "room" with 200 | room | actorType | actorId | actorDisplayName | systemMessage | | room | users | participant1 | participant1-displayname | moderator_promoted | | room | users | participant1 | participant1-displayname | user_added | | room | users | participant1 | participant1-displayname | conversation_created | - When user "participant1" demotes "participant2" in room "room" with 200 + When user "participant1" demotes "participant2" in room "room" with 200 (v4) Then user "participant1" sees the following system messages in room "room" with 200 | room | actorType | actorId | actorDisplayName | systemMessage | | room | users | participant1 | participant1-displayname | moderator_demoted | @@ -215,7 +215,7 @@ Feature: System messages Given user "participant1" creates room "room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) When user "participant1" allows listing room "room" for "all" with 200 (v4) And user "participant1" allows listing room "room" for "users" with 200 (v4) And user "participant1" allows listing room "room" for "none" with 200 (v4) @@ -238,7 +238,7 @@ Feature: System messages Given user "participant1" creates room "room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) When user "participant1" locks room "room" with 200 (v4) And user "participant1" unlocks room "room" with 200 (v4) Then user "participant1" sees the following system messages in room "room" with 200 diff --git a/tests/integration/features/conversation/add-participant.feature b/tests/integration/features/conversation/add-participant.feature index 77098ff22..7be8b1db4 100644 --- a/tests/integration/features/conversation/add-participant.feature +++ b/tests/integration/features/conversation/add-participant.feature @@ -8,7 +8,7 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant1" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 1 | @@ -25,7 +25,7 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) And user "participant1" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 1 | @@ -33,7 +33,7 @@ Feature: public | id | type | participantType | | room | 3 | 3 | And user "participant3" is not participant of room "room" (v4) - When user "participant2" adds "participant3" to room "room" with 403 + When user "participant2" adds user "participant3" to room "room" with 403 (v4) And user "participant3" is not participant of room "room" (v4) And user "participant1" sees the following attendees in room "room" with 200 (v4) | actorType | actorId | participantType | @@ -44,8 +44,8 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - When user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + When user "participant1" promotes "participant2" in room "room" with 200 (v4) And user "participant1" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 1 | @@ -53,7 +53,7 @@ Feature: public | id | type | participantType | | room | 3 | 2 | And user "participant3" is not participant of room "room" (v4) - When user "participant2" adds "participant3" to room "room" with 200 + When user "participant2" adds user "participant3" to room "room" with 200 (v4) Then user "participant1" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 1 | @@ -78,7 +78,7 @@ Feature: public | actorType | actorId | participantType | | users | participant1 | 1 | | users | participant2 | 5 | - When user "participant1" adds "participant2" to room "room" with 200 + When user "participant1" adds user "participant2" to room "room" with 200 (v4) Then user "participant2" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | @@ -96,8 +96,8 @@ Feature: public | roomName | room | And user "participant2" joins room "room" with 200 (v4) # participant3 already present, so it will be skipped - And user "participant1" adds "participant3" to room "room" with 200 - When user "participant1" adds group "group1" to room "room" with 200 + And user "participant1" adds user "participant3" to room "room" with 200 (v4) + When user "participant1" adds group "group1" to room "room" with 200 (v4) Then user "participant2" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | @@ -114,7 +114,7 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant3" adds "participant2" to room "room" with 404 + And user "participant3" adds user "participant2" to room "room" with 404 (v4) And user "participant1" sees the following attendees in room "room" with 200 (v4) | actorType | actorId | participantType | | users | participant1 | 1 | diff --git a/tests/integration/features/conversation/delete-room.feature b/tests/integration/features/conversation/delete-room.feature index 2cf680361..ee7b60d01 100644 --- a/tests/integration/features/conversation/delete-room.feature +++ b/tests/integration/features/conversation/delete-room.feature @@ -20,8 +20,8 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) And user "participant2" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 2 | @@ -35,7 +35,7 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) And user "participant2" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | diff --git a/tests/integration/features/conversation/delete-user.feature b/tests/integration/features/conversation/delete-user.feature index 005610f2b..5ca62dbb5 100644 --- a/tests/integration/features/conversation/delete-user.feature +++ b/tests/integration/features/conversation/delete-user.feature @@ -21,7 +21,7 @@ Feature: conversation/delete-user Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | group room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" sends message "Message 1" to room "group room" with 201 When user "participant2" is deleted Then user "participant1" sees the following messages in room "group room" with 200 @@ -32,7 +32,7 @@ Feature: conversation/delete-user Given user "participant1" creates room "public room" (v4) | roomType | 3 | | roomName | public room | - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) And user "participant2" sends message "Message 1" to room "public room" with 201 When user "participant2" is deleted Then user "participant1" sees the following messages in room "public room" with 200 diff --git a/tests/integration/features/conversation/join-leave.feature b/tests/integration/features/conversation/join-leave.feature index 36973fcae..6fa273df0 100644 --- a/tests/integration/features/conversation/join-leave.feature +++ b/tests/integration/features/conversation/join-leave.feature @@ -35,7 +35,7 @@ Feature: conversation/join-leave Given user "participant1" creates room "room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) When user "participant1" joins room "room" with 200 (v4) And user "participant2" joins room "room" with 200 (v4) And user "participant3" joins room "room" with 404 (v4) @@ -49,7 +49,7 @@ Feature: conversation/join-leave Given user "participant1" creates room "room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) And user "participant1" joins room "room" with 200 (v4) And user "participant2" joins room "room" with 200 (v4) When user "participant1" leaves room "room" with 200 (v4) @@ -63,7 +63,7 @@ Feature: conversation/join-leave Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) When user "participant1" joins room "room" with 200 (v4) And user "participant2" joins room "room" with 200 (v4) And user "participant3" joins room "room" with 200 (v4) @@ -77,7 +77,7 @@ Feature: conversation/join-leave Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) And user "participant1" joins room "room" with 200 (v4) And user "participant2" joins room "room" with 200 (v4) And user "participant3" joins room "room" with 200 (v4) diff --git a/tests/integration/features/conversation/lobby.feature b/tests/integration/features/conversation/lobby.feature index d5376e45d..18489dfc4 100644 --- a/tests/integration/features/conversation/lobby.feature +++ b/tests/integration/features/conversation/lobby.feature @@ -10,9 +10,9 @@ Feature: conversation/lobby Given user "participant1" creates room "room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4) And user "participant1" sets lobby state for room "room" to "no lobby" with 200 (v4) And user "participant2" sets lobby state for room "room" to "non moderators" with 200 (v4) @@ -24,12 +24,12 @@ Feature: conversation/lobby Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant4" joins room "room" with 200 (v4) And user "guest" joins room "room" with 200 (v4) - And user "participant1" promotes "guest" in room "room" with 200 + And user "participant1" promotes "guest" in room "room" with 200 (v4) And user "guest2" joins room "room" with 200 (v4) When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4) And user "participant1" sets lobby state for room "room" to "no lobby" with 200 (v4) @@ -78,16 +78,16 @@ Feature: conversation/lobby Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4) Then user "participant1" joins room "room" with 200 (v4) And user "participant2" joins room "room" with 200 (v4) And user "participant3" joins room "room" with 200 (v4) And user "participant4" joins room "room" with 200 (v4) And user "guest" joins room "room" with 200 (v4) - And user "participant1" promotes "guest" in room "room" with 200 + And user "participant1" promotes "guest" in room "room" with 200 (v4) And user "guest2" joins room "room" with 200 (v4) Scenario: participants can join a password protected room when the lobby is active @@ -95,9 +95,9 @@ Feature: conversation/lobby | roomType | 3 | | roomName | room | And user "participant1" sets password "foobar" for room "room" with 200 (v4) - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4) Then user "participant1" joins room "room" with 200 (v4) And user "participant2" joins room "room" with 200 (v4) @@ -106,7 +106,7 @@ Feature: conversation/lobby | password | foobar | And user "guest" joins room "room" with 200 (v4) | password | foobar | - And user "participant1" promotes "guest" in room "room" with 200 + And user "participant1" promotes "guest" in room "room" with 200 (v4) And user "guest2" joins room "room" with 200 (v4) | password | foobar | @@ -114,15 +114,15 @@ Feature: conversation/lobby Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant1" joins room "room" with 200 (v4) And user "participant2" joins room "room" with 200 (v4) And user "participant3" joins room "room" with 200 (v4) And user "participant4" joins room "room" with 200 (v4) And user "guest" joins room "room" with 200 (v4) - And user "participant1" promotes "guest" in room "room" with 200 + And user "participant1" promotes "guest" in room "room" with 200 (v4) And user "guest2" joins room "room" with 200 (v4) When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4) Then user "participant1" sends message "Message 1" to room "room" with 201 @@ -154,15 +154,15 @@ Feature: conversation/lobby Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant1" joins room "room" with 200 (v4) And user "participant2" joins room "room" with 200 (v4) And user "participant3" joins room "room" with 200 (v4) And user "participant4" joins room "room" with 200 (v4) And user "guest" joins room "room" with 200 (v4) - And user "participant1" promotes "guest" in room "room" with 200 + And user "participant1" promotes "guest" in room "room" with 200 (v4) And user "guest2" joins room "room" with 200 (v4) When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4) Then user "participant1" joins call "room" with 200 @@ -185,15 +185,15 @@ Feature: conversation/lobby Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant1" joins room "room" with 200 (v4) And user "participant2" joins room "room" with 200 (v4) And user "participant3" joins room "room" with 200 (v4) And user "participant4" joins room "room" with 200 (v4) And user "guest" joins room "room" with 200 (v4) - And user "participant1" promotes "guest" in room "room" with 200 + And user "participant1" promotes "guest" in room "room" with 200 (v4) And user "guest2" joins room "room" with 200 (v4) When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4) Then user "participant1" leaves room "room" with 200 (v4) @@ -218,15 +218,15 @@ Feature: conversation/lobby Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant1" joins room "room" with 200 (v4) And user "participant2" joins room "room" with 200 (v4) And user "participant3" joins room "room" with 200 (v4) And user "participant4" joins room "room" with 200 (v4) And user "guest" joins room "room" with 200 (v4) - And user "participant1" promotes "guest" in room "room" with 200 + And user "participant1" promotes "guest" in room "room" with 200 (v4) And user "guest2" joins room "room" with 200 (v4) When user "participant1" sets lobby state for room "room" to "non moderators" with 200 (v4) And user "participant1" sends message "Message 1" to room "room" with 201 diff --git a/tests/integration/features/conversation/one-to-one.feature b/tests/integration/features/conversation/one-to-one.feature index 5c8133e5d..21023ae62 100644 --- a/tests/integration/features/conversation/one-to-one.feature +++ b/tests/integration/features/conversation/one-to-one.feature @@ -92,7 +92,7 @@ Feature: one-to-one And user "participant1" is participant of room "room7" (v4) And user "participant2" is participant of room "room7" (v4) And user "participant3" is not participant of room "room7" (v4) - When user "participant1" adds "participant3" to room "room7" with 400 + When user "participant1" adds user "participant3" to room "room7" with 400 (v4) And user "participant3" is not participant of room "room7" (v4) And user "participant1" sees the following attendees in room "room7" with 200 (v4) | actorType | actorId | participantType | @@ -105,7 +105,7 @@ Feature: one-to-one | invite | participant2 | And user "participant1" is participant of room "room8" (v4) And user "participant2" is participant of room "room8" (v4) - When user "participant1" promotes "participant2" in room "room8" with 400 + When user "participant1" promotes "participant2" in room "room8" with 400 (v4) Scenario: User1 invites user2 to a one2one room and demote user2 to moderator Given user "participant1" creates room "room9" (v4) @@ -113,7 +113,7 @@ Feature: one-to-one | invite | participant2 | And user "participant1" is participant of room "room9" (v4) And user "participant2" is participant of room "room9" (v4) - When user "participant1" demotes "participant2" in room "room9" with 400 + When user "participant1" demotes "participant2" in room "room9" with 400 (v4) Scenario: User1 invites user2 to a one2one room and promote non-invited user Given user "participant1" creates room "room10" (v4) @@ -121,7 +121,7 @@ Feature: one-to-one | invite | participant2 | And user "participant1" is participant of room "room10" (v4) And user "participant3" is not participant of room "room10" (v4) - When user "participant1" promotes "participant3" in room "room10" with 404 + When user "participant1" promotes "participant3" in room "room10" with 404 (v4) Scenario: User1 invites user2 to a one2one room and demote non-invited user Given user "participant1" creates room "room11" (v4) @@ -129,7 +129,7 @@ Feature: one-to-one | invite | participant2 | And user "participant1" is participant of room "room11" (v4) And user "participant3" is not participant of room "room11" (v4) - When user "participant1" demotes "participant3" in room "room11" with 404 + When user "participant1" demotes "participant3" in room "room11" with 404 (v4) Scenario: User1 invites user2 to a one2one room twice, it's the same room Given user "participant1" creates room "room12" (v4) diff --git a/tests/integration/features/conversation/password-request.feature b/tests/integration/features/conversation/password-request.feature index 365f3b520..21f73db04 100644 --- a/tests/integration/features/conversation/password-request.feature +++ b/tests/integration/features/conversation/password-request.feature @@ -119,7 +119,7 @@ Feature: conversation/password-request | sendPasswordByTalk | true | And user "guest" creates the password request room for last share with 201 (v1) And user "participant1" joins room "password request for last share room" with 200 (v4) - When user "participant1" adds "participant2" to room "password request for last share room" with 400 + When user "participant1" adds user "participant2" to room "password request for last share room" with 400 (v4) Then user "participant2" is not participant of room "password request for last share room" (v4) diff --git a/tests/integration/features/conversation/promotion-demotion.feature b/tests/integration/features/conversation/promotion-demotion.feature index cfb187993..53cd04882 100644 --- a/tests/integration/features/conversation/promotion-demotion.feature +++ b/tests/integration/features/conversation/promotion-demotion.feature @@ -8,15 +8,15 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) And user "participant2" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | - When user "participant1" promotes "participant2" in room "room" with 200 + When user "participant1" promotes "participant2" in room "room" with 200 (v4) And user "participant2" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 2 | - And user "participant1" demotes "participant2" in room "room" with 200 + And user "participant1" demotes "participant2" in room "room" with 200 (v4) And user "participant2" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | @@ -25,17 +25,17 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | - And user "participant1" promotes "participant2" in room "room" with 200 - When user "participant2" promotes "participant3" in room "room" with 200 + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + When user "participant2" promotes "participant3" in room "room" with 200 (v4) Then user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 2 | - When user "participant2" demotes "participant3" in room "room" with 200 + When user "participant2" demotes "participant3" in room "room" with 200 (v4) Then user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | @@ -44,20 +44,20 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | - When user "participant2" promotes "participant3" in room "room" with 403 + When user "participant2" promotes "participant3" in room "room" with 403 (v4) Then user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | - When user "participant1" promotes "participant3" in room "room" with 200 + When user "participant1" promotes "participant3" in room "room" with 200 (v4) Then user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 2 | - When user "participant2" demotes "participant3" in room "room" with 403 + When user "participant2" demotes "participant3" in room "room" with 403 (v4) Then user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 2 | @@ -66,19 +66,19 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | - When user "participant2" promotes "participant3" in room "room" with 404 + When user "participant2" promotes "participant3" in room "room" with 404 (v4) Then user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | - When user "participant1" promotes "participant3" in room "room" with 200 + When user "participant1" promotes "participant3" in room "room" with 200 (v4) Then user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 2 | - When user "participant2" demotes "participant3" in room "room" with 404 + When user "participant2" demotes "participant3" in room "room" with 404 (v4) Then user "participant3" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 2 | diff --git a/tests/integration/features/conversation/public-private.feature b/tests/integration/features/conversation/public-private.feature index 302de3555..293949e5a 100644 --- a/tests/integration/features/conversation/public-private.feature +++ b/tests/integration/features/conversation/public-private.feature @@ -27,8 +27,8 @@ Feature: public And user "participant1" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 1 | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) When user "participant2" makes room "room" private with 200 (v4) Then user "participant1" is participant of the following rooms (v4) | id | type | participantType | @@ -45,7 +45,7 @@ Feature: public And user "participant1" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 1 | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) When user "participant2" makes room "room" private with 403 (v4) Then user "participant1" is participant of the following rooms (v4) | id | type | participantType | diff --git a/tests/integration/features/conversation/remove-participant.feature b/tests/integration/features/conversation/remove-participant.feature index 3e56b0f1a..92acd327d 100644 --- a/tests/integration/features/conversation/remove-participant.feature +++ b/tests/integration/features/conversation/remove-participant.feature @@ -19,7 +19,7 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) And user "participant1" is participant of room "room" (v4) And user "participant2" is participant of room "room" (v4) When user "participant1" removes "participant1" from room "room" with 400 (v4) @@ -30,8 +30,8 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) And user "participant1" is participant of room "room" (v4) And user "participant2" is participant of room "room" (v4) When user "participant1" removes "participant1" from room "room" with 200 (v4) @@ -45,8 +45,8 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant3" to room "room" with 200 - And user "participant1" promotes "participant3" in room "room" with 200 + And user "participant1" adds user "participant3" to room "room" with 200 (v4) + And user "participant1" promotes "participant3" in room "room" with 200 (v4) And user "participant3" is participant of room "room" (v4) When user "participant1" removes "participant3" from room "room" with 200 (v4) Then user "participant3" is not participant of room "room" (v4) @@ -55,10 +55,10 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 - And user "participant1" promotes "participant3" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) + And user "participant1" promotes "participant3" in room "room" with 200 (v4) And user "participant3" is participant of room "room" (v4) When user "participant2" removes "participant3" from room "room" with 200 (v4) Then user "participant3" is not participant of room "room" (v4) @@ -67,8 +67,8 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) And user "participant1" removes "participant1" from room "room" with 200 (v4) And user "participant1" is not participant of room "room" (v4) And user "participant2" is participant of room "room" (v4) @@ -79,11 +79,11 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) And user "participant1" removes "participant1" from room "room" with 200 (v4) And user "participant1" is not participant of room "room" (v4) - And user "participant2" adds "participant3" to room "room" with 200 + And user "participant2" adds user "participant3" to room "room" with 200 (v4) And user "participant2" is participant of room "room" (v4) And user "participant3" is participant of room "room" (v4) When user "participant2" removes "participant2" from room "room" with 400 (v4) @@ -94,12 +94,12 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) And user "participant1" removes "participant1" from room "room" with 200 (v4) And user "participant1" is not participant of room "room" (v4) - And user "participant2" adds "participant3" to room "room" with 200 - And user "participant2" promotes "participant3" in room "room" with 200 + And user "participant2" adds user "participant3" to room "room" with 200 (v4) + And user "participant2" promotes "participant3" in room "room" with 200 (v4) And user "participant2" is participant of room "room" (v4) And user "participant3" is participant of room "room" (v4) When user "participant2" removes "participant2" from room "room" with 200 (v4) @@ -110,9 +110,9 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 - And user "participant1" promotes "participant3" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) + And user "participant1" promotes "participant3" in room "room" with 200 (v4) And user "participant3" is participant of room "room" (v4) When user "participant2" removes "participant3" from room "room" with 403 (v4) Then user "participant3" is participant of room "room" (v4) @@ -121,8 +121,8 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant3" to room "room" with 200 - And user "participant1" promotes "participant3" in room "room" with 200 + And user "participant1" adds user "participant3" to room "room" with 200 (v4) + And user "participant1" promotes "participant3" in room "room" with 200 (v4) And user "participant3" is participant of room "room" (v4) When user "participant2" removes "participant3" from room "room" with 404 (v4) Then user "participant3" is participant of room "room" (v4) @@ -134,7 +134,7 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant3" is participant of room "room" (v4) When user "participant1" removes "participant3" from room "room" with 200 (v4) Then user "participant3" is not participant of room "room" (v4) @@ -143,9 +143,9 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant3" is participant of room "room" (v4) When user "participant2" removes "participant3" from room "room" with 200 (v4) Then user "participant3" is not participant of room "room" (v4) @@ -154,8 +154,8 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant3" is participant of room "room" (v4) When user "participant2" removes "participant3" from room "room" with 403 (v4) Then user "participant3" is participant of room "room" (v4) @@ -164,7 +164,7 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant3" to room "room" with 200 + And user "participant1" adds user "participant3" to room "room" with 200 (v4) And user "participant3" is participant of room "room" (v4) When user "participant2" removes "participant3" from room "room" with 404 (v4) Then user "participant3" is participant of room "room" (v4) @@ -184,8 +184,8 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - When user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + When user "participant1" promotes "participant2" in room "room" with 200 (v4) And user "participant3" is not participant of room "room" (v4) When user "participant2" removes "participant3" from room "room" with 404 (v4) Then user "participant3" is not participant of room "room" (v4) @@ -194,7 +194,7 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) And user "participant3" is not participant of room "room" (v4) When user "participant2" removes "participant3" from room "room" with 403 (v4) And user "participant3" is not participant of room "room" (v4) diff --git a/tests/integration/features/conversation/remove-self.feature b/tests/integration/features/conversation/remove-self.feature index cdfd62e1b..fe6c16dad 100644 --- a/tests/integration/features/conversation/remove-self.feature +++ b/tests/integration/features/conversation/remove-self.feature @@ -20,8 +20,8 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) And user "participant2" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 2 | @@ -46,7 +46,7 @@ Feature: public Given user "participant1" creates room "room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) And user "participant2" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 3 | diff --git a/tests/integration/features/conversation/rename-room.feature b/tests/integration/features/conversation/rename-room.feature index 05d3a3ff0..b7599b17d 100644 --- a/tests/integration/features/conversation/rename-room.feature +++ b/tests/integration/features/conversation/rename-room.feature @@ -17,9 +17,9 @@ Feature: public | roomType | 3 | | roomName | room | And user "participant1" is participant of room "room" (v4) - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) And user "participant2" is participant of room "room" (v4) - And user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" promotes "participant2" in room "room" with 200 (v4) When user "participant2" renames room "room" to "new name" with 200 (v4) Scenario: User renames @@ -27,7 +27,7 @@ Feature: public | roomType | 3 | | roomName | room | And user "participant1" is participant of room "room" (v4) - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) And user "participant2" is participant of room "room" (v4) When user "participant2" renames room "room" to "new name" with 403 (v4) diff --git a/tests/integration/features/conversation/set-description.feature b/tests/integration/features/conversation/set-description.feature index 63f2c2f19..19bb5486c 100644 --- a/tests/integration/features/conversation/set-description.feature +++ b/tests/integration/features/conversation/set-description.feature @@ -65,9 +65,9 @@ Feature: set-description Given user "owner" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "owner" adds "moderator" to room "group room" with 200 - And user "owner" promotes "moderator" in room "group room" with 200 - And user "owner" adds "invited user" to room "group room" with 200 + And user "owner" adds user "moderator" to room "group room" with 200 (v4) + And user "owner" promotes "moderator" in room "group room" with 200 (v4) + And user "owner" adds user "invited user" to room "group room" with 200 (v4) When user "owner" sets description for room "group room" to "the description" with 200 (v4) Then user "owner" is participant of room "group room" (v4) | description | @@ -83,9 +83,9 @@ Feature: set-description Given user "owner" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "owner" adds "moderator" to room "group room" with 200 - And user "owner" promotes "moderator" in room "group room" with 200 - And user "owner" adds "invited user" to room "group room" with 200 + And user "owner" adds user "moderator" to room "group room" with 200 (v4) + And user "owner" promotes "moderator" in room "group room" with 200 (v4) + And user "owner" adds user "invited user" to room "group room" with 200 (v4) When user "moderator" sets description for room "group room" to "the description" with 200 (v4) Then user "owner" is participant of room "group room" (v4) | description | @@ -101,9 +101,9 @@ Feature: set-description Given user "owner" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "owner" adds "moderator" to room "group room" with 200 - And user "owner" promotes "moderator" in room "group room" with 200 - And user "owner" adds "invited user" to room "group room" with 200 + And user "owner" adds user "moderator" to room "group room" with 200 (v4) + And user "owner" promotes "moderator" in room "group room" with 200 (v4) + And user "owner" adds user "invited user" to room "group room" with 200 (v4) And user "owner" sets description for room "group room" to "the description" with 200 (v4) When user "invited user" sets description for room "group room" to "invited user description" with 403 (v4) And user "not invited user" sets description for room "group room" to "not invited user description" with 404 (v4) @@ -125,12 +125,12 @@ Feature: set-description Given user "owner" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "owner" adds "moderator" to room "public room" with 200 - And user "owner" promotes "moderator" in room "public room" with 200 - And user "owner" adds "invited user" to room "public room" with 200 + And user "owner" adds user "moderator" to room "public room" with 200 (v4) + And user "owner" promotes "moderator" in room "public room" with 200 (v4) + And user "owner" adds user "invited user" to room "public room" with 200 (v4) And user "not invited but joined user" joins room "public room" with 200 (v4) And user "guest moderator" joins room "public room" with 200 (v4) - And user "owner" promotes "guest moderator" in room "public room" with 200 + And user "owner" promotes "guest moderator" in room "public room" with 200 (v4) And user "guest" joins room "public room" with 200 (v4) When user "owner" sets description for room "public room" to "the description" with 200 (v4) Then user "owner" is participant of room "public room" (v4) @@ -156,12 +156,12 @@ Feature: set-description Given user "owner" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "owner" adds "moderator" to room "public room" with 200 - And user "owner" promotes "moderator" in room "public room" with 200 - And user "owner" adds "invited user" to room "public room" with 200 + And user "owner" adds user "moderator" to room "public room" with 200 (v4) + And user "owner" promotes "moderator" in room "public room" with 200 (v4) + And user "owner" adds user "invited user" to room "public room" with 200 (v4) And user "not invited but joined user" joins room "public room" with 200 (v4) And user "guest moderator" joins room "public room" with 200 (v4) - And user "owner" promotes "guest moderator" in room "public room" with 200 + And user "owner" promotes "guest moderator" in room "public room" with 200 (v4) And user "guest" joins room "public room" with 200 (v4) When user "moderator" sets description for room "public room" to "the description" with 200 (v4) Then user "owner" is participant of room "public room" (v4) @@ -187,12 +187,12 @@ Feature: set-description Given user "owner" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "owner" adds "moderator" to room "public room" with 200 - And user "owner" promotes "moderator" in room "public room" with 200 - And user "owner" adds "invited user" to room "public room" with 200 + And user "owner" adds user "moderator" to room "public room" with 200 (v4) + And user "owner" promotes "moderator" in room "public room" with 200 (v4) + And user "owner" adds user "invited user" to room "public room" with 200 (v4) And user "not invited but joined user" joins room "public room" with 200 (v4) And user "guest moderator" joins room "public room" with 200 (v4) - And user "owner" promotes "guest moderator" in room "public room" with 200 + And user "owner" promotes "guest moderator" in room "public room" with 200 (v4) And user "guest" joins room "public room" with 200 (v4) When user "guest moderator" sets description for room "public room" to "the description" with 200 (v4) Then user "owner" is participant of room "public room" (v4) @@ -218,12 +218,12 @@ Feature: set-description Given user "owner" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "owner" adds "moderator" to room "public room" with 200 - And user "owner" promotes "moderator" in room "public room" with 200 - And user "owner" adds "invited user" to room "public room" with 200 + And user "owner" adds user "moderator" to room "public room" with 200 (v4) + And user "owner" promotes "moderator" in room "public room" with 200 (v4) + And user "owner" adds user "invited user" to room "public room" with 200 (v4) And user "not invited but joined user" joins room "public room" with 200 (v4) And user "guest moderator" joins room "public room" with 200 (v4) - And user "owner" promotes "guest moderator" in room "public room" with 200 + And user "owner" promotes "guest moderator" in room "public room" with 200 (v4) And user "guest" joins room "public room" with 200 (v4) And user "owner" sets description for room "public room" to "the description" with 200 (v4) When user "invited user" sets description for room "public room" to "invited user description" with 403 (v4) @@ -304,9 +304,9 @@ Feature: set-description Given user "owner" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "owner" adds "moderator" to room "public room" with 200 - And user "owner" promotes "moderator" in room "public room" with 200 - And user "owner" adds "invited user" to room "public room" with 200 + And user "owner" adds user "moderator" to room "public room" with 200 (v4) + And user "owner" promotes "moderator" in room "public room" with 200 (v4) + And user "owner" adds user "invited user" to room "public room" with 200 (v4) And user "not invited but joined user" joins room "public room" with 200 (v4) When user "owner" sets description for room "public room" to "the description" with 200 (v4) Then user "owner" is participant of the following rooms (v4) @@ -326,9 +326,9 @@ Feature: set-description Given user "owner" creates room "public room" (v4) | roomType | 3 | | roomName | room | - And user "owner" adds "moderator" to room "public room" with 200 - And user "owner" promotes "moderator" in room "public room" with 200 - And user "owner" adds "invited user" to room "public room" with 200 + And user "owner" adds user "moderator" to room "public room" with 200 (v4) + And user "owner" promotes "moderator" in room "public room" with 200 (v4) + And user "owner" adds user "invited user" to room "public room" with 200 (v4) And user "not invited but joined user" joins room "public room" with 200 (v4) When user "owner" sets description for room "public room" to "" with 200 (v4) Then user "owner" is participant of the following rooms (v4) diff --git a/tests/integration/features/conversation/set-listable.feature b/tests/integration/features/conversation/set-listable.feature index 78b72d7e7..7d94f03ec 100644 --- a/tests/integration/features/conversation/set-listable.feature +++ b/tests/integration/features/conversation/set-listable.feature @@ -30,10 +30,10 @@ Feature: conversation/set-listable And user "moderator" exists And guest accounts can be created And user "user-guest@example.com" is a guest account user - And user "creator" adds "regular-user" to room "room" with 200 - And user "creator" adds "moderator" to room "room" with 200 + And user "creator" adds user "regular-user" to room "room" with 200 (v4) + And user "creator" adds user "moderator" to room "room" with 200 (v4) And user "creator" allows listing room "room" for "all" with 200 (v4) - When user "creator" promotes "moderator" in room "room" with 200 + When user "creator" promotes "moderator" in room "room" with 200 (v4) And user "user-guest@example.com" joins room "room" with 200 (v4) And user "guest" joins room "room" with 200 (v4) Then user "moderator" allows listing room "room" for "none" with 200 (v4) diff --git a/tests/integration/features/conversation/set-password.feature b/tests/integration/features/conversation/set-password.feature index 4af2f1ae4..8a29bd424 100644 --- a/tests/integration/features/conversation/set-password.feature +++ b/tests/integration/features/conversation/set-password.feature @@ -26,8 +26,8 @@ Feature: public And user "participant1" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 1 | - And user "participant1" adds "participant2" to room "room" with 200 - And user "participant1" promotes "participant2" in room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) + And user "participant1" promotes "participant2" in room "room" with 200 (v4) When user "participant2" sets password "foobar" for room "room" with 200 (v4) Then user "participant3" joins room "room" with 403 (v4) Then user "participant3" joins room "room" with 200 (v4) @@ -43,7 +43,7 @@ Feature: public And user "participant1" is participant of the following rooms (v4) | id | type | participantType | | room | 3 | 1 | - And user "participant1" adds "participant2" to room "room" with 200 + And user "participant1" adds user "participant2" to room "room" with 200 (v4) When user "participant2" sets password "foobar" for room "room" with 403 (v4) Then user "participant3" joins room "room" with 200 (v4) And user "participant3" leaves room "room" with 200 (v4) diff --git a/tests/integration/features/conversation/sip-dialin.feature b/tests/integration/features/conversation/sip-dialin.feature index 8dae43b22..698766801 100644 --- a/tests/integration/features/conversation/sip-dialin.feature +++ b/tests/integration/features/conversation/sip-dialin.feature @@ -21,9 +21,9 @@ Feature: public Then user "participant1" is participant of the following rooms (v4) | id | type | participantType | sipEnabled | attendeePin | | room | 3 | 1 | 1 | **PIN** | - When user "participant1" adds user "participant2" to room "room" with 200 (v3) - When user "participant1" adds "participant3" to room "room" with 200 (v3) - When user "participant1" adds email "test@example.tld" to room "room" with 200 (v3) + When user "participant1" adds user "participant2" to room "room" with 200 (v4) + When user "participant1" adds user "participant3" to room "room" with 200 (v4) + When user "participant1" adds email "test@example.tld" to room "room" with 200 (v4) # Guests don't get a PIN as they can not be recognized and are deleted on leave When user "guest" joins room "room" with 200 (v4) Then user "participant1" sees the following attendees in room "room" with 200 (v4) diff --git a/tests/integration/features/sharing/create.feature b/tests/integration/features/sharing/create.feature index 56316bb6b..bc774786b 100644 --- a/tests/integration/features/sharing/create.feature +++ b/tests/integration/features/sharing/create.feature @@ -78,7 +78,7 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "own group room" to "Own group room" with 200 (v4) - And user "participant1" adds "participant2" to room "own group room" with 200 + And user "participant1" adds user "participant2" to room "own group room" with 200 (v4) When user "participant1" shares "welcome.txt" with room "own group room" Then share is returned with | uid_owner | participant1 | @@ -107,7 +107,7 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) When user "participant1" shares "welcome.txt" with room "group room invited to" Then share is returned with | uid_owner | participant1 | @@ -147,7 +147,7 @@ Feature: create Given user "participant2" creates room "group room no longer invited to" (v4) | roomType | 2 | | roomName | room | - And user "participant2" adds "participant1" to room "group room no longer invited to" with 200 + And user "participant2" adds user "participant1" to room "group room no longer invited to" with 200 (v4) And user "participant2" removes "participant1" from room "group room no longer invited to" with 200 (v4) When user "participant1" shares "welcome.txt" with room "group room no longer invited to" Then the OCS status code should be "404" @@ -162,7 +162,7 @@ Feature: create | roomType | 3 | | roomName | room | And user "participant1" renames room "own public room" to "Own public room" with 200 (v4) - And user "participant1" adds "participant2" to room "own public room" with 200 + And user "participant1" adds user "participant2" to room "own public room" with 200 (v4) And user "participant3" joins room "own public room" with 200 (v4) When user "participant1" shares "welcome.txt" with room "own public room" Then share is returned with @@ -206,7 +206,7 @@ Feature: create | roomType | 3 | | roomName | room | And user "participant2" renames room "public room invited to" to "Public room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "public room invited to" with 200 + And user "participant2" adds user "participant1" to room "public room invited to" with 200 (v4) And user "participant3" joins room "public room invited to" with 200 (v4) When user "participant1" shares "welcome.txt" with room "public room invited to" Then share is returned with @@ -322,8 +322,8 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant2" shares "welcome.txt" with user "participant1" with OCS 100 And user "participant1" accepts last share When user "participant1" shares "welcome (2).txt" with room "group room" @@ -371,7 +371,7 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant2" shares "welcome.txt" with user "participant1" with OCS 100 And user "participant1" accepts last share When user "participant1" shares "welcome (2).txt" with room "group room" @@ -418,8 +418,8 @@ Feature: create Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant2" shares "welcome.txt" with user "participant1" | permissions | 1 | And share is returned with @@ -454,7 +454,7 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) When user "participant1" shares "welcome.txt" with room "group room" | expireDate | +3 days | Then share is returned with @@ -485,7 +485,7 @@ Feature: create Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) When user "participant1" shares "welcome.txt" with room "group room" | expireDate | invalid date | Then the OCS status code should be "404" @@ -500,7 +500,7 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) When user "participant1" shares "welcome.txt" with room "group room" | permissions | 1 | Then share is returned with @@ -534,13 +534,13 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" creates room "another group room" (v4) | roomType | 2 | | roomName | room | And user "participant1" renames room "another group room" to "Another group room" with 200 (v4) - And user "participant1" adds "participant3" to room "another group room" with 200 + And user "participant1" adds user "participant3" to room "another group room" with 200 (v4) When user "participant1" shares "welcome.txt" with room "another group room" Then share is returned with | uid_owner | participant1 | @@ -604,7 +604,7 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When user "participant1" shares "welcome.txt" with room "group room" Then the OCS status code should be "403" @@ -639,7 +639,7 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When user "participant2" shares "Talk/welcome.txt" with room "group room" Then the OCS status code should be "403" @@ -678,13 +678,13 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" creates room "another group room" (v4) | roomType | 2 | | roomName | room | And user "participant1" renames room "another group room" to "Another group room" with 200 (v4) - And user "participant1" adds "participant2" to room "another group room" with 200 + And user "participant1" adds user "participant2" to room "another group room" with 200 (v4) When user "participant1" shares "welcome.txt" with room "another group room" Then share is returned with | uid_owner | participant1 | @@ -724,7 +724,7 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When user "participant1" shares "welcome.txt" with user "participant2" Then share is returned with @@ -768,7 +768,7 @@ Feature: create | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with user "participant2" with OCS 100 And user "participant2" accepts last share When user "participant1" shares "welcome.txt" with room "group room" diff --git a/tests/integration/features/sharing/delete.feature b/tests/integration/features/sharing/delete.feature index dee1f344c..634b61035 100644 --- a/tests/integration/features/sharing/delete.feature +++ b/tests/integration/features/sharing/delete.feature @@ -35,7 +35,7 @@ Feature: delete Given user "participant1" creates room "own group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "own group room" with 200 + And user "participant1" adds user "participant2" to room "own group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "own group room" with OCS 100 When user "participant1" deletes last share Then the OCS status code should be "100" @@ -49,7 +49,7 @@ Feature: delete Given user "participant2" creates room "group room invited to" (v4) | roomType | 2 | | roomName | room | - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 When user "participant1" deletes last share Then the OCS status code should be "100" @@ -63,7 +63,7 @@ Feature: delete Given user "participant1" creates room "own public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "own public room" with 200 + And user "participant1" adds user "participant2" to room "own public room" with 200 (v4) And user "participant3" joins room "own public room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "own public room" with OCS 100 When user "participant1" deletes last share @@ -80,7 +80,7 @@ Feature: delete Given user "participant2" creates room "public room invited to" (v4) | roomType | 3 | | roomName | room | - And user "participant2" adds "participant1" to room "public room invited to" with 200 + And user "participant2" adds user "participant1" to room "public room invited to" with 200 (v4) And user "participant3" joins room "public room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "public room invited to" with OCS 100 When user "participant1" deletes last share @@ -148,7 +148,7 @@ Feature: delete | roomType | 2 | | roomName | room | And user "participant2" renames room "group room not invited to" to "Group room not invited to" with 200 (v4) - And user "participant2" adds "participant3" to room "group room not invited to" with 200 + And user "participant2" adds user "participant3" to room "group room not invited to" with 200 (v4) And user "participant2" shares "welcome.txt" with room "group room not invited to" with OCS 100 When user "participant1" deletes last share Then the OCS status code should be "404" @@ -181,7 +181,7 @@ Feature: delete | roomType | 3 | | roomName | room | And user "participant2" renames room "public room not joined to" to "Public room not joined to" with 200 (v4) - And user "participant2" adds "participant3" to room "public room not joined to" with 200 + And user "participant2" adds user "participant3" to room "public room not joined to" with 200 (v4) And user "participant2" shares "welcome.txt" with room "public room not joined to" with OCS 100 When user "participant1" deletes last share Then the OCS status code should be "404" @@ -218,7 +218,7 @@ Feature: delete | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" shares "welcome.txt" with user "participant2" with OCS 100 And user "participant2" accepts last share @@ -242,7 +242,7 @@ Feature: delete Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with user "participant2" with OCS 100 And user "participant2" accepts last share And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 @@ -270,8 +270,8 @@ Feature: delete | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When user "participant2" deletes last share Then the OCS status code should be "100" @@ -308,8 +308,8 @@ Feature: delete | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with user "participant2" with OCS 100 And user "participant2" accepts last share And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 diff --git a/tests/integration/features/sharing/get.feature b/tests/integration/features/sharing/get.feature index 4713df227..d393094a4 100644 --- a/tests/integration/features/sharing/get.feature +++ b/tests/integration/features/sharing/get.feature @@ -31,7 +31,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When user "participant2" gets last share Then share is returned with @@ -64,7 +64,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" renames room "group room" to "New room name" with 200 (v4) When user "participant1" gets last share @@ -97,7 +97,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" | expireDate | -3 days | And share is returned with @@ -123,7 +123,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" moves file "/Talk/welcome.txt" to "/Talk/renamed.txt" with 201 And user "participant1" updates last share with @@ -153,7 +153,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" deletes file "welcome.txt" When user "participant1" gets last share @@ -174,7 +174,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -246,7 +246,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -415,7 +415,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -462,7 +462,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -491,7 +491,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -705,7 +705,7 @@ Feature: get And user "participant1" shares "welcome.txt" with user "participant2" with OCS 100 And user "participant2" accepts last share And user "participant2" shares "welcome (2).txt" with room "public room invited to" with OCS 100 - And user "participant2" adds "participant1" to room "public room invited to" with 200 + And user "participant2" adds user "participant1" to room "public room invited to" with 200 (v4) When user "participant1" gets all shares and reshares for "/welcome.txt" Then the list of returned shares has 2 shares And share 0 is returned with @@ -782,7 +782,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -811,7 +811,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -903,7 +903,7 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -935,13 +935,13 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant1" renames room "own group room" to "Own group room" with 200 (v4) - And user "participant1" adds "participant2" to room "own group room" with 200 + And user "participant1" adds user "participant2" to room "own group room" with 200 (v4) And user "participant2" creates room "group room invited to" (v4) | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 - And user "participant2" adds "participant3" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) + And user "participant2" adds user "participant3" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -1003,13 +1003,13 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant1" renames room "own group room" to "Own group room" with 200 (v4) - And user "participant1" adds "participant2" to room "own group room" with 200 + And user "participant1" adds user "participant2" to room "own group room" with 200 (v4) And user "participant2" creates room "group room invited to" (v4) | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 - And user "participant2" adds "participant3" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) + And user "participant2" adds user "participant3" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -1046,13 +1046,13 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant1" renames room "own group room" to "Own group room" with 200 (v4) - And user "participant1" adds "participant2" to room "own group room" with 200 + And user "participant1" adds user "participant2" to room "own group room" with 200 (v4) And user "participant2" creates room "group room invited to" (v4) | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 - And user "participant2" adds "participant3" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) + And user "participant2" adds user "participant3" to room "group room invited to" with 200 (v4) And user "participant1" creates room "own one-to-one room" (v4) | roomType | 1 | | invite | participant3 | @@ -1072,7 +1072,7 @@ Feature: get Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" deletes last share When user "participant1" gets deleted shares @@ -1085,8 +1085,8 @@ Feature: get | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" deletes last share When user "participant2" gets deleted shares @@ -1113,7 +1113,7 @@ Feature: get Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" deletes file "welcome.txt" When user "participant1" gets deleted shares @@ -1147,7 +1147,7 @@ Feature: get Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When user "participant2" gets the share-type DAV property for "Talk/welcome.txt" Then the response contains a share-types DAV property with @@ -1159,7 +1159,7 @@ Feature: get And user "participant2" creates room "another group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share @@ -1174,7 +1174,7 @@ Feature: get And user "participant2" creates room "another group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with user "participant2" with OCS 100 And user "participant2" accepts last share And user "participant2" shares "welcome (2).txt" with room "group room" with OCS 100 @@ -1189,7 +1189,7 @@ Feature: get And user "participant2" creates room "another group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share @@ -1204,7 +1204,7 @@ Feature: get And user "participant2" creates room "another group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with user "participant2" with OCS 100 And user "participant2" accepts last share And user "participant2" shares "welcome (2).txt" with room "group room" with OCS 100 @@ -1260,7 +1260,7 @@ Feature: get Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When user "participant1" gets the DAV properties for "/" Then the list of returned files for "participant1" is @@ -1280,7 +1280,7 @@ Feature: get Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" deletes last share When user "participant1" gets the DAV properties for "/" @@ -1296,7 +1296,7 @@ Feature: get Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" deletes last share When user "participant2" gets the DAV properties for "/" @@ -1313,7 +1313,7 @@ Feature: get Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" deletes file "welcome.txt" When user "participant1" gets the DAV properties for "/" diff --git a/tests/integration/features/sharing/hooks.feature b/tests/integration/features/sharing/hooks.feature index 3fb96c8c1..9bd9cbe15 100644 --- a/tests/integration/features/sharing/hooks.feature +++ b/tests/integration/features/sharing/hooks.feature @@ -14,7 +14,7 @@ Feature: hooks | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 - When user "participant1" adds "participant2" to room "group room" with 200 + When user "participant1" adds user "participant2" to room "group room" with 200 (v4) Then user "participant2" gets last share And share is returned with | uid_owner | participant1 | @@ -53,7 +53,7 @@ Feature: hooks Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" shares "welcome.txt" with room "group room" with OCS 100 When user "participant1" removes "participant2" from room "group room" with 200 (v4) Then user "participant1" gets last share @@ -65,7 +65,7 @@ Feature: hooks Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" shares "welcome.txt" with room "group room" with OCS 100 When user "participant2" removes themselves from room "group room" with 200 (v4) Then user "participant1" gets last share @@ -78,7 +78,7 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" shares "welcome.txt" with room "group room" with OCS 100 When user "participant2" leaves room "group room" with 200 (v4) Then user "participant1" gets last share @@ -109,7 +109,7 @@ Feature: hooks | roomType | 3 | | roomName | room | And user "participant1" renames room "public room" to "Public room" with 200 (v4) - And user "participant1" adds "participant2" to room "public room" with 200 + And user "participant1" adds user "participant2" to room "public room" with 200 (v4) And user "participant2" shares "welcome.txt" with room "public room" with OCS 100 When user "participant2" leaves room "public room" with 200 (v4) Then user "participant1" gets last share @@ -154,7 +154,7 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" creates folder "test" And user "participant1" shares "test" with room "group room" with OCS 100 And user "participant2" shares "welcome.txt" with room "group room" with OCS 100 @@ -185,7 +185,7 @@ Feature: hooks Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share @@ -232,7 +232,7 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When user "participant1" removes "participant2" from room "group room" with 200 (v4) Then user "participant1" gets last share @@ -254,7 +254,7 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" moves file "welcome (2).txt" to "renamed.txt" When user "participant1" removes "participant2" from room "group room" with 200 (v4) @@ -277,7 +277,7 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When user "participant2" removes themselves from room "group room" with 200 (v4) Then user "participant1" gets last share @@ -299,7 +299,7 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" moves file "welcome (2).txt" to "renamed.txt" When user "participant2" removes themselves from room "group room" with 200 (v4) @@ -369,8 +369,8 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" moves file "Talk/welcome.txt" to "Talk/renamed.txt" And user "participant3" moves file "Talk/welcome.txt" to "Talk/renamed too.txt" @@ -406,7 +406,7 @@ Feature: hooks Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share @@ -450,10 +450,10 @@ Feature: hooks Given user "participant2" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant2" adds "participant1" to room "group room" with 200 + And user "participant2" adds user "participant1" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" removes "participant1" from room "group room" with 200 (v4) - When user "participant2" adds "participant1" to room "group room" with 200 + When user "participant2" adds user "participant1" to room "group room" with 200 (v4) Then user "participant1" gets all shares And the list of returned shares has 0 shares And user "participant2" gets all received shares @@ -463,10 +463,10 @@ Feature: hooks Given user "participant2" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant2" adds "participant1" to room "group room" with 200 + And user "participant2" adds user "participant1" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" removes themselves from room "group room" with 200 (v4) - When user "participant2" adds "participant1" to room "group room" with 200 + When user "participant2" adds user "participant1" to room "group room" with 200 (v4) Then user "participant1" gets all shares And the list of returned shares has 0 shares And user "participant2" gets all received shares @@ -491,12 +491,12 @@ Feature: hooks Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant2" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant1" removes "participant2" from room "group room" with 200 (v4) - When user "participant1" adds "participant2" to room "group room" with 200 + When user "participant1" adds user "participant2" to room "group room" with 200 (v4) Then user "participant1" gets last share And the OCS status code should be "404" And user "participant1" gets all shares @@ -539,10 +539,10 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" removes "participant2" from room "group room" with 200 (v4) - When user "participant1" adds "participant2" to room "group room" with 200 + When user "participant1" adds user "participant2" to room "group room" with 200 (v4) Then user "participant2" gets all received shares And the list of returned shares has 1 shares And share 0 is returned with @@ -561,11 +561,11 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" moves file "welcome (2).txt" to "renamed.txt" And user "participant1" removes "participant2" from room "group room" with 200 (v4) - When user "participant1" adds "participant2" to room "group room" with 200 + When user "participant1" adds user "participant2" to room "group room" with 200 (v4) Then user "participant2" gets all received shares And the list of returned shares has 1 shares And share 0 is returned with @@ -584,10 +584,10 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" removes themselves from room "group room" with 200 (v4) - When user "participant1" adds "participant2" to room "group room" with 200 + When user "participant1" adds user "participant2" to room "group room" with 200 (v4) Then user "participant2" gets all received shares And the list of returned shares has 1 shares And share 0 is returned with @@ -606,11 +606,11 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" moves file "welcome (2).txt" to "renamed.txt" And user "participant2" removes themselves from room "group room" with 200 (v4) - When user "participant1" adds "participant2" to room "group room" with 200 + When user "participant1" adds user "participant2" to room "group room" with 200 (v4) Then user "participant2" gets all received shares And the list of returned shares has 1 shares And share 0 is returned with @@ -677,12 +677,12 @@ Feature: hooks Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share And user "participant1" removes "participant2" from room "group room" with 200 (v4) - When user "participant1" adds "participant2" to room "group room" with 200 + When user "participant1" adds user "participant2" to room "group room" with 200 (v4) Then user "participant1" gets last share And share is returned with | uid_owner | participant2 | @@ -746,7 +746,7 @@ Feature: hooks Given user "participant1" creates room "own group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "own group room" with 200 + And user "participant1" adds user "participant2" to room "own group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "own group room" with OCS 100 When user "participant1" deletes room "own group room" with 200 (v4) Then user "participant1" gets last share @@ -758,7 +758,7 @@ Feature: hooks Given user "participant1" creates room "own public room" (v4) | roomType | 3 | | roomName | room | - And user "participant1" adds "participant2" to room "own public room" with 200 + And user "participant1" adds user "participant2" to room "own public room" with 200 (v4) And user "participant3" joins room "own public room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "own public room" with OCS 100 When user "participant1" deletes room "own public room" with 200 (v4) @@ -773,7 +773,7 @@ Feature: hooks Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" moves file "welcome (2).txt" to "renamed.txt" When user "participant1" deletes room "group room" with 200 (v4) @@ -786,7 +786,7 @@ Feature: hooks Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" shares "Talk/welcome.txt" with user "participant3" with OCS 100 And user "participant3" accepts last share @@ -817,7 +817,7 @@ Feature: hooks Given user "participant1" creates room "group room" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" moves file "Talk/welcome.txt" to "Talk/renamed.txt" And user "participant2" shares "Talk/renamed.txt" with user "participant3" with OCS 100 @@ -858,9 +858,9 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "yet another group room" to "Yet another group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant2" to room "another group room" with 200 - And user "participant1" adds "participant2" to room "yet another group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant2" to room "another group room" with 200 (v4) + And user "participant1" adds user "participant2" to room "yet another group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" shares "welcome.txt" with room "another group room" with OCS 100 And user "participant1" shares "welcome.txt" with room "yet another group room" with OCS 100 @@ -916,7 +916,7 @@ Feature: hooks Given user "participant1" creates room "group room invited to" (v4) | roomType | 2 | | roomName | room | - And user "participant1" adds "participant2" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) And user "participant2" shares "welcome.txt" with room "group room invited to" with OCS 100 When user "participant2" is deleted Then user "participant1" gets last share @@ -927,8 +927,8 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 - And user "participant1" adds "participant3" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 When user "participant2" is deleted Then user "participant1" gets last share @@ -959,8 +959,8 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 - And user "participant1" adds "participant3" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant2" moves file "welcome (2).txt" to "renamed.txt" When user "participant2" is deleted @@ -992,8 +992,8 @@ Feature: hooks | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 - And user "participant1" adds "participant3" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant2" shares "Talk/welcome.txt" with user "participant4" with OCS 100 And user "participant4" accepts last share diff --git a/tests/integration/features/sharing/move.feature b/tests/integration/features/sharing/move.feature index c89fc6f29..d7dcae694 100644 --- a/tests/integration/features/sharing/move.feature +++ b/tests/integration/features/sharing/move.feature @@ -11,8 +11,8 @@ Feature: move | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant1" creates folder "/test" When user "participant1" moves file "/welcome.txt" to "/test/renamed.txt" with 201 @@ -57,8 +57,8 @@ Feature: move # | roomType | 2 | # | roomName | room | # And user "participant1" renames room "group room" to "Group room" with 200 (v4) -# And user "participant1" adds "participant2" to room "group room" with 200 -# And user "participant1" adds "participant3" to room "group room" with 200 +# And user "participant1" adds user "participant2" to room "group room" with 200 (v4) +# And user "participant1" adds user "participant3" to room "group room" with 200 (v4) # And user "participant3" creates folder "/test" # And user "participant3" shares "/test" with user "participant1" with OCS 100 # And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 @@ -108,8 +108,8 @@ Feature: move # | roomType | 2 | # | roomName | room | # And user "participant1" renames room "group room" to "Group room" with 200 (v4) -# And user "participant1" adds "participant2" to room "group room" with 200 -# And user "participant1" adds "participant3" to room "group room" with 200 +# And user "participant1" adds user "participant2" to room "group room" with 200 (v4) +# And user "participant1" adds user "participant3" to room "group room" with 200 (v4) # And user "participant4" creates folder "/test" # And user "participant4" shares "/test" with user "participant1" with OCS 100 # And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 @@ -159,7 +159,7 @@ Feature: move # | roomType | 2 | # | roomName | room | # And user "participant1" renames room "group room" to "Group room" with 200 (v4) -# And user "participant1" adds "participant2" to room "group room" with 200 +# And user "participant1" adds user "participant2" to room "group room" with 200 (v4) # And user "participant3" creates folder "/test" # And user "participant3" shares "/test" with user "participant4" with OCS 100 # And user "participant4" shares "/test" with user "participant1" with OCS 100 @@ -213,8 +213,8 @@ Feature: move | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" creates folder "/test" When user "participant2" moves file "Talk/welcome.txt" to "test/renamed.txt" with 201 @@ -261,8 +261,8 @@ Feature: move | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant3" creates folder "/test" And user "participant3" shares "/test" with user "participant2" with OCS 100 And user "participant2" accepts last share diff --git a/tests/integration/features/sharing/restore.feature b/tests/integration/features/sharing/restore.feature index 90a5598a7..eef3e6321 100644 --- a/tests/integration/features/sharing/restore.feature +++ b/tests/integration/features/sharing/restore.feature @@ -10,8 +10,8 @@ Feature: delete | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" deletes last share When user "participant2" restores last share @@ -58,8 +58,8 @@ Feature: delete | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" moves file "/Talk/welcome.txt" to "/Talk/renamed.txt" with 201 And user "participant2" deletes last share @@ -107,8 +107,8 @@ Feature: delete | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" deletes last share And user "participant1" updates last share with diff --git a/tests/integration/features/sharing/sharees.feature b/tests/integration/features/sharing/sharees.feature index 9c2ae6320..a692953bd 100644 --- a/tests/integration/features/sharing/sharees.feature +++ b/tests/integration/features/sharing/sharees.feature @@ -102,7 +102,7 @@ Feature: sharees | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) When user "participant2" gets sharees for | search | room | Then "exact rooms" sharees returned is empty @@ -114,7 +114,7 @@ Feature: sharees | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) When user "participant2" gets sharees for | search | group room | Then "exact rooms" sharees returned are @@ -126,12 +126,12 @@ Feature: sharees | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) And user "participant1" creates room "another group room invited to" (v4) | roomType | 2 | | roomName | room | And user "participant1" renames room "another group room invited to" to "Another group room" with 200 (v4) - And user "participant1" adds "participant2" to room "another group room invited to" with 200 + And user "participant1" adds user "participant2" to room "another group room invited to" with 200 (v4) When user "participant2" gets sharees for | search | group room | Then "exact rooms" sharees returned are @@ -248,7 +248,7 @@ Feature: sharees | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) And user "participant1" creates room "group room not invited to" (v4) | roomType | 2 | | roomName | room | diff --git a/tests/integration/features/sharing/transfer-ownership.feature b/tests/integration/features/sharing/transfer-ownership.feature index 8230abd6e..546eb220d 100644 --- a/tests/integration/features/sharing/transfer-ownership.feature +++ b/tests/integration/features/sharing/transfer-ownership.feature @@ -10,8 +10,8 @@ Feature: transfer-ownership | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When transfering ownership from "participant1" to "participant2" Then user "participant1" gets last share @@ -53,8 +53,8 @@ Feature: transfer-ownership | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant3" shares "welcome.txt" with user "participant1" with OCS 100 And user "participant1" accepts last share And user "participant1" shares "welcome (2).txt" with room "group room" with OCS 100 @@ -106,7 +106,7 @@ Feature: transfer-ownership | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant3" to room "group room" with 200 + And user "participant1" adds user "participant3" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 When transfering ownership from "participant1" to "participant2" Then user "participant1" gets last share diff --git a/tests/integration/features/sharing/update.feature b/tests/integration/features/sharing/update.feature index dde74cedb..8b6958249 100644 --- a/tests/integration/features/sharing/update.feature +++ b/tests/integration/features/sharing/update.feature @@ -104,7 +104,7 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant1" renames room "own group room" to "Own group room" with 200 (v4) - And user "participant1" adds "participant2" to room "own group room" with 200 + And user "participant1" adds user "participant2" to room "own group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "own group room" with OCS 100 When user "participant1" updates last share with | permissions | 1 | @@ -153,7 +153,7 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant2" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "group room invited to" with 200 + And user "participant2" adds user "participant1" to room "group room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 When user "participant1" updates last share with | permissions | 1 | @@ -202,7 +202,7 @@ Feature: update | roomType | 3 | | roomName | room | And user "participant1" renames room "own public room" to "Own public room" with 200 (v4) - And user "participant1" adds "participant2" to room "own public room" with 200 + And user "participant1" adds user "participant2" to room "own public room" with 200 (v4) And user "participant3" joins room "own public room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "own public room" with OCS 100 When user "participant1" updates last share with @@ -269,7 +269,7 @@ Feature: update | roomType | 3 | | roomName | room | And user "participant2" renames room "public room invited to" to "Public room invited to" with 200 (v4) - And user "participant2" adds "participant1" to room "public room invited to" with 200 + And user "participant2" adds user "participant1" to room "public room invited to" with 200 (v4) And user "participant3" joins room "public room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "public room invited to" with OCS 100 When user "participant1" updates last share with @@ -438,7 +438,7 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant2" renames room "group room not invited to" to "Group room not invited to" with 200 (v4) - And user "participant2" adds "participant3" to room "group room not invited to" with 200 + And user "participant2" adds user "participant3" to room "group room not invited to" with 200 (v4) And user "participant2" shares "welcome.txt" with room "group room not invited to" with OCS 100 When user "participant1" updates last share with | permissions | 1 | @@ -473,7 +473,7 @@ Feature: update | roomType | 3 | | roomName | room | And user "participant2" renames room "public room not joined to" to "Public room not joined to" with 200 (v4) - And user "participant2" adds "participant3" to room "public room not joined to" with 200 + And user "participant2" adds user "participant3" to room "public room not joined to" with 200 (v4) And user "participant2" shares "welcome.txt" with room "public room not joined to" with OCS 100 When user "participant1" updates last share with | permissions | 1 | @@ -578,7 +578,7 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant2" renames room "own group room" to "Own group room" with 200 (v4) - And user "participant2" adds "participant1" to room "own group room" with 200 + And user "participant2" adds user "participant1" to room "own group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "own group room" with OCS 100 When user "participant2" updates last share with | permissions | 1 | @@ -613,8 +613,8 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 - And user "participant1" adds "participant3" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 When user "participant2" updates last share with | permissions | 1 | @@ -660,8 +660,8 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant1" renames room "group room no longer invited to" to "Group room no longer invited to" with 200 (v4) - And user "participant1" adds "participant2" to room "group room no longer invited to" with 200 - And user "participant1" adds "participant3" to room "group room no longer invited to" with 200 + And user "participant1" adds user "participant2" to room "group room no longer invited to" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room no longer invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room no longer invited to" with OCS 100 And user "participant1" removes "participant2" from room "group room no longer invited to" with 200 (v4) When user "participant2" updates last share with @@ -700,7 +700,7 @@ Feature: update | roomType | 3 | | roomName | room | And user "participant2" renames room "own public room" to "Own public room" with 200 (v4) - And user "participant2" adds "participant1" to room "own public room" with 200 + And user "participant2" adds user "participant1" to room "own public room" with 200 (v4) And user "participant3" joins room "own public room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "own public room" with OCS 100 When user "participant2" updates last share with @@ -750,7 +750,7 @@ Feature: update | roomType | 3 | | roomName | room | And user "participant1" renames room "public room invited to" to "Public room invited to" with 200 (v4) - And user "participant1" adds "participant2" to room "public room invited to" with 200 + And user "participant1" adds user "participant2" to room "public room invited to" with 200 (v4) And user "participant3" joins room "public room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "public room invited to" with OCS 100 When user "participant2" updates last share with @@ -894,8 +894,8 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 - And user "participant1" adds "participant3" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant2" creates folder "/test" And user "participant2" moves file "/Talk/welcome.txt" to "/test/renamed.txt" with 201 @@ -943,8 +943,8 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 - And user "participant1" adds "participant3" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) + And user "participant1" adds user "participant3" to room "group room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant2" creates folder "/test" And user "participant2" moves file "/Talk/welcome.txt" to "/test/renamed.txt" with 201 @@ -987,7 +987,7 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant1" renames room "group room invited to" to "Group room invited to" with 200 (v4) - And user "participant1" adds "participant2" to room "group room invited to" with 200 + And user "participant1" adds user "participant2" to room "group room invited to" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room invited to" with OCS 100 And user "participant1" updates last share with | permissions | 1 | @@ -1027,7 +1027,7 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" deletes last share with OCS 100 When user "participant1" updates last share with @@ -1066,7 +1066,7 @@ Feature: update | roomType | 2 | | roomName | room | And user "participant1" renames room "group room" to "Group room" with 200 (v4) - And user "participant1" adds "participant2" to room "group room" with 200 + And user "participant1" adds user "participant2" to room "group room" with 200 (v4) And user "participant1" shares "welcome.txt" with room "group room" with OCS 100 And user "participant2" deletes last share with OCS 100 When user "participant2" updates last share with |