Small adjustments to listable feature after reviews

Co-authored-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Vincent Petry <vincent@nextcloud.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/features/bootstrap/FeatureContext.php
index d062de2de..e30bb97f7 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/features/bootstrap/FeatureContext.php
@@ -139,59 +139,59 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" cannot find any listed rooms(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" cannot find any listed rooms(?: \((v3)\))?$/
 	 *
 	 * @param string $user
 	 * @param string $apiVersion
 	 */
-	public function userCannotFindAnyListedRooms($user, $apiVersion = 'v1') {
+	public function userCannotFindAnyListedRooms($user, $apiVersion = 'v3') {
 		$this->userCanFindListedRoomsWithTerm($user, '', $apiVersion, null);
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" cannot find any listed rooms with (\d+)(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" cannot find any listed rooms with (\d+)(?: \((v3)\))?$/
 	 *
 	 * @param string $user
 	 * @param int $statusCode
 	 * @param string $apiVersion
 	 */
-	public function userCannotFindAnyListedRoomsWithStatus($user, $statusCode, $apiVersion = 'v1') {
+	public function userCannotFindAnyListedRoomsWithStatus($user, $statusCode, $apiVersion = 'v3') {
 		$this->setCurrentUser($user);
 		$this->sendRequest('GET', '/apps/spreed/api/' . $apiVersion . '/room');
 		$this->assertStatusCode($this->response, $statusCode);
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" cannot find any listed rooms with term "([^"]*)"(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" cannot find any listed rooms with term "([^"]*)"(?: \((v3)\))?$/
 	 *
 	 * @param string $user
 	 * @param string $term
 	 * @param string $apiVersion
 	 */
-	public function userCannotFindAnyListedRoomsWithTerm($user, $term, $apiVersion = 'v1') {
+	public function userCannotFindAnyListedRoomsWithTerm($user, $term, $apiVersion = 'v3') {
 		$this->userCanFindListedRoomsWithTerm($user, $term, $apiVersion, null);
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" can find listed rooms(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" can find listed rooms(?: \((v3)\))?$/
 	 *
 	 * @param string $user
 	 * @param string $apiVersion
 	 * @param TableNode|null $formData
 	 */
-	public function userCanFindListedRooms($user, $apiVersion = 'v1', TableNode $formData = null) {
+	public function userCanFindListedRooms($user, $apiVersion = 'v3', TableNode $formData = null) {
 		$this->userCanFindListedRoomsWithTerm($user, '', $apiVersion, $formData);
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" can find listed rooms with term "([^"]*)"(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" can find listed rooms with term "([^"]*)"(?: \((v3)\))?$/
 	 *
 	 * @param string $user
 	 * @param string $term
 	 * @param string $apiVersion
 	 * @param TableNode|null $formData
 	 */
-	public function userCanFindListedRoomsWithTerm($user, $term, $apiVersion = 'v1', TableNode $formData = null) {
+	public function userCanFindListedRoomsWithTerm($user, $term, $apiVersion = 'v3', TableNode $formData = null) {
 		$this->setCurrentUser($user);
 		$suffix = '';
 		if ($term !== '') {
@@ -904,7 +904,7 @@ class FeatureContext implements Context, SnippetAcceptingContext {
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" allows listing room "([^"]*)" for "(none|users|all|\d+)" with (\d+)(?: \((v(1|2|3))\))?$/
+	 * @Then /^user "([^"]*)" allows listing room "([^"]*)" for "(none|users|all|\d+)" with (\d+)(?: \((v3)\))?$/
 	 *
 	 * @param string $user
 	 * @param string $newState