summaryrefslogtreecommitdiffstats
path: root/build/integration
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2017-02-28 20:18:31 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2017-03-10 20:40:47 +0100
commite8ac348f4771ebaf53351aa29fb49113d7ddf614 (patch)
treea758a306e2e031bca1220bb69393598ee9600437 /build/integration
parent5c2772fb36e7ccd088d91c0459113840f37f2a47 (diff)
downloadnextcloud-server-e8ac348f4771ebaf53351aa29fb49113d7ddf614.tar.gz
nextcloud-server-e8ac348f4771ebaf53351aa29fb49113d7ddf614.zip
Make intergration tests work again
The regex was to greedy Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'build/integration')
-rw-r--r--build/integration/features/bootstrap/TagsContext.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/integration/features/bootstrap/TagsContext.php b/build/integration/features/bootstrap/TagsContext.php
index 3a48cce8aea..24ee8863e29 100644
--- a/build/integration/features/bootstrap/TagsContext.php
+++ b/build/integration/features/bootstrap/TagsContext.php
@@ -511,7 +511,7 @@ class TagsContext implements \Behat\Behat\Context\Context {
)
));
$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 @@ class TagsContext implements \Behat\Behat\Context\Context {
]
);
$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 @@ class TagsContext implements \Behat\Behat\Context\Context {
} 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);