Move removing paricipants to v4

Signed-off-by: Joas Schilling <coding@schilljs.com>

12 files changed, 68 insertions, 68 deletions

diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index adcc47e8a..078f92f88 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -703,21 +703,21 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" removes themselves from room "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" removes themselves from room "([^"]*)" with (\d+) \((v4)\)$/
 	 *
 	 * @param string $user
 	 * @param string $identifier
-	 * @param string $statusCode
+	 * @param int $statusCode
 	 * @param string $apiVersion
 	 */
-	public function userLeavesRoom($user, $identifier, $statusCode, $apiVersion = 'v1') {
+	public function userLeavesRoom(string $user, string $identifier, int $statusCode, string $apiVersion) {
 		$this->setCurrentUser($user);
 		$this->sendRequest('DELETE', '/apps/spreed/api/' . $apiVersion . '/room/' . self::$identifierToToken[$identifier] . '/participants/self');
 		$this->assertStatusCode($this->response, $statusCode);
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" removes "([^"]*)" from room "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" removes "([^"]*)" from room "([^"]*)" with (\d+) \((v4)\)$/
 	 *
 	 * @param string $user
 	 * @param string $toRemove
@@ -725,7 +725,7 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	 * @param string $statusCode
 	 * @param string $apiVersion
 	 */
-	public function userRemovesUserFromRoom($user, $toRemove, $identifier, $statusCode, $apiVersion = 'v1') {
+	public function userRemovesUserFromRoom(string $user, string $toRemove, string $identifier, int $statusCode, string$apiVersion) {
 		$this->setCurrentUser($user);
 		$this->sendRequest(
 			'DELETE', '/apps/spreed/api/' . $apiVersion . '/room/' . self::$identifierToToken[$identifier] . '/participants',
diff --git a/tests/integration/features/callapi/one-to-one.feature b/tests/integration/features/callapi/one-to-one.feature
index 8f8698c2e..4d2fd33eb 100644
--- a/tests/integration/features/callapi/one-to-one.feature
+++ b/tests/integration/features/callapi/one-to-one.feature
@@ -111,7 +111,7 @@ Feature: callapi/one-to-one
       | invite   | participant2 |
     And user "participant1" is participant of room "room" (v4)
     And user "participant2" is participant of room "room" (v4)
-    When user "participant1" removes themselves from room "room" with 200
+    When user "participant1" removes themselves from room "room" with 200 (v4)
     Then user "participant1" is not participant of room "room" (v4)
     When user "participant2" joins room "room" with 200 (v4)
     Then user "participant1" is not participant of room "room" (v4)
diff --git a/tests/integration/features/chat/one-to-one.feature b/tests/integration/features/chat/one-to-one.feature
index f2d61471e..26835a863 100644
--- a/tests/integration/features/chat/one-to-one.feature
+++ b/tests/integration/features/chat/one-to-one.feature
@@ -60,7 +60,7 @@ Feature: chat/one-to-one
       | invite   | participant2 |
     And user "participant1" is participant of room "one-to-one room" (v4)
     And user "participant2" is participant of room "one-to-one room" (v4)
-    When user "participant1" removes themselves from room "one-to-one room" with 200
+    When user "participant1" removes themselves from room "one-to-one room" with 200 (v4)
     Then user "participant1" is not participant of room "one-to-one room" (v4)
     When user "participant2" sends message "Message" to room "one-to-one room" with 201
     Then user "participant1" is participant of room "one-to-one room" (v4)
diff --git a/tests/integration/features/chat/system-messages.feature b/tests/integration/features/chat/system-messages.feature
index 55177649f..0c4fd7e70 100644
--- a/tests/integration/features/chat/system-messages.feature
+++ b/tests/integration/features/chat/system-messages.feature
@@ -202,7 +202,7 @@ Feature: System messages
       | room | users     | participant1 | participant1-displayname | moderator_promoted |
       | room | users     | participant1 | participant1-displayname | user_added |
       | room | users     | participant1 | participant1-displayname | conversation_created |
-    When user "participant1" removes "participant2" from room "room" with 200
+    When user "participant1" removes "participant2" from 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_removed |
diff --git a/tests/integration/features/conversation/files.feature b/tests/integration/features/conversation/files.feature
index adb9a9e48..200a155e0 100644
--- a/tests/integration/features/conversation/files.feature
+++ b/tests/integration/features/conversation/files.feature
@@ -384,7 +384,7 @@ Feature: conversation/files
     And user "participant2" gets the room for path "welcome (2).txt" with 200 (v1)
     And user "participant1" joins room "file welcome (2).txt room" with 200 (v4)
     And user "participant1" is participant of room "file welcome (2).txt room" (v4)
-    When user "participant1" removes themselves from room "file welcome (2).txt room" with 200
+    When user "participant1" removes themselves from room "file welcome (2).txt room" with 200 (v4)
     And user "participant1" is not participant of room "file welcome (2).txt room" (v4)
     And user "participant1" joins room "file welcome (2).txt room" with 200 (v4)
     Then user "participant1" is participant of room "file welcome (2).txt room" (v4)
@@ -397,7 +397,7 @@ Feature: conversation/files
     And user "participant1" gets the room for path "welcome.txt" with 200 (v1)
     And user "participant2" joins room "file welcome.txt room" with 200 (v4)
     And user "participant2" is participant of room "file welcome.txt room" (v4)
-    When user "participant2" removes themselves from room "file welcome.txt room" with 200
+    When user "participant2" removes themselves from room "file welcome.txt room" with 200 (v4)
     And user "participant2" is not participant of room "file welcome.txt room" (v4)
     And user "participant2" joins room "file welcome.txt room" with 200 (v4)
     Then user "participant2" is participant of room "file welcome.txt room" (v4)
@@ -409,7 +409,7 @@ Feature: conversation/files
     And user "participant1" gets the room for last share with 200 (v1)
     And user "participant1" joins room "file last share room" with 200 (v4)
     And user "participant1" is participant of room "file last share room" (v4)
-    When user "participant1" removes themselves from room "file last share room" with 200
+    When user "participant1" removes themselves from room "file last share room" with 200 (v4)
     And user "participant1" is not participant of room "file last share room" (v4)
     And user "participant1" joins room "file last share room" with 200 (v4)
     Then user "participant1" is participant of room "file last share room" (v4)
@@ -421,7 +421,7 @@ Feature: conversation/files
     And user "participant2" gets the room for last share with 200 (v1)
     And user "participant2" joins room "file last share room" with 200 (v4)
     And user "participant2" is participant of room "file last share room" (v4)
-    When user "participant2" removes themselves from room "file last share room" with 200
+    When user "participant2" removes themselves from room "file last share room" with 200 (v4)
     And user "participant2" is not participant of room "file last share room" (v4)
     And user "participant2" joins room "file last share room" with 200 (v4)
     Then user "participant2" is participant of room "file last share room" (v4)
@@ -435,7 +435,7 @@ Feature: conversation/files
     And user "participant2" gets the room for last share with 200 (v1)
     And user "participant2" joins room "file last share room" with 200 (v4)
     And user "participant2" is participant of room "file last share room" (v4)
-    When user "participant2" removes themselves from room "file last share room" with 200
+    When user "participant2" removes themselves from room "file last share room" with 200 (v4)
     And user "participant2" is not participant of room "file last share room" (v4)
     And user "participant2" joins room "file last share room" with 200 (v4)
     Then user "participant2" is participant of room "file last share room" (v4)
diff --git a/tests/integration/features/conversation/lobby.feature b/tests/integration/features/conversation/lobby.feature
index e23e6c6e8..a56dfe6ae 100644
--- a/tests/integration/features/conversation/lobby.feature
+++ b/tests/integration/features/conversation/lobby.feature
@@ -208,8 +208,8 @@ Feature: conversation/lobby
     And user "participant4" joins room "room" with 200 (v4)
     And user "guest" joins room "room" with 200 (v4)
     And user "guest2" joins room "room" with 200 (v4)
-    And user "participant2" removes themselves from room "room" with 200
-    And user "participant3" removes themselves from room "room" with 200
+    And user "participant2" removes themselves from room "room" with 200 (v4)
+    And user "participant3" removes themselves from room "room" with 200 (v4)
 
 
 
diff --git a/tests/integration/features/conversation/one-to-one.feature b/tests/integration/features/conversation/one-to-one.feature
index bd804944f..c8c4c73c4 100644
--- a/tests/integration/features/conversation/one-to-one.feature
+++ b/tests/integration/features/conversation/one-to-one.feature
@@ -35,7 +35,7 @@ Feature: one-to-one
       | invite   | participant2 |
     And user "participant1" is participant of room "room2" (v4)
     And user "participant2" is participant of room "room2" (v4)
-    When user "participant1" removes themselves from room "room2" with 200
+    When user "participant1" removes themselves from room "room2" with 200 (v4)
     Then user "participant1" is not participant of room "room2" (v4)
     And user "participant1" is participant of the following rooms (v4)
     And user "participant2" is participant of room "room2" (v4)
@@ -62,7 +62,7 @@ Feature: one-to-one
       | invite   | participant2 |
     Then user "participant1" is participant of room "room4" (v4)
     And user "participant2" is participant of room "room4" (v4)
-    When user "participant1" removes "participant2" from room "room4" with 400
+    When user "participant1" removes "participant2" from room "room4" with 400 (v4)
     Then user "participant1" is participant of room "room4" (v4)
     And user "participant2" is participant of room "room4" (v4)
 
@@ -167,7 +167,7 @@ Feature: one-to-one
     And user "participant2" is participant of the following rooms (v4)
       | id     | type | participantType |
       | room14 | 1    | 1               |
-    When user "participant1" removes themselves from room "room14" with 200
+    When user "participant1" removes themselves from room "room14" with 200 (v4)
     Then user "participant1" is not participant of room "room14" (v4)
     And user "participant1" is participant of the following rooms (v4)
     And user "participant2" is participant of room "room14" (v4)
diff --git a/tests/integration/features/conversation/remove-participant.feature b/tests/integration/features/conversation/remove-participant.feature
index e06c7cf9e..3e56b0f1a 100644
--- a/tests/integration/features/conversation/remove-participant.feature
+++ b/tests/integration/features/conversation/remove-participant.feature
@@ -12,7 +12,7 @@ Feature: public
       | roomType | 3 |
       | roomName | room |
     And user "participant1" is participant of room "room" (v4)
-    When user "participant1" removes "participant1" from room "room" with 200
+    When user "participant1" removes "participant1" from room "room" with 200 (v4)
     Then user "participant1" is not participant of room "room" (v4)
 
   Scenario: Owner removes self participant from public room when there are other users in the room
@@ -22,7 +22,7 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     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
+    When user "participant1" removes "participant1" from room "room" with 400 (v4)
     Then user "participant1" is participant of room "room" (v4)
     And user "participant2" is participant of room "room" (v4)
 
@@ -34,7 +34,7 @@ Feature: public
     And user "participant1" promotes "participant2" in room "room" with 200
     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
+    When user "participant1" removes "participant1" from room "room" with 200 (v4)
     Then user "participant1" is not participant of room "room" (v4)
     And user "participant2" is participant of room "room" (v4)
 
@@ -48,7 +48,7 @@ Feature: public
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant1" promotes "participant3" in room "room" with 200
     And user "participant3" is participant of room "room" (v4)
-    When user "participant1" removes "participant3" from room "room" with 200
+    When user "participant1" removes "participant3" from room "room" with 200 (v4)
     Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: Moderator removes moderator
@@ -60,7 +60,7 @@ Feature: public
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant1" promotes "participant3" in room "room" with 200
     And user "participant3" is participant of room "room" (v4)
-    When user "participant2" removes "participant3" from room "room" with 200
+    When user "participant2" removes "participant3" from room "room" with 200 (v4)
     Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: Moderator removes self participant from empty public room
@@ -69,10 +69,10 @@ Feature: public
       | 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" removes "participant1" from room "room" with 200
+    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)
-    When user "participant2" removes "participant2" from room "room" with 200
+    When user "participant2" removes "participant2" from room "room" with 200 (v4)
     Then user "participant2" is not participant of room "room" (v4)
 
   Scenario: Moderator removes self participant from public room when there are other users in the room
@@ -81,12 +81,12 @@ Feature: public
       | 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" removes "participant1" from room "room" with 200
+    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" 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
+    When user "participant2" removes "participant2" from room "room" with 400 (v4)
     Then user "participant2" is participant of room "room" (v4)
     And user "participant3" is participant of room "room" (v4)
 
@@ -96,13 +96,13 @@ Feature: public
       | 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" removes "participant1" from room "room" with 200
+    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" 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
+    When user "participant2" removes "participant2" from room "room" with 200 (v4)
     Then user "participant2" is not participant of room "room" (v4)
     And user "participant3" is participant of room "room" (v4)
 
@@ -114,7 +114,7 @@ Feature: public
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant1" promotes "participant3" in room "room" with 200
     And user "participant3" is participant of room "room" (v4)
-    When user "participant2" removes "participant3" from room "room" with 403
+    When user "participant2" removes "participant3" from room "room" with 403 (v4)
     Then user "participant3" is participant of room "room" (v4)
 
   Scenario: Stranger removes moderator
@@ -124,7 +124,7 @@ Feature: public
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant1" promotes "participant3" in room "room" with 200
     And user "participant3" is participant of room "room" (v4)
-    When user "participant2" removes "participant3" from room "room" with 404
+    When user "participant2" removes "participant3" from room "room" with 404 (v4)
     Then user "participant3" is participant of room "room" (v4)
 
 #
@@ -136,7 +136,7 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant3" is participant of room "room" (v4)
-    When user "participant1" removes "participant3" from room "room" with 200
+    When user "participant1" removes "participant3" from room "room" with 200 (v4)
     Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: Moderator removes user
@@ -147,7 +147,7 @@ Feature: public
     And user "participant1" promotes "participant2" in room "room" with 200
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant3" is participant of room "room" (v4)
-    When user "participant2" removes "participant3" from room "room" with 200
+    When user "participant2" removes "participant3" from room "room" with 200 (v4)
     Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: User removes user
@@ -157,7 +157,7 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant3" is participant of room "room" (v4)
-    When user "participant2" removes "participant3" from room "room" with 403
+    When user "participant2" removes "participant3" from room "room" with 403 (v4)
     Then user "participant3" is participant of room "room" (v4)
 
   Scenario: Stranger removes user
@@ -166,7 +166,7 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant3" to room "room" with 200
     And user "participant3" is participant of room "room" (v4)
-    When user "participant2" removes "participant3" from room "room" with 404
+    When user "participant2" removes "participant3" from room "room" with 404 (v4)
     Then user "participant3" is participant of room "room" (v4)
 
 #
@@ -177,7 +177,7 @@ Feature: public
       | roomType | 3 |
       | roomName | room |
     And user "participant3" is not participant of room "room" (v4)
-    When user "participant1" removes "participant3" from room "room" with 404
+    When user "participant1" removes "participant3" from room "room" with 404 (v4)
     Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: Moderator removes stranger
@@ -187,7 +187,7 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     When user "participant1" promotes "participant2" in room "room" with 200
     And user "participant3" is not participant of room "room" (v4)
-    When user "participant2" removes "participant3" from room "room" with 404
+    When user "participant2" removes "participant3" from room "room" with 404 (v4)
     Then user "participant3" is not participant of room "room" (v4)
 
   Scenario: User removes stranger
@@ -196,7 +196,7 @@ Feature: public
       | roomName | room |
     And user "participant1" adds "participant2" to room "room" with 200
     And user "participant3" is not participant of room "room" (v4)
-    When user "participant2" removes "participant3" from room "room" with 403
+    When user "participant2" removes "participant3" from room "room" with 403 (v4)
     And user "participant3" is not participant of room "room" (v4)
 
   Scenario: Stranger removes stranger
@@ -204,5 +204,5 @@ Feature: public
       | roomType | 3 |
       | roomName | room |
     And user "participant3" is not participant of room "room" (v4)
-    When user "participant2" removes "participant3" from room "room" with 404
+    When user "participant2" removes "participant3" from room "room" with 404 (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 8b4dd201d..ba094796f 100644
--- a/tests/integration/features/conversation/remove-self.feature
+++ b/tests/integration/features/conversation/remove-self.feature
@@ -13,7 +13,7 @@ Feature: public
       | room | 3    | 1               |
     And user "participant2" is not participant of room "room" (v4)
     And user "participant3" is not participant of room "room" (v4)
-    When user "participant1" removes themselves from room "room" with 200
+    When user "participant1" removes themselves from room "room" with 200 (v4)
     Then user "participant1" is not participant of room "room" (v4)
 
   Scenario: Moderator removes the room from their room list
@@ -31,7 +31,7 @@ Feature: public
       | users      | participant2 | 2               |
     And user "participant1" is participant of room "room" (v4)
     And user "participant2" is participant of room "room" (v4)
-    When user "participant2" removes themselves from room "room" with 200
+    When user "participant2" removes themselves from room "room" with 200 (v4)
     Then user "participant1" is participant of room "room" (v4)
     And user "participant2" is not participant of room "room" (v4)
 
@@ -39,7 +39,7 @@ Feature: public
     Given user "participant1" creates room "room" (v4)
       | roomType | 3 |
       | roomName | room |
-    When user "participant1" removes themselves from room "room" with 200
+    When user "participant1" removes themselves from room "room" with 200 (v4)
     Then user "participant2" gets room "room" with 404 (v3)
 
   Scenario: User removes the room from their room list
@@ -52,7 +52,7 @@ Feature: public
       | room | 3    | 3               |
     And user "participant1" is participant of room "room" (v4)
     And user "participant2" is participant of room "room" (v4)
-    When user "participant2" removes themselves from room "room" with 200
+    When user "participant2" removes themselves from room "room" with 200 (v4)
     Then user "participant1" is participant of room "room" (v4)
     And user "participant2" is not participant of room "room" (v4)
 
@@ -66,7 +66,7 @@ Feature: public
       | room | 3    | 5               |
     And user "participant1" is participant of room "room" (v4)
     And user "participant2" is participant of room "room" (v4)
-    When user "participant2" removes themselves from room "room" with 200
+    When user "participant2" removes themselves from room "room" with 200 (v4)
     Then user "participant1" is participant of room "room" (v4)
     And user "participant2" is not participant of room "room" (v4)
 
@@ -76,6 +76,6 @@ Feature: public
       | roomName | room |
     And user "participant1" is participant of room "room" (v4)
     And user "participant2" is not participant of room "room" (v4)
-    When user "participant2" removes themselves from room "room" with 404
+    When user "participant2" removes themselves from room "room" with 404 (v4)
     Then user "participant1" is participant of room "room" (v4)
     And user "participant2" is not participant of room "room" (v4)
diff --git a/tests/integration/features/sharing/create.feature b/tests/integration/features/sharing/create.feature
index 353088bca..fdb691e36 100644
--- a/tests/integration/features/sharing/create.feature
+++ b/tests/integration/features/sharing/create.feature
@@ -148,7 +148,7 @@ Feature: create
       | roomType | 2 |
       | roomName | room |
     And user "participant2" adds "participant1" to room "group room no longer invited to" with 200
-    And user "participant2" removes "participant1" from room "group room no longer invited to" with 200
+    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"
     And the HTTP status code should be "200"
diff --git a/tests/integration/features/sharing/hooks.feature b/tests/integration/features/sharing/hooks.feature
index e4856fa6c..5703219ee 100644
--- a/tests/integration/features/sharing/hooks.feature
+++ b/tests/integration/features/sharing/hooks.feature
@@ -55,7 +55,7 @@ Feature: hooks
       | roomName | room |
     And user "participant1" adds "participant2" to room "group room" with 200
     And user "participant2" shares "welcome.txt" with room "group room" with OCS 100
-    When user "participant1" removes "participant2" from room "group room" with 200
+    When user "participant1" removes "participant2" from room "group room" with 200 (v4)
     Then user "participant1" gets last share
     And the OCS status code should be "404"
     And user "participant2" gets last share
@@ -67,7 +67,7 @@ Feature: hooks
       | roomName | room |
     And user "participant1" adds "participant2" to room "group room" with 200
     And user "participant2" shares "welcome.txt" with room "group room" with OCS 100
-    When user "participant2" removes themselves from room "group room" with 200
+    When user "participant2" removes themselves from room "group room" with 200 (v4)
     Then user "participant1" gets last share
     And the OCS status code should be "404"
     And user "participant2" gets last share
@@ -158,7 +158,7 @@ Feature: hooks
     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
-    When user "participant1" removes "participant2" from room "group room" with 200
+    When user "participant1" removes "participant2" from room "group room" with 200 (v4)
     Then user "participant1" gets last share
     And the OCS status code should be "404"
     And user "participant2" gets last share
@@ -189,7 +189,7 @@ Feature: hooks
     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
-    When user "participant1" removes "participant2" from room "group room" with 200
+    When user "participant1" removes "participant2" from 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
@@ -234,7 +234,7 @@ Feature: hooks
     And user "participant1" renames room "group room" to "Group room" with 200
     And user "participant1" adds "participant2" to room "group room" with 200
     And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
-    When user "participant1" removes "participant2" from room "group room" with 200
+    When user "participant1" removes "participant2" from room "group room" with 200 (v4)
     Then user "participant1" gets last share
     And share is returned with
       | uid_owner              | participant1 |
@@ -257,7 +257,7 @@ Feature: hooks
     And user "participant1" adds "participant2" to room "group room" with 200
     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
+    When user "participant1" removes "participant2" from room "group room" with 200 (v4)
     Then user "participant1" gets last share
     And share is returned with
       | uid_owner              | participant1 |
@@ -279,7 +279,7 @@ Feature: hooks
     And user "participant1" renames room "group room" to "Group room" with 200
     And user "participant1" adds "participant2" to room "group room" with 200
     And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
-    When user "participant2" removes themselves from room "group room" with 200
+    When user "participant2" removes themselves from room "group room" with 200 (v4)
     Then user "participant1" gets last share
     And share is returned with
       | uid_owner              | participant1 |
@@ -302,7 +302,7 @@ Feature: hooks
     And user "participant1" adds "participant2" to room "group room" with 200
     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
+    When user "participant2" removes themselves from room "group room" with 200 (v4)
     Then user "participant1" gets last share
     And share is returned with
       | uid_owner              | participant1 |
@@ -374,7 +374,7 @@ Feature: hooks
     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"
-    When user "participant1" removes "participant2" from room "group room" with 200
+    When user "participant1" removes "participant2" from room "group room" with 200 (v4)
     Then user "participant1" gets last share
     And share is returned with
       | uid_owner              | participant1 |
@@ -410,7 +410,7 @@ Feature: hooks
     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
-    When user "participant1" removes "participant2" from room "group room" with 200
+    When user "participant1" removes "participant2" from room "group room" with 200 (v4)
     Then user "participant1" gets last share
     And share is returned with
       | uid_owner              | participant2 |
@@ -452,7 +452,7 @@ Feature: hooks
       | roomName | room |
     And user "participant2" adds "participant1" to room "group room" with 200
     And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
-    And user "participant2" removes "participant1" from room "group room" with 200
+    And user "participant2" removes "participant1" from room "group room" with 200 (v4)
     When user "participant2" adds "participant1" to room "group room" with 200
     Then user "participant1" gets all shares
     And the list of returned shares has 0 shares
@@ -465,7 +465,7 @@ Feature: hooks
       | roomName | room |
     And user "participant2" adds "participant1" to room "group room" with 200
     And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
-    And user "participant1" removes themselves from room "group room" with 200
+    And user "participant1" removes themselves from room "group room" with 200 (v4)
     When user "participant2" adds "participant1" to room "group room" with 200
     Then user "participant1" gets all shares
     And the list of returned shares has 0 shares
@@ -495,7 +495,7 @@ Feature: hooks
     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
+    And user "participant1" removes "participant2" from room "group room" with 200 (v4)
     When user "participant1" adds "participant2" to room "group room" with 200
     Then user "participant1" gets last share
     And the OCS status code should be "404"
@@ -541,7 +541,7 @@ Feature: hooks
     And user "participant1" renames room "group room" to "Group room" with 200
     And user "participant1" adds "participant2" to room "group room" with 200
     And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
-    And user "participant1" removes "participant2" from room "group room" with 200
+    And user "participant1" removes "participant2" from room "group room" with 200 (v4)
     When user "participant1" adds "participant2" to room "group room" with 200
     Then user "participant2" gets all received shares
     And the list of returned shares has 1 shares
@@ -564,7 +564,7 @@ Feature: hooks
     And user "participant1" adds "participant2" to room "group room" with 200
     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
+    And user "participant1" removes "participant2" from room "group room" with 200 (v4)
     When user "participant1" adds "participant2" to room "group room" with 200
     Then user "participant2" gets all received shares
     And the list of returned shares has 1 shares
@@ -586,7 +586,7 @@ Feature: hooks
     And user "participant1" renames room "group room" to "Group room" with 200
     And user "participant1" adds "participant2" to room "group room" with 200
     And user "participant1" shares "welcome.txt" with room "group room" with OCS 100
-    And user "participant2" removes themselves from room "group room" with 200
+    And user "participant2" removes themselves from room "group room" with 200 (v4)
     When user "participant1" adds "participant2" to room "group room" with 200
     Then user "participant2" gets all received shares
     And the list of returned shares has 1 shares
@@ -609,7 +609,7 @@ Feature: hooks
     And user "participant1" adds "participant2" to room "group room" with 200
     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
+    And user "participant2" removes themselves from room "group room" with 200 (v4)
     When user "participant1" adds "participant2" to room "group room" with 200
     Then user "participant2" gets all received shares
     And the list of returned shares has 1 shares
@@ -681,7 +681,7 @@ Feature: hooks
     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
+    And user "participant1" removes "participant2" from room "group room" with 200 (v4)
     When user "participant1" adds "participant2" to room "group room" with 200
     Then user "participant1" gets last share
     And share is returned with
@@ -733,8 +733,8 @@ Feature: hooks
       | roomType | 1 |
       | invite   | participant2 |
     And user "participant1" shares "welcome.txt" with room "own one-to-one room" with OCS 100
-    When user "participant1" removes themselves from room "own one-to-one room" with 200
-    When user "participant2" removes themselves from room "own one-to-one room" with 200
+    When user "participant1" removes themselves from room "own one-to-one room" with 200 (v4)
+    When user "participant2" removes themselves from room "own one-to-one room" with 200 (v4)
     And user "participant1" is not participant of room "own one-to-one room" (v4)
     And user "participant2" is not participant of room "own one-to-one room" (v4)
     Then user "participant1" gets last share
diff --git a/tests/integration/features/sharing/update.feature b/tests/integration/features/sharing/update.feature
index 73107495a..6f5b6e0f0 100644
--- a/tests/integration/features/sharing/update.feature
+++ b/tests/integration/features/sharing/update.feature
@@ -663,7 +663,7 @@ Feature: update
     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" 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
+    And user "participant1" removes "participant2" from room "group room no longer invited to" with 200 (v4)
     When user "participant2" updates last share with
       | permissions            | 1 |
       | expiration             | +3 days |
@@ -948,7 +948,7 @@ Feature: update
     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
-    And user "participant1" removes "participant2" from room "group room invited to" with 200
+    And user "participant1" removes "participant2" from room "group room invited to" with 200 (v4)
     When user "participant2" updates last share with
       | permissions            | 1 |
       | expireDate             | +3 days |