Move call API to v4

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

12 files changed, 364 insertions, 364 deletions

diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index 47e8a2ce6..b88c90ec5 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -985,15 +985,15 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" joins call "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" joins call "([^"]*)" with (\d+) \((v4)\)$/
 	 *
 	 * @param string $user
 	 * @param string $identifier
-	 * @param string $statusCode
+	 * @param int $statusCode
 	 * @param string $apiVersion
 	 * @param TableNode|null $formData
 	 */
-	public function userJoinsCall($user, $identifier, $statusCode, $apiVersion = 'v1', TableNode $formData = null) {
+	public function userJoinsCall(string $user, string $identifier, int $statusCode, string $apiVersion, TableNode $formData = null) {
 		$this->setCurrentUser($user);
 		$this->sendRequest(
 			'POST', '/apps/spreed/api/' . $apiVersion . '/call/' . self::$identifierToToken[$identifier],
@@ -1013,29 +1013,29 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" leaves call "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" leaves call "([^"]*)" with (\d+) \((v4)\)$/
 	 *
 	 * @param string $user
 	 * @param string $identifier
-	 * @param string $statusCode
+	 * @param int $statusCode
 	 * @param string $apiVersion
 	 */
-	public function userLeavesCall($user, $identifier, $statusCode, $apiVersion = 'v1') {
+	public function userLeavesCall(string $user, string $identifier, int $statusCode, string $apiVersion) {
 		$this->setCurrentUser($user);
 		$this->sendRequest('DELETE', '/apps/spreed/api/' . $apiVersion . '/call/' . self::$identifierToToken[$identifier]);
 		$this->assertStatusCode($this->response, $statusCode);
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" sees (\d+) peers in call "([^"]*)" with (\d+)(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" sees (\d+) peers in call "([^"]*)" with (\d+) \((v4)\)$/
 	 *
 	 * @param string $user
-	 * @param string $numPeers
+	 * @param int $numPeers
 	 * @param string $identifier
-	 * @param string $statusCode
+	 * @param int $statusCode
 	 * @param string $apiVersion
 	 */
-	public function userSeesPeersInCall($user, $numPeers, $identifier, $statusCode, $apiVersion = 'v1') {
+	public function userSeesPeersInCall(string $user, int $numPeers, string $identifier, int $statusCode, string $apiVersion) {
 		$this->setCurrentUser($user);
 		$this->sendRequest('GET', '/apps/spreed/api/' . $apiVersion . '/call/' . self::$identifierToToken[$identifier]);
 		$this->assertStatusCode($this->response, $statusCode);
diff --git a/tests/integration/features/callapi/group-read-only.feature b/tests/integration/features/callapi/group-read-only.feature
index 0c4a6801d..74d77975f 100644
--- a/tests/integration/features/callapi/group-read-only.feature
+++ b/tests/integration/features/callapi/group-read-only.feature
@@ -12,17 +12,17 @@ Feature: callapi/group-read-only
       | invite   | attendees1 |
     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
-    And user "participant2" sees 0 peers in call "room" with 200
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
     When user "participant1" locks room "room" with 200 (v4)
     And user "participant1" joins room "room" with 200 (v4)
-    And user "participant1" joins call "room" with 403
+    And user "participant1" joins call "room" with 403 (v4)
     And user "participant2" joins room "room" with 200 (v4)
-    And user "participant2" joins call "room" with 403
-    Then user "participant1" sees 0 peers in call "room" with 403
-    And user "participant2" sees 0 peers in call "room" with 403
+    And user "participant2" joins call "room" with 403 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 403 (v4)
+    And user "participant2" sees 0 peers in call "room" with 403 (v4)
     When user "participant1" unlocks room "room" with 200 (v4)
-    And user "participant1" joins call "room" with 200
-    And user "participant2" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "participant2" sees 2 peers in call "room" with 200
+    And user "participant1" joins call "room" with 200 (v4)
+    And user "participant2" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "participant2" sees 2 peers in call "room" with 200 (v4)
diff --git a/tests/integration/features/callapi/group.feature b/tests/integration/features/callapi/group.feature
index 08cd69bb7..eb87bc518 100644
--- a/tests/integration/features/callapi/group.feature
+++ b/tests/integration/features/callapi/group.feature
@@ -17,39 +17,39 @@ Feature: callapi/group
       | invite   | attendees1 |
     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
-    And user "participant2" sees 0 peers in call "room" with 200
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins call "room" with 200
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
       | flags | 1 |
-    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" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
     Then user "participant1" is participant of the following rooms (v4)
       | id   | type | callFlag |
       | room | 2    | 1        |
     Then user "participant2" joins 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
-    And user "participant2" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "participant2" sees 2 peers in call "room" with 200
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "participant2" sees 2 peers in call "room" with 200 (v4)
     Then user "participant1" is participant of the following rooms (v4)
       | id   | type | callFlag |
       | room | 2    | 7        |
-    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 call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
     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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
+    Then user "participant2" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
     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
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
 
   Scenario: User1 invites group attendees1 to a group room and user3 can't do anything
     When user "participant1" creates room "room" (v4)
@@ -57,51 +57,51 @@ Feature: callapi/group
       | invite   | attendees1 |
     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
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins call "room" with 200
-    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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     And user "participant3" joins room "room" with 404 (v4)
-    Then user "participant1" sees 1 peers in call "room" with 200
-    And user "participant3" sees 0 peers in call "room" with 404
-    And user "participant3" joins 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 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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    And user "participant3" joins call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant3" leaves call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     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" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
 
   Scenario: User1 invites group attendees1 to a group room and guest can't do anything
     When user "participant1" creates room "room" (v4)
       | roomType | 2 |
       | invite   | attendees1 |
     Then user "participant1" is participant of room "room" (v4)
-    And user "guest" sees 0 peers in call "room" with 404
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins room "room" with 200 (v4)
-    Then user "participant1" joins call "room" with 200
-    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" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     And user "guest" joins room "room" with 404 (v4)
-    Then user "participant1" sees 1 peers in call "room" with 200
-    And user "guest" sees 0 peers in call "room" with 404
-    And user "guest" joins 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 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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    And user "guest" joins call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    Then user "guest" leaves call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     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" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
diff --git a/tests/integration/features/callapi/one-to-one.feature b/tests/integration/features/callapi/one-to-one.feature
index 4d2fd33eb..75415b0e2 100644
--- a/tests/integration/features/callapi/one-to-one.feature
+++ b/tests/integration/features/callapi/one-to-one.feature
@@ -15,32 +15,32 @@ Feature: callapi/one-to-one
       | invite   | participant2 |
     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
-    And user "participant2" sees 0 peers in call "room" with 200
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins 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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
     And user "participant2" joins 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
-    And user "participant2" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "participant2" sees 2 peers in call "room" with 200
-    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" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "participant2" sees 2 peers in call "room" with 200 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
     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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
+    Then user "participant2" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
     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
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
 
   Scenario: User1 invites user2 to a one2one room and user3 can't do anything
     When user "participant1" creates room "room" (v4)
@@ -48,62 +48,62 @@ Feature: callapi/one-to-one
       | invite   | participant2 |
     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
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins call "room" with 200
-    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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     And user "participant3" joins room "room" with 404 (v4)
-    Then user "participant1" sees 1 peers in call "room" with 200
-    And user "participant3" sees 0 peers in call "room" with 404
-    And user "participant3" joins 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 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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    And user "participant3" joins call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant3" leaves call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     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" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     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
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
 
   Scenario: User1 invites user2 to a one2one room and guest can't do anything
     When user "participant1" creates room "room" (v4)
       | roomType | 1 |
       | invite   | participant2 |
     Then user "participant1" is participant of room "room" (v4)
-    And user "guest" sees 0 peers in call "room" with 404
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins call "room" with 200
-    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" sees 0 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     And user "guest" joins room "room" with 404 (v4)
-    Then user "participant1" sees 1 peers in call "room" with 200
-    And user "guest" sees 0 peers in call "room" with 404
-    And user "guest" joins 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 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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    And user "guest" joins call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    Then user "guest" leaves call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     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" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     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
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
 
   Scenario: Sending a message into a one-to-one chat re-adds the participants
     Given user "participant1" creates room "room" (v4)
@@ -115,10 +115,10 @@ Feature: callapi/one-to-one
     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)
-    Then user "participant1" sees 0 peers in call "room" with 404
-    And user "participant2" sees 0 peers in call "room" with 200
-    When user "participant2" joins call "room" with 200
+    Then user "participant1" sees 0 peers in call "room" with 404 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
+    When user "participant2" joins call "room" with 200 (v4)
     Then user "participant1" is participant of room "room" (v4)
-    And user "participant1" sees 1 peers in call "room" with 200
-    And user "participant2" sees 1 peers in call "room" with 200
+    And user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
 
diff --git a/tests/integration/features/callapi/password.feature b/tests/integration/features/callapi/password.feature
index c89d66bd9..6125cdfbb 100644
--- a/tests/integration/features/callapi/password.feature
+++ b/tests/integration/features/callapi/password.feature
@@ -17,26 +17,26 @@ Feature: callapi/public
     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
-    And user "participant2" sees 0 peers in call "room" with 200
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins 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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
     And user "participant2" joins 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
-    And user "participant2" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "participant2" sees 2 peers in call "room" with 200
-    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 "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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "participant2" sees 2 peers in call "room" with 200 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
+    Then user "participant2" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
 
   Scenario: User1 invites user2 to a public room and user3 can not join without password
     When user "participant1" creates room "room" (v4)
@@ -46,31 +46,31 @@ Feature: callapi/public
     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
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins call "room" with 200
-    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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     And user "participant3" joins room "room" with 403 (v4)
-    Then user "participant1" sees 1 peers in call "room" with 200
-    And user "participant3" sees 0 peers in call "room" with 404
-    And user "participant3" joins 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 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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    And user "participant3" joins call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant3" leaves call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     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" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     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
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
 
   Scenario: User1 invites user2 to a public room and user3 can join with password
     When user "participant1" creates room "room" (v4)
@@ -80,32 +80,32 @@ Feature: callapi/public
     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
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins call "room" with 200
-    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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     And user "participant3" joins room "room" with 200 (v4)
       | password | foobar |
-    Then user "participant1" sees 1 peers in call "room" with 200
-    And user "participant3" sees 1 peers in call "room" with 200
-    And user "participant3" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "participant3" sees 2 peers in call "room" with 200
-    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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "participant3" sees 2 peers in call "room" with 200 (v4)
+    Then user "participant3" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 1 peers in call "room" with 200 (v4)
     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" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     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
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
 
   Scenario: User1 invites user2 to a public room and guest can not join without password
     When user "participant1" creates room "room" (v4)
@@ -114,25 +114,25 @@ Feature: callapi/public
     And user "participant1" sets password "foobar" for room "room" with 200 (v4)
     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
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins call "room" with 200
-    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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     And user "guest" joins room "room" with 403 (v4)
-    Then user "participant1" sees 1 peers in call "room" with 200
-    And user "guest" sees 0 peers in call "room" with 404
-    And user "guest" joins 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 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 "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" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    And user "guest" joins call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    Then user "guest" leaves call "room" with 404 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
 
   Scenario: User1 invites user2 to a public room and guest can join with password
     When user "participant1" creates room "room" (v4)
@@ -141,29 +141,29 @@ Feature: callapi/public
     And user "participant1" sets password "foobar" for room "room" with 200 (v4)
     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
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins call "room" with 200
-    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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     And user "guest" joins room "room" with 200 (v4)
       | password | foobar |
-    Then user "participant1" sees 1 peers in call "room" with 200
-    And user "guest" sees 1 peers in call "room" with 200
-    And user "guest" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "guest" sees 2 peers in call "room" with 200
-    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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "guest" sees 2 peers in call "room" with 200 (v4)
+    Then user "guest" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 1 peers in call "room" with 200 (v4)
     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" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     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
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
diff --git a/tests/integration/features/callapi/public-read-only.feature b/tests/integration/features/callapi/public-read-only.feature
index 61cf2fce2..15b3ce76e 100644
--- a/tests/integration/features/callapi/public-read-only.feature
+++ b/tests/integration/features/callapi/public-read-only.feature
@@ -11,20 +11,20 @@ Feature: callapi/public-read-only
     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
-    And user "participant2" sees 0 peers in call "room" with 200
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
     When user "participant1" locks room "room" with 200 (v4)
     And user "participant1" joins room "room" with 200 (v4)
-    And user "participant1" joins call "room" with 403
+    And user "participant1" joins call "room" with 403 (v4)
     And user "participant2" joins room "room" with 200 (v4)
-    And user "participant2" joins call "room" with 403
-    Then user "participant1" sees 0 peers in call "room" with 403
-    And user "participant2" sees 0 peers in call "room" with 403
+    And user "participant2" joins call "room" with 403 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 403 (v4)
+    And user "participant2" sees 0 peers in call "room" with 403 (v4)
     When user "participant1" unlocks room "room" with 200 (v4)
-    And user "participant1" joins call "room" with 200
-    And user "participant2" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "participant2" sees 2 peers in call "room" with 200
+    And user "participant1" joins call "room" with 200 (v4)
+    And user "participant2" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "participant2" sees 2 peers in call "room" with 200 (v4)
 
   Scenario: User1 invites user2 to a public room and user3 cant join the call in a locked conversation
     When user "participant1" creates room "room" (v4)
@@ -35,16 +35,16 @@ Feature: callapi/public-read-only
     Then user "participant3" is not participant of room "room" (v4)
     When user "participant1" locks room "room" with 200 (v4)
     And user "participant1" joins room "room" with 200 (v4)
-    And user "participant1" joins call "room" with 403
+    And user "participant1" joins call "room" with 403 (v4)
     And user "participant3" joins room "room" with 200 (v4)
-    And user "participant3" joins call "room" with 403
-    Then user "participant1" sees 0 peers in call "room" with 403
-    And user "participant3" sees 0 peers in call "room" with 403
+    And user "participant3" joins call "room" with 403 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 403 (v4)
+    And user "participant3" sees 0 peers in call "room" with 403 (v4)
     When user "participant1" unlocks room "room" with 200 (v4)
-    And user "participant1" joins call "room" with 200
-    And user "participant3" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "participant3" sees 2 peers in call "room" with 200
+    And user "participant1" joins call "room" with 200 (v4)
+    And user "participant3" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "participant3" sees 2 peers in call "room" with 200 (v4)
 
   Scenario: User1 invites user2 to a public room and guest cant join the call in a locked conversation
     When user "participant1" creates room "room" (v4)
@@ -53,17 +53,17 @@ Feature: callapi/public-read-only
     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
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins room "room" with 200 (v4)
-    Then user "participant1" joins call "room" with 403
+    Then user "participant1" joins call "room" with 403 (v4)
     Then user "guest" joins room "room" with 200 (v4)
-    And user "guest" joins call "room" with 403
-    Then user "participant1" sees 0 peers in call "room" with 403
-    And user "guest" sees 0 peers in call "room" with 403
+    And user "guest" joins call "room" with 403 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 403 (v4)
+    And user "guest" sees 0 peers in call "room" with 403 (v4)
     When user "participant1" unlocks room "room" with 200 (v4)
-    And user "participant1" sees 0 peers in call "room" with 200
-    And user "guest" sees 0 peers in call "room" with 200
-    Then user "participant1" joins call "room" with 200
-    And user "guest" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "guest" sees 2 peers in call "room" with 200
+    And user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 200 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    And user "guest" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "guest" sees 2 peers in call "room" with 200 (v4)
diff --git a/tests/integration/features/callapi/public.feature b/tests/integration/features/callapi/public.feature
index ab55a384a..2ae08a9f4 100644
--- a/tests/integration/features/callapi/public.feature
+++ b/tests/integration/features/callapi/public.feature
@@ -16,32 +16,32 @@ Feature: callapi/public
     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
-    And user "participant2" sees 0 peers in call "room" with 200
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins 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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
     Then user "participant2" joins 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
-    And user "participant2" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "participant2" sees 2 peers in call "room" with 200
-    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" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "participant2" sees 2 peers in call "room" with 200 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
     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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant2" sees 1 peers in call "room" with 200 (v4)
+    Then user "participant2" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
     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
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
 
   Scenario: User1 invites user2 to a public room and user3 can do everything
     When user "participant1" creates room "room" (v4)
@@ -50,31 +50,31 @@ Feature: callapi/public
     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
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins call "room" with 200
-    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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     Then user "participant3" joins room "room" with 200 (v4)
-    Then user "participant1" sees 1 peers in call "room" with 200
-    And user "participant3" sees 1 peers in call "room" with 200
-    And user "participant3" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "participant3" sees 2 peers in call "room" with 200
-    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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "participant3" sees 2 peers in call "room" with 200 (v4)
+    Then user "participant3" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 1 peers in call "room" with 200 (v4)
     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" sees 1 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
     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
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 404 (v4)
 
   Scenario: User1 invites user2 to a public room and guest can do everything
     When user "participant1" creates room "room" (v4)
@@ -82,28 +82,28 @@ Feature: callapi/public
       | roomName | room |
     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
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     Then user "participant1" joins 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
-    Then user "participant1" joins call "room" with 200
-    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" sees 0 peers in call "room" with 200 (v4)
+    And user "participant2" sees 0 peers in call "room" with 200 (v4)
+    Then user "participant1" joins call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     Then user "guest" joins room "room" with 200 (v4)
-    Then user "participant1" sees 1 peers in call "room" with 200
-    And user "guest" sees 1 peers in call "room" with 200
-    And user "guest" joins call "room" with 200
-    Then user "participant1" sees 2 peers in call "room" with 200
-    And user "guest" sees 2 peers in call "room" with 200
-    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 "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" joins call "room" with 200 (v4)
+    Then user "participant1" sees 2 peers in call "room" with 200 (v4)
+    And user "guest" sees 2 peers in call "room" with 200 (v4)
+    Then user "guest" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 1 peers in call "room" with 200 (v4)
     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" sees 1 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
+    Then user "participant1" leaves call "room" with 200 (v4)
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
     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
+    Then user "participant1" sees 0 peers in call "room" with 200 (v4)
+    And user "guest" sees 0 peers in call "room" with 404 (v4)
diff --git a/tests/integration/features/chat/group.feature b/tests/integration/features/chat/group.feature
index fd79229f9..255258450 100644
--- a/tests/integration/features/chat/group.feature
+++ b/tests/integration/features/chat/group.feature
@@ -36,7 +36,7 @@ Feature: chat/group
     Given user "participant1" creates room "group room" (v4)
       | roomType | 2 |
       | invite   | attendees1 |
-    And user "guest" joins call "group room" with 404
+    And user "guest" joins call "group room" with 404 (v4)
     When user "guest" sends message "Message 1" to room "group room" with 404
     And user "participant1" sends message "Message 2" to room "group room" with 201
     Then user "guest" sees the following messages in room "group room" with 404
diff --git a/tests/integration/features/chat/one-to-one.feature b/tests/integration/features/chat/one-to-one.feature
index 26835a863..d037536c2 100644
--- a/tests/integration/features/chat/one-to-one.feature
+++ b/tests/integration/features/chat/one-to-one.feature
@@ -34,7 +34,7 @@ Feature: chat/one-to-one
     Given user "participant1" creates room "one-to-one room" (v4)
       | roomType | 1 |
       | invite   | participant2 |
-    And user "guest" joins call "one-to-one room" with 404
+    And user "guest" joins call "one-to-one room" with 404 (v4)
     When user "guest" sends message "Message 1" to room "one-to-one room" with 404
     And user "participant1" sends message "Message 2" to room "one-to-one room" with 201
     Then user "guest" sees the following messages in room "one-to-one room" with 404
diff --git a/tests/integration/features/command/active-calls.feature b/tests/integration/features/command/active-calls.feature
index df8eab81c..c7ac37f0b 100644
--- a/tests/integration/features/command/active-calls.feature
+++ b/tests/integration/features/command/active-calls.feature
@@ -27,14 +27,14 @@ Feature: create
       | roomName | room |
 
     Then user "participant1" joins room "room" with 200 (v4)
-    And user "participant1" joins call "room" with 200
+    And user "participant1" joins call "room" with 200 (v4)
 
     Given invoking occ with "talk:active-calls"
     # It didn't really fail, it just has an exit code that is not 0
     Then the command failed with exit code 1
     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
+    Then user "participant1" leaves call "room" with 200 (v4)
     And user "participant1" leaves room "room" with 200 (v4)
 
     Given invoking occ with "talk:active-calls"
diff --git a/tests/integration/features/conversation/lobby.feature b/tests/integration/features/conversation/lobby.feature
index 18489dfc4..7e5b7cf33 100644
--- a/tests/integration/features/conversation/lobby.feature
+++ b/tests/integration/features/conversation/lobby.feature
@@ -165,21 +165,21 @@ Feature: conversation/lobby
     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
-    And user "participant2" joins call "room" with 200
-    And user "participant3" joins call "room" with 412
-    And user "participant4" joins call "room" with 412
-    And user "guest" joins call "room" with 200
-    And user "guest2" joins call "room" with 412
-    And user "participant1" sees 3 peers in call "room" with 200
-    And user "participant2" sees 3 peers in call "room" with 200
-    And user "participant3" sees 0 peers in call "room" with 412
-    And user "participant4" sees 0 peers in call "room" with 412
-    And user "guest" sees 3 peers in call "room" with 200
-    And user "guest2" sees 0 peers in call "room" with 412
-    And user "participant1" leaves call "room" with 200
-    And user "participant2" leaves call "room" with 200
-    And user "guest" leaves call "room" with 200
+    Then user "participant1" joins call "room" with 200 (v4)
+    And user "participant2" joins call "room" with 200 (v4)
+    And user "participant3" joins call "room" with 412 (v4)
+    And user "participant4" joins call "room" with 412 (v4)
+    And user "guest" joins call "room" with 200 (v4)
+    And user "guest2" joins call "room" with 412 (v4)
+    And user "participant1" sees 3 peers in call "room" with 200 (v4)
+    And user "participant2" sees 3 peers in call "room" with 200 (v4)
+    And user "participant3" sees 0 peers in call "room" with 412 (v4)
+    And user "participant4" sees 0 peers in call "room" with 412 (v4)
+    And user "guest" sees 3 peers in call "room" with 200 (v4)
+    And user "guest2" sees 0 peers in call "room" with 412 (v4)
+    And user "participant1" leaves call "room" with 200 (v4)
+    And user "participant2" leaves call "room" with 200 (v4)
+    And user "guest" leaves call "room" with 200 (v4)
 
   Scenario: lobby prevents some room actions for non moderators
     Given user "participant1" creates room "room" (v4)
diff --git a/tests/integration/features/conversation/password-request.feature b/tests/integration/features/conversation/password-request.feature
index 21f73db04..a9479691b 100644
--- a/tests/integration/features/conversation/password-request.feature
+++ b/tests/integration/features/conversation/password-request.feature
@@ -165,9 +165,9 @@ Feature: conversation/password-request
       | sendPasswordByTalk | true |
     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)
-    When user "guest" joins call "password request for last share room" with 200
-    Then user "guest" sees 1 peers in call "password request for last share room" with 200
-    And user "participant1" sees 1 peers in call "password request for last share room" with 200
+    When user "guest" joins call "password request for last share room" with 200 (v4)
+    Then user "guest" sees 1 peers in call "password request for last share room" with 200 (v4)
+    And user "participant1" sees 1 peers in call "password request for last share room" with 200 (v4)
 
   Scenario: owner can join a call
     Given user "participant1" shares "welcome.txt" by link with OCS 100
@@ -176,10 +176,10 @@ 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)
-    And user "guest" joins call "password request for last share room" with 200
-    When user "participant1" joins call "password request for last share room" with 200
-    Then user "guest" sees 2 peers in call "password request for last share room" with 200
-    And user "participant1" sees 2 peers in call "password request for last share room" with 200
+    And user "guest" joins call "password request for last share room" with 200 (v4)
+    When user "participant1" joins call "password request for last share room" with 200 (v4)
+    Then user "guest" sees 2 peers in call "password request for last share room" with 200 (v4)
+    And user "participant1" sees 2 peers in call "password request for last share room" with 200 (v4)