From bbe44108b5661d0c3935fa76e27abbc433fd458e Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Thu, 25 Oct 2018 23:41:12 +0200 Subject: only write when the displayname differs, but then announce it refs #5212 and fixes #9112 Signed-off-by: Arthur Schiwon --- apps/user_ldap/tests/User/UserTest.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'apps/user_ldap/tests') diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php index 837c72a3a31..63c90c6ac72 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -1010,11 +1010,36 @@ class UserTest extends \Test\TestCase { public function testComposeAndStoreDisplayName($part1, $part2, $expected) { $this->config->expects($this->once()) ->method('setUserValue'); + $this->config->expects($this->once()) + ->method('getUserValue'); + + $ncUserObj = $this->createMock(\OC\User\User::class); + $ncUserObj->expects($this->once()) + ->method('triggerChange') + ->with('displayName', $expected); + $this->userManager->expects($this->once()) + ->method('get') + ->willReturn($ncUserObj); $displayName = $this->user->composeAndStoreDisplayName($part1, $part2); $this->assertSame($expected, $displayName); } + public function testComposeAndStoreDisplayNameNoOverwrite() { + $displayName = 'Randall Flagg'; + $this->config->expects($this->never()) + ->method('setUserValue'); + $this->config->expects($this->once()) + ->method('getUserValue') + ->willReturn($displayName); + + $this->userManager->expects($this->never()) + ->method('get'); // Implicit: no triggerChange can be called + + $composedDisplayName = $this->user->composeAndStoreDisplayName($displayName); + $this->assertSame($composedDisplayName, $displayName); + } + public function testHandlePasswordExpiryWarningDefaultPolicy() { $this->connection->expects($this->any()) ->method('__get') -- cgit v1.2.3