Merge pull request #10481 from nextcloud/feature/noid/make-info-available-if-the-avatar-was-uploaded

Make the info available if the avatar was uploaded or generated

1 files changed, 20 insertions, 1 deletions

diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php
index 3194d671908..3369fa882c8 100644
--- a/tests/Core/Controller/AvatarControllerTest.php
+++ b/tests/Core/Controller/AvatarControllerTest.php
@@ -34,7 +34,7 @@ namespace Tests\Core\Controller;
 use OC\AppFramework\Utility\TimeFactory;
 use OC\Core\Controller\AvatarController;
 use OCP\AppFramework\Http;
-use OCP\Files\Cache\ICache;
+use OCP\ICache;
 use OCP\Files\File;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
@@ -143,6 +143,9 @@ class AvatarControllerTest extends \Test\TestCase {
 	public function testGetAvatar() {
 		$this->avatarMock->method('getFile')->willReturn($this->avatarFile);
 		$this->avatarManager->method('getAvatar')->with('userId')->willReturn($this->avatarMock);
+		$this->avatarMock->expects($this->once())
+			->method('isCustomAvatar')
+			->willReturn(true);
 
 		$response = $this->avatarController->getAvatar('userId', 32);
 
@@ -154,6 +157,22 @@ class AvatarControllerTest extends \Test\TestCase {
 	}
 
 	/**
+	 * Fetch the user's avatar
+	 */
+	public function testGetGeneratedAvatar() {
+		$this->avatarMock->method('getFile')->willReturn($this->avatarFile);
+		$this->avatarManager->method('getAvatar')->with('userId')->willReturn($this->avatarMock);
+
+		$response = $this->avatarController->getAvatar('userId', 32);
+
+		$this->assertEquals(Http::STATUS_CREATED, $response->getStatus());
+		$this->assertArrayHasKey('Content-Type', $response->getHeaders());
+		$this->assertEquals('image type', $response->getHeaders()['Content-Type']);
+
+		$this->assertEquals('my etag', $response->getETag());
+	}
+
+	/**
 	 * Fetch the avatar of a non-existing user
 	 */
 	public function testGetAvatarNoUser() {