Only match LOCAL and REMOTE as servers, correctly make use of the sharer server from the command

1 files changed, 6 insertions, 4 deletions

diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index 4ff7403bb16..d2aed82055a 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -69,18 +69,20 @@ trait BasicStructure {
 	}
 
 	/**
-	 * @Given /^Using server "([^"]*)"$/
+	 * @Given /^Using server "(LOCAL|REMOTE)"$/
 	 * @param string $server
+	 * @return string Previous used server
 	 */
 	public function usingServer($server) {
+		$previousServer = $this->currentServer;
 		if ($server === 'LOCAL'){
 			$this->baseUrl = $this->localBaseUrl;
 			$this->currentServer = 'LOCAL';
-		} elseif ($server === 'REMOTE'){
+			return $previousServer;
+		} else {
 			$this->baseUrl = $this->remoteBaseUrl;
 			$this->currentServer = 'REMOTE';
-		} else{
-			PHPUnit_Framework_Assert::fail("Server can only be LOCAL or REMOTE");
+			return $previousServer;
 		}
 	}