Merge pull request #31625 from owncloud/stable10-acceptance-test-dav-…

…path-variable

[stable10] Allow old-new DAV path to be used in scenario outlines

tests/acceptance/features/bootstrap/WebDav.php

@@ -95,7 +95,21 @@ private function getNewDavPath() {
 	}
 
 	/**
-	 * @Given /^using old (?:dav|DAV) path$/
+	 * @Given /^using (old|new) (?:dav|DAV) path$/
+	 *
+	 * @param string $oldOrNewDavPath
+	 * @return void
+	 */
+	public function usingOldOrNewDavPath($oldOrNewDavPath) {
+		if ($oldOrNewDavPath === 'old') {
+			$this->usingOldDavPath();
+		} else {
+			$this->usingNewDavPath();
+		}
+	}
+
+	/**
+	 * Select the old DAV path as the default for later scenario steps
 	 *
 	 * @return void
 	 */
@@ -106,7 +120,7 @@ public function usingOldDavPath() {
 	}
 
 	/**
-	 * @Given /^using new (?:dav|DAV) path$/
+	 * Select the new DAV path as the default for later scenario steps
 	 *
 	 * @return void
 	 */