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

Fix avatarHome 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/7847/head
Roeland Jago Douma 2018-01-16 15:37:47 +07:00
parent 48ea7251d7
commit 8614eb91db
No known key found for this signature in database
GPG Key ID: F941078878347C0C
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/Avatars/AvatarHome.php
Unescape Escape View File

@ -70,7 +70,7 @@ class AvatarHome implements ICollection {
throw new MethodNotAllowed('Invalid image size');
}
$avatar = $this->avatarManager->getAvatar($this->getName());
if ($avatar === null || !$avatar->exists()) {
if (!$avatar->exists()) {
throw new NotFound();
}
return new AvatarNode($size, $ext, $avatar);

17
apps/dav/tests/unit/Avatars/AvatarHomeTest.php
Unescape Escape View File

@ -86,11 +86,10 @@ class AvatarHomeTest extends TestCase {
if ($expectedException !== null) {
$this->expectException($expectedException);
}
$avatar = null;
if ($hasAvatar) {
$avatar = $this->createMock(IAvatar::class);
$avatar->expects($this->once())->method('exists')->willReturn(true);
}
$avatar = $this->createMock(IAvatar::class);
$avatar->method('exists')->willReturn($hasAvatar);
$this->avatarManager->expects($this->any())->method('getAvatar')->with('admin')->willReturn($avatar);
$avatarNode = $this->home->getChild($path);
$this->assertInstanceOf(AvatarNode::class, $avatarNode);
@ -111,11 +110,9 @@ class AvatarHomeTest extends TestCase {
* @dataProvider providesTestGetChild
*/
public function testChildExists($expectedException, $hasAvatar, $path) {
$avatar = null;
if ($hasAvatar) {
$avatar = $this->createMock(IAvatar::class);
$avatar->expects($this->once())->method('exists')->willReturn(true);
}
$avatar = $this->createMock(IAvatar::class);
$avatar->method('exists')->willReturn($hasAvatar);
$this->avatarManager->expects($this->any())->method('getAvatar')->with('admin')->willReturn($avatar);
$childExists = $this->home->childExists($path);
$this->assertEquals($hasAvatar, $childExists);