Merge pull request #21527 from owncloud/remove_all_avatars

Remove all cache avatars on avatar deletion

1 files changed, 23 insertions, 7 deletions

diff --git a/tests/lib/avatartest.php b/tests/lib/avatartest.php
index 3d77a282a7d..d3e615977cb 100644
--- a/tests/lib/avatartest.php
+++ b/tests/lib/avatartest.php
@@ -110,13 +110,29 @@ class AvatarTest extends \Test\TestCase {
 	}
 
 	public function testSetAvatar() {
-		$oldFile = $this->getMock('\OCP\Files\File');
-		$this->folder->method('get')
-			->will($this->returnValueMap([
-				['avatar.jpg', $oldFile],
-				['avatar.png', $oldFile],
-			]));
-		$oldFile->expects($this->exactly(2))->method('delete');
+		$avatarFileJPG = $this->getMock('\OCP\Files\File');
+		$avatarFileJPG->method('getName')
+			->willReturn('avatar.jpg');
+		$avatarFileJPG->expects($this->once())->method('delete');
+
+		$avatarFilePNG = $this->getMock('\OCP\Files\File');
+		$avatarFilePNG->method('getName')
+			->willReturn('avatar.png');
+		$avatarFilePNG->expects($this->once())->method('delete');
+
+		$resizedAvatarFile = $this->getMock('\OCP\Files\File');
+		$resizedAvatarFile->method('getName')
+			->willReturn('avatar.32.jpg');
+		$resizedAvatarFile->expects($this->once())->method('delete');
+
+		$nonAvatarFile = $this->getMock('\OCP\Files\File');
+		$nonAvatarFile->method('getName')
+			->willReturn('avatarX');
+		$nonAvatarFile->expects($this->never())->method('delete');
+
+		$this->folder->method('search')
+			->with('avatar')
+			->willReturn([$avatarFileJPG, $avatarFilePNG, $resizedAvatarFile, $nonAvatarFile]);
 
 		$newFile = $this->getMock('\OCP\Files\File');
 		$this->folder->expects($this->once())