Make intergration tests work again

The regex was to greedy Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Mar 10, 2017 · e8ac348 · e8ac348
1 parent 5c2772f
commit e8ac348
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/build/integration/features/bootstrap/TagsContext.php b/build/integration/features/bootstrap/TagsContext.php
@@ -511,7 +511,7 @@ private function getFileIdForPath($path, $user) {
 			)
 		));
 		$response = file_get_contents($url, false, $context);
-		preg_match_all('/\<oc:fileid\>(.*)\<\/oc:fileid\>/', $response, $matches);
+		preg_match_all('/\<oc:fileid\>(.*?)\<\/oc:fileid\>/', $response, $matches);
 		return (int)$matches[1][0];
 	}
 
@@ -576,7 +576,7 @@ public function sharedByHasTheFollowingTags($fileName, $sharedOrOwnedBy, $sharin
 			]
 		);
 		$response = $this->client->send($request)->getBody()->getContents();
-		preg_match_all('/\<oc:display-name\>(.*)\<\/oc:display-name\>/', $response, $realTags);
+		preg_match_all('/\<oc:display-name\>(.*?)\<\/oc:display-name\>/', $response, $realTags);
 
 		foreach($expectedTags as $key => $row) {
 			foreach($realTags as $tag) {
@@ -631,7 +631,7 @@ public function sharedByHasTheFollowingTagsFor($fileName, $sharingUser, $user, T
 		} catch (\GuzzleHttp\Exception\ClientException $e) {
 			$this->response = $e->getResponse();
 		}
-		preg_match_all('/\<oc:display-name\>(.*)\<\/oc:display-name\>/', $this->response, $realTags);
+		preg_match_all('/\<oc:display-name\>(.*?)\<\/oc:display-name\>/', $this->response, $realTags);
 		$realTags = array_filter($realTags);
 		$expectedTags = array_filter($expectedTags);