sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make intergration tests work again 

The regex was to greedy

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/3648/head
Roeland Jago Douma 2017-02-28 20:18:31 +07:00
parent 5c2772fb36
commit e8ac348f47
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/integration/features/bootstrap/TagsContext.php
Unescape Escape View File

@ -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);