Make leaving a room API v4

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

15 files changed, 73 insertions, 73 deletions

diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index a544f124a..adcc47e8a 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -689,14 +689,14 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" leaves room "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" leaves room "([^"]*)" with (\d+) \((v4)\)$/
 	 *
 	 * @param string $user
 	 * @param string $identifier
-	 * @param string $statusCode
+	 * @param int $statusCode
 	 * @param string $apiVersion
 	 */
-	public function userExitsRoom($user, $identifier, $statusCode, $apiVersion = 'v1') {
+	public function userExitsRoom(string $user, string $identifier, int $statusCode, string $apiVersion) {
 		$this->setCurrentUser($user);
 		$this->sendRequest('DELETE', '/apps/spreed/api/' . $apiVersion . '/room/' . self::$identifierToToken[$identifier] . '/participants/active');
 		$this->assertStatusCode($this->response, $statusCode);
diff --git a/tests/integration/features/callapi/group.feature b/tests/integration/features/callapi/group.feature
index dc09d6273..08cd69bb7 100644
--- a/tests/integration/features/callapi/group.feature
+++ b/tests/integration/features/callapi/group.feature
@@ -41,13 +41,13 @@ Feature: callapi/group
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
     Then user "participant2" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
-    Then user "participant2" leaves room "room" with 200
+    Then user "participant2" leaves room "room" with 200 (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
 
@@ -73,7 +73,7 @@ Feature: callapi/group
     Then user "participant3" leaves call "room" with 404
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant3" leaves room "room" with 200
+    Then user "participant3" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
@@ -99,7 +99,7 @@ Feature: callapi/group
     Then user "guest" leaves call "room" with 404
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
-    Then user "guest" leaves room "room" with 200
+    Then user "guest" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
diff --git a/tests/integration/features/callapi/one-to-one.feature b/tests/integration/features/callapi/one-to-one.feature
index 7f0719a67..8f8698c2e 100644
--- a/tests/integration/features/callapi/one-to-one.feature
+++ b/tests/integration/features/callapi/one-to-one.feature
@@ -32,13 +32,13 @@ Feature: callapi/one-to-one
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
     Then user "participant2" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
-    Then user "participant2" leaves room "room" with 200
+    Then user "participant2" leaves room "room" with 200 (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
 
@@ -64,13 +64,13 @@ Feature: callapi/one-to-one
     Then user "participant3" leaves call "room" with 404
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant3" leaves room "room" with 200
+    Then user "participant3" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
 
@@ -95,13 +95,13 @@ Feature: callapi/one-to-one
     Then user "guest" leaves call "room" with 404
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
-    Then user "guest" leaves room "room" with 200
+    Then user "guest" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
 
diff --git a/tests/integration/features/callapi/password.feature b/tests/integration/features/callapi/password.feature
index 9c08e521d..1b6c389d7 100644
--- a/tests/integration/features/callapi/password.feature
+++ b/tests/integration/features/callapi/password.feature
@@ -62,13 +62,13 @@ Feature: callapi/public
     Then user "participant3" leaves call "room" with 404
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant3" leaves room "room" with 200
+    Then user "participant3" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
 
@@ -97,13 +97,13 @@ Feature: callapi/public
     Then user "participant3" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 1 peers in call "room" with 200
-    Then user "participant3" leaves room "room" with 200
+    Then user "participant3" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
 
@@ -158,12 +158,12 @@ Feature: callapi/public
     Then user "guest" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 1 peers in call "room" with 200
-    Then user "guest" leaves room "room" with 200
+    Then user "guest" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     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 bc392f59d..479379a32 100644
--- a/tests/integration/features/callapi/public.feature
+++ b/tests/integration/features/callapi/public.feature
@@ -33,13 +33,13 @@ Feature: callapi/public
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant2" sees 1 peers in call "room" with 200
     Then user "participant2" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
-    Then user "participant2" leaves room "room" with 200
+    Then user "participant2" leaves room "room" with 200 (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant2" sees 0 peers in call "room" with 200
 
@@ -66,13 +66,13 @@ Feature: callapi/public
     Then user "participant3" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 1 peers in call "room" with 200
-    Then user "participant3" leaves room "room" with 200
+    Then user "participant3" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "participant3" sees 0 peers in call "room" with 404
 
@@ -98,12 +98,12 @@ Feature: callapi/public
     Then user "guest" leaves call "room" with 200
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 1 peers in call "room" with 200
-    Then user "guest" leaves room "room" with 200
+    Then user "guest" leaves room "room" with 200 (v4)
     Then user "participant1" sees 1 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
     Then user "participant1" leaves call "room" with 200
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees 0 peers in call "room" with 200
     And user "guest" sees 0 peers in call "room" with 404
diff --git a/tests/integration/features/chat/mentions.feature b/tests/integration/features/chat/mentions.feature
index d6ed8d012..db12287b7 100644
--- a/tests/integration/features/chat/mentions.feature
+++ b/tests/integration/features/chat/mentions.feature
@@ -532,5 +532,5 @@ Feature: chat/mentions
     And user "participant1" is participant of room "file last share room" (v4)
     And user "participant3" is participant of room "file last share room" (v4)
     When user "participant1" sends message "hi @participant3" to room "file last share room" with 201
-    And user "participant3" leaves room "file last share room" with 200
+    And user "participant3" leaves room "file last share room" with 200 (v4)
     Then user "participant3" is not participant of room "file last share room" (v4)
diff --git a/tests/integration/features/command/active-calls.feature b/tests/integration/features/command/active-calls.feature
index 8dcedc818..df8eab81c 100644
--- a/tests/integration/features/command/active-calls.feature
+++ b/tests/integration/features/command/active-calls.feature
@@ -18,7 +18,7 @@ Feature: create
     Then the command was successful
     And the command output contains the text "No calls in progress"
 
-    Then user "participant1" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
 
 
   Scenario: Call in progress
@@ -35,7 +35,7 @@ Feature: create
     And the command output contains the text "There are currently 1 calls in progress with 1 participants"
 
     Then user "participant1" leaves call "room" with 200
-    And user "participant1" leaves room "room" with 200
+    And user "participant1" leaves room "room" with 200 (v4)
 
     Given invoking occ with "talk:active-calls"
     Then the command was successful
diff --git a/tests/integration/features/conversation/files.feature b/tests/integration/features/conversation/files.feature
index 7520f406e..adb9a9e48 100644
--- a/tests/integration/features/conversation/files.feature
+++ b/tests/integration/features/conversation/files.feature
@@ -320,7 +320,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" leaves room "file welcome (2).txt room" with 200
+    When user "participant1" leaves room "file welcome (2).txt room" with 200 (v4)
     Then user "participant1" is participant of room "file welcome (2).txt room" (v4)
 
   Scenario: user with access to a file is not removed from its room after leaving it
@@ -331,7 +331,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" leaves room "file welcome.txt room" with 200
+    When user "participant2" leaves room "file welcome.txt room" with 200 (v4)
     Then user "participant2" is participant of room "file welcome.txt room" (v4)
 
 
@@ -341,7 +341,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" leaves room "file last share room" with 200
+    When user "participant1" leaves room "file last share room" with 200 (v4)
     Then user "participant1" is participant of room "file last share room" (v4)
 
   Scenario: user with access to a file shared by link is not removed from its room after leaving it
@@ -351,7 +351,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" leaves room "file last share room" with 200
+    When user "participant2" leaves room "file last share room" with 200 (v4)
     Then user "participant2" is participant of room "file last share room" (v4)
 
   Scenario: user without access to a file shared by link is removed from its room after leaving it
@@ -363,7 +363,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" leaves room "file last share room" with 200
+    When user "participant2" leaves room "file last share room" with 200 (v4)
     Then user "participant2" is not participant of room "file last share room" (v4)
 
   Scenario: guest is removed from the room of a file shared by link after leaving it
@@ -371,7 +371,7 @@ Feature: conversation/files
     And user "guest" gets the room for last share with 200 (v1)
     And user "guest" joins room "file last share room" with 200 (v4)
     And user "guest" is participant of room "file last share room" (v4)
-    When user "guest" leaves room "file last share room" with 200
+    When user "guest" leaves room "file last share room" with 200 (v4)
     And user "guest" is not participant of room "file last share room" (v4)
 
 
@@ -452,7 +452,7 @@ Feature: conversation/files
     And user "participant2" accepts last share
     And user "participant1" gets the room for path "welcome.txt" with 200 (v1)
     And user "participant1" joins room "file welcome.txt room" with 200 (v4)
-    And user "participant1" leaves room "file welcome.txt room" with 200
+    And user "participant1" leaves room "file welcome.txt room" with 200 (v4)
     And user "participant1" is participant of room "file welcome.txt room" (v4)
     When user "participant1" deletes last share
     Then user "participant1" is participant of room "file welcome.txt room" (v4)
@@ -464,7 +464,7 @@ Feature: conversation/files
     And user "participant2" accepts last share
     And user "participant2" gets the room for path "welcome (2).txt" with 200 (v1)
     And user "participant2" joins room "file welcome (2).txt room" with 200 (v4)
-    And user "participant2" leaves room "file welcome (2).txt room" with 200
+    And user "participant2" leaves room "file welcome (2).txt room" with 200 (v4)
     And user "participant2" is participant of room "file welcome (2).txt room" (v4)
     When user "participant1" deletes last share
     Then user "participant2" is participant of room "file welcome (2).txt room" (v4)
@@ -477,7 +477,7 @@ Feature: conversation/files
     Given user "participant1" shares "welcome.txt" by link with OCS 100
     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" leaves room "file last share room" with 200
+    And user "participant1" leaves room "file last share room" with 200 (v4)
     And user "participant1" is participant of room "file last share room" (v4)
     When user "participant1" deletes last share
     Then user "participant1" is participant of room "file last share room" (v4)
@@ -490,7 +490,7 @@ Feature: conversation/files
     And user "participant1" shares "welcome.txt" by link with OCS 100
     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" leaves room "file last share room" with 200
+    And user "participant2" leaves room "file last share room" with 200 (v4)
     And user "participant2" is participant of room "file last share room" (v4)
     When user "participant1" deletes last share
     Then user "participant2" is participant of room "file last share room" (v4)
@@ -507,7 +507,7 @@ Feature: conversation/files
     And user "participant2" logs in
     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" leaves room "file last share room" with 200
+    And user "participant2" leaves room "file last share room" with 200 (v4)
     And user "participant2" is not participant of room "file last share room" (v4)
     When user "participant1" deletes last share
     Then user "participant2" is not participant of room "file last share room" (v4)
@@ -518,7 +518,7 @@ Feature: conversation/files
     Given user "participant1" shares "welcome.txt" by link with OCS 100
     And user "guest" gets the room for last share with 200 (v1)
     And user "guest" joins room "file last share room" with 200 (v4)
-    And user "guest" leaves room "file last share room" with 200
+    And user "guest" leaves room "file last share room" with 200 (v4)
     When user "participant1" deletes last share
     Then user "guest" is not participant of room "file last share room" (v4)
     And user "guest" joins room "file last share room" with 404 (v4)
diff --git a/tests/integration/features/conversation/join-leave.feature b/tests/integration/features/conversation/join-leave.feature
index e6f4f0a4d..36973fcae 100644
--- a/tests/integration/features/conversation/join-leave.feature
+++ b/tests/integration/features/conversation/join-leave.feature
@@ -24,8 +24,8 @@ Feature: conversation/join-leave
       | invite   | participant2 |
     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
-    And user "participant2" leaves room "room" with 200
+    When user "participant1" leaves room "room" with 200 (v4)
+    And user "participant2" leaves room "room" with 200 (v4)
     Then user "participant1" is participant of room "room" (v4)
     And user "participant2" is participant of room "room" (v4)
 
@@ -52,8 +52,8 @@ Feature: conversation/join-leave
     And user "participant1" adds "participant2" to room "room" with 200
     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
-    And user "participant2" leaves room "room" with 200
+    When user "participant1" leaves room "room" with 200 (v4)
+    And user "participant2" leaves room "room" with 200 (v4)
     Then user "participant1" is participant of room "room" (v4)
     And user "participant2" is participant of room "room" (v4)
 
@@ -82,10 +82,10 @@ Feature: conversation/join-leave
     And user "participant2" joins room "room" with 200 (v4)
     And user "participant3" joins room "room" with 200 (v4)
     And user "guest" joins room "room" with 200 (v4)
-    When user "participant1" leaves room "room" with 200
-    And user "participant2" leaves room "room" with 200
-    And user "participant3" leaves room "room" with 200
-    And user "guest" leaves room "room" with 200
+    When user "participant1" leaves room "room" with 200 (v4)
+    And user "participant2" leaves room "room" with 200 (v4)
+    And user "participant3" leaves room "room" with 200 (v4)
+    And user "guest" leaves room "room" with 200 (v4)
     Then user "participant1" is participant of room "room" (v4)
     And user "participant2" is participant of room "room" (v4)
     And user "participant3" is not participant of room "room" (v4)
diff --git a/tests/integration/features/conversation/lobby.feature b/tests/integration/features/conversation/lobby.feature
index 6f37d957a..e23e6c6e8 100644
--- a/tests/integration/features/conversation/lobby.feature
+++ b/tests/integration/features/conversation/lobby.feature
@@ -196,12 +196,12 @@ Feature: conversation/lobby
     And user "participant1" promotes "guest" in room "room" with 200
     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
-    And user "participant2" leaves room "room" with 200
-    And user "participant3" leaves room "room" with 200
-    And user "participant4" leaves room "room" with 200
-    And user "guest" leaves room "room" with 200
-    And user "guest2" leaves room "room" with 200
+    Then user "participant1" leaves room "room" with 200 (v4)
+    And user "participant2" leaves room "room" with 200 (v4)
+    And user "participant3" leaves room "room" with 200 (v4)
+    And user "participant4" leaves room "room" with 200 (v4)
+    And user "guest" leaves room "room" with 200 (v4)
+    And user "guest2" leaves 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/password-request.feature b/tests/integration/features/conversation/password-request.feature
index 602567c9a..365f3b520 100644
--- a/tests/integration/features/conversation/password-request.feature
+++ b/tests/integration/features/conversation/password-request.feature
@@ -131,7 +131,7 @@ Feature: conversation/password-request
     And user "guest" creates the password request room for last share with 201 (v1)
     And user "guest" joins room "password request for last share room" with 200 (v4)
     And user "participant1" joins room "password request for last share room" with 200 (v4)
-    When user "guest" leaves room "password request for last share room" with 200
+    When user "guest" leaves room "password request for last share room" with 200 (v4)
     Then user "participant1" is not participant of room "password request for last share room" (v4)
     And user "guest" is not participant of room "password request for last share room" (v4)
 
@@ -142,7 +142,7 @@ Feature: conversation/password-request
     And user "participant2" creates the password request room for last share with 201 (v1)
     And user "participant2" joins room "password request for last share room" with 200 (v4)
     And user "participant1" joins room "password request for last share room" with 200 (v4)
-    When user "participant2" leaves room "password request for last share room" with 200
+    When user "participant2" leaves room "password request for last share room" with 200 (v4)
     Then user "participant1" is not participant of room "password request for last share room" (v4)
     And user "participant2" is not participant of room "password request for last share room" (v4)
 
@@ -153,7 +153,7 @@ Feature: conversation/password-request
     And user "guest" creates the password request room for last share with 201 (v1)
     And user "guest" joins room "password request for last share room" with 200 (v4)
     And user "participant1" joins room "password request for last share room" with 200 (v4)
-    When user "participant1" leaves room "password request for last share room" with 200
+    When user "participant1" leaves room "password request for last share room" with 200 (v4)
     Then user "participant1" is not participant of room "password request for last share room" (v4)
     And user "guest" is not participant of room "password request for last share room" (v4)
 
diff --git a/tests/integration/features/conversation/set-password.feature b/tests/integration/features/conversation/set-password.feature
index 7837d8fed..ce63d7f03 100644
--- a/tests/integration/features/conversation/set-password.feature
+++ b/tests/integration/features/conversation/set-password.feature
@@ -15,7 +15,7 @@ Feature: public
     Then user "participant3" joins room "room" with 403 (v4)
     Then user "participant3" joins room "room" with 200 (v4)
       | password | foobar |
-    And user "participant3" leaves room "room" with 200
+    And user "participant3" leaves room "room" with 200 (v4)
     When user "participant1" sets password "" for room "room" with 200
     Then user "participant3" joins room "room" with 200 (v4)
 
@@ -32,7 +32,7 @@ Feature: public
     Then user "participant3" joins room "room" with 403 (v4)
     Then user "participant3" joins room "room" with 200 (v4)
       | password | foobar |
-    And user "participant3" leaves room "room" with 200
+    And user "participant3" leaves room "room" with 200 (v4)
     When user "participant2" sets password "" for room "room" with 200
     Then user "participant3" joins room "room" with 200 (v4)
 
@@ -46,12 +46,12 @@ Feature: public
     And user "participant1" adds "participant2" to room "room" with 200
     When user "participant2" sets password "foobar" for room "room" with 403
     Then user "participant3" joins room "room" with 200 (v4)
-    And user "participant3" leaves room "room" with 200
+    And user "participant3" leaves room "room" with 200 (v4)
     When user "participant1" sets password "foobar" for room "room" with 200
     Then user "participant3" joins room "room" with 403 (v4)
     Then user "participant3" joins room "room" with 200 (v4)
       | password | foobar |
-    And user "participant3" leaves room "room" with 200
+    And user "participant3" leaves room "room" with 200 (v4)
     When user "participant2" sets password "" for room "room" with 403
     Then user "participant3" joins room "room" with 403 (v4)
 
@@ -64,11 +64,11 @@ Feature: public
       | room | 3    | 1               |
     When user "participant2" sets password "foobar" for room "room" with 404
     Then user "participant3" joins room "room" with 200 (v4)
-    And user "participant3" leaves room "room" with 200
+    And user "participant3" leaves room "room" with 200 (v4)
     When user "participant1" sets password "foobar" for room "room" with 200
     Then user "participant3" joins room "room" with 403 (v4)
     Then user "participant3" joins room "room" with 200 (v4)
       | password | foobar |
-    And user "participant3" leaves room "room" with 200
+    And user "participant3" leaves room "room" with 200 (v4)
     When user "participant2" sets password "" for room "room" with 404
     Then user "participant3" joins room "room" with 403 (v4)
diff --git a/tests/integration/features/sharing/create.feature b/tests/integration/features/sharing/create.feature
index db1f3baff..353088bca 100644
--- a/tests/integration/features/sharing/create.feature
+++ b/tests/integration/features/sharing/create.feature
@@ -306,7 +306,7 @@ Feature: create
       | roomType | 3 |
       | roomName | room |
     And user "participant1" joins room "public room no longer joined to" with 200 (v4)
-    And user "participant1" leaves room "public room no longer joined to" with 200
+    And user "participant1" leaves room "public room no longer joined to" with 200 (v4)
     When user "participant1" shares "welcome.txt" with room "public room no longer joined 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 36b8d1031..e4856fa6c 100644
--- a/tests/integration/features/sharing/hooks.feature
+++ b/tests/integration/features/sharing/hooks.feature
@@ -80,7 +80,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 "participant2" shares "welcome.txt" with room "group room" with OCS 100
-    When user "participant2" leaves room "group room" with 200
+    When user "participant2" leaves room "group room" with 200 (v4)
     Then user "participant1" gets last share
     And share is returned with
       | uid_owner              | participant2 |
@@ -111,7 +111,7 @@ Feature: hooks
     And user "participant1" renames room "public room" to "Public room" with 200
     And user "participant1" adds "participant2" to room "public room" with 200
     And user "participant2" shares "welcome.txt" with room "public room" with OCS 100
-    When user "participant2" leaves room "public room" with 200
+    When user "participant2" leaves room "public room" with 200 (v4)
     Then user "participant1" gets last share
     And share is returned with
       | uid_owner              | participant2 |
@@ -143,7 +143,7 @@ Feature: hooks
       | roomName | room |
     And user "participant2" joins 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
+    When user "participant2" leaves room "public room" with 200 (v4)
     Then user "participant1" gets last share
     And the OCS status code should be "404"
     And user "participant2" gets last share
@@ -324,7 +324,7 @@ Feature: hooks
     And user "participant1" renames room "public room" to "Public room" with 200
     And user "participant2" joins room "public room" with 200 (v4)
     And user "participant1" shares "welcome.txt" with room "public room" with OCS 100
-    When user "participant2" leaves room "public room" with 200
+    When user "participant2" leaves room "public room" with 200 (v4)
     Then user "participant1" gets last share
     And share is returned with
       | uid_owner              | participant1 |
@@ -348,7 +348,7 @@ Feature: hooks
     And user "participant2" joins room "public room" with 200 (v4)
     And user "participant1" shares "welcome.txt" with room "public room" with OCS 100
     And user "participant2" moves file "welcome (2).txt" to "renamed.txt"
-    When user "participant2" leaves room "public room" with 200
+    When user "participant2" leaves room "public room" with 200 (v4)
     Then user "participant1" gets last share
     And share is returned with
       | uid_owner              | participant1 |
@@ -478,7 +478,7 @@ Feature: hooks
       | roomName | room |
     And user "participant1" joins room "public room" with 200 (v4)
     And user "participant1" shares "welcome.txt" with room "public room" with OCS 100
-    And user "participant1" leaves room "public room" with 200
+    And user "participant1" leaves room "public room" with 200 (v4)
     When user "participant1" joins room "public room" with 200 (v4)
     Then user "participant1" gets all shares
     And the list of returned shares has 0 shares
@@ -631,7 +631,7 @@ Feature: hooks
     And user "participant1" renames room "public room" to "Public room" with 200
     And user "participant2" joins room "public room" with 200 (v4)
     And user "participant1" shares "welcome.txt" with room "public room" with OCS 100
-    And user "participant2" leaves room "public room" with 200
+    And user "participant2" leaves room "public room" with 200 (v4)
     When user "participant2" joins room "public room" with 200 (v4)
     Then user "participant2" gets all received shares
     And the list of returned shares has 1 shares
@@ -655,7 +655,7 @@ Feature: hooks
     And user "participant2" joins room "public room" with 200 (v4)
     And user "participant1" shares "welcome.txt" with room "public room" with OCS 100
     And user "participant2" moves file "welcome (2).txt" to "renamed.txt"
-    And user "participant2" leaves room "public room" with 200
+    And user "participant2" leaves room "public room" with 200 (v4)
     When user "participant2" joins room "public room" with 200 (v4)
     Then user "participant2" gets all received shares
     And the list of returned shares has 1 shares
diff --git a/tests/integration/features/sharing/update.feature b/tests/integration/features/sharing/update.feature
index f45a12eb4..73107495a 100644
--- a/tests/integration/features/sharing/update.feature
+++ b/tests/integration/features/sharing/update.feature
@@ -853,7 +853,7 @@ Feature: update
     And user "participant2" joins room "public room no longer joined to" with 200 (v4)
     And user "participant3" joins room "public room no longer joined to" with 200 (v4)
     And user "participant1" shares "welcome.txt" with room "public room no longer joined to" with OCS 100
-    And user "participant2" leaves room "public room no longer joined to" with 200
+    And user "participant2" leaves room "public room no longer joined to" with 200 (v4)
     When user "participant2" updates last share with
       | permissions            | 1 |
       | expiration             | +3 days |