summaryrefslogtreecommitdiffstats
path: root/tests/Core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-12-08 23:58:17 +0100
committerGitHub <noreply@github.com>2017-12-08 23:58:17 +0100
commited7beb929e21e8663f16b4cb8ffaf12aecb6313a (patch)
treec58f5556445c09a72dfbf72181833380fb378d2a /tests/Core
parent79ed0d105dc3e5b8fde5e4d8a1ae0f183834349e (diff)
parent66f523e13ff98aef8cdca9f449df7353dcf60da7 (diff)
downloadnextcloud-server-ed7beb929e21e8663f16b4cb8ffaf12aecb6313a.tar.gz
nextcloud-server-ed7beb929e21e8663f16b4cb8ffaf12aecb6313a.zip
Merge pull request #6876 from nextcloud/always_img_avatar
Always generate avatar
Diffstat (limited to 'tests/Core')
-rw-r--r--tests/Core/Controller/AvatarControllerTest.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/Core/Controller/AvatarControllerTest.php b/tests/Core/Controller/AvatarControllerTest.php
index de568438022..3194d671908 100644
--- a/tests/Core/Controller/AvatarControllerTest.php
+++ b/tests/Core/Controller/AvatarControllerTest.php
@@ -134,9 +134,7 @@ class AvatarControllerTest extends \Test\TestCase {
$response = $this->avatarController->getAvatar('userId', 32);
//Comment out until JS is fixed
- //$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
- $this->assertEquals(Http::STATUS_OK, $response->getStatus());
- $this->assertEquals('displayName', $response->getData()['data']['displayname']);
+ $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
}
/**
@@ -167,9 +165,7 @@ class AvatarControllerTest extends \Test\TestCase {
$response = $this->avatarController->getAvatar('userDoesNotExist', 32);
//Comment out until JS is fixed
- //$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
- $this->assertEquals(Http::STATUS_OK, $response->getStatus());
- $this->assertEquals('userDoesNotExist', $response->getData()['data']['displayname']);
+ $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
}
/**