Skip to content

Commit

Permalink
fixing test
Browse files Browse the repository at this point in the history
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
ArtificialOwl committed Nov 22, 2023
1 parent a93af13 commit 8d06f48
Showing 1 changed file with 32 additions and 2 deletions.
34 changes: 32 additions & 2 deletions build/integration/features/bootstrap/CommentsContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ public function asLoadloadAllTheCommentsOfTheFileNamedItShouldReturn($user, $fil
if ($res->getStatusCode() === 207) {
$service = new Sabre\Xml\Service();
$this->response = $service->parse($res->getBody()->getContents());
$this->commentId = (int) ($this->response[0]['value'][2]['value'][0]['value'][0]['value'] ?? 0);
$this->commentId = (int) ($this->getValueFromNamedEntries('{DAV:}response.{DAV:}propstat.{DAV:}prop', $this->response ?? []) ?? 0);
}
}

Expand Down Expand Up @@ -238,7 +238,7 @@ public function asDeleteTheCreatedCommentItShouldReturn($user, $statusCode) {
* @throws \Exception
*/
public function theResponseShouldContainAPropertyWithValue($key, $value) {
$keys = $this->response[0]['value'][2]['value'][0]['value'];
$keys = $this->getValueFromNamedEntries('{DAV:}response.{DAV:}propstat.{DAV:}prop', $this->response);
$found = false;
foreach ($keys as $singleKey) {
if ($singleKey['name'] === '{http://owncloud.org/ns}' . substr($key, 3)) {
Expand Down Expand Up @@ -296,4 +296,34 @@ public function asEditTheLastCreatedCommentAndSetTextToItShouldReturn($user, $te
throw new \Exception("Response status code was not $statusCode (" . $res->getStatusCode() . ")");
}
}


/**
* get a named entry from response instead of picking a random entry from values
*
* @param string $path
*
* @return array|string
* @throws Exception
*/
private function getValueFromNamedEntries(string $path, array $response): mixed {
$next = '';
if (str_contains($path, '.')) {
[$key, $next] = explode('.', $path, 2);
} else {
$key = $path;
}

foreach ($response as $entry) {
if ($entry['name'] === $key) {
if ($next !== '') {
return $this->getValueFromNamedEntries($next, $entry['value']);
} else {
return $entry['value'];
}
}
}

return null;
}
}

0 comments on commit 8d06f48

Please sign in to comment.