diff options
author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2018-10-26 17:38:42 +0200 |
---|---|---|
committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2018-10-30 12:12:03 +0100 |
commit | 49456e42f958bec9b0fc9d07c5ec37ff51cc9351 (patch) | |
tree | ff7a1c300aa4cedb0387dc5286cc1fa6c756b49d /apps/user_ldap/tests | |
parent | bbe44108b5661d0c3935fa76e27abbc433fd458e (diff) | |
download | nextcloud-server-49456e42f958bec9b0fc9d07c5ec37ff51cc9351.tar.gz nextcloud-server-49456e42f958bec9b0fc9d07c5ec37ff51cc9351.zip |
do not run into UniqueConstraintViolationException
… when an unmapped user logs in for the first time when background job
mode is ajax and no memcache was configured.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/user_ldap/tests')
-rw-r--r-- | apps/user_ldap/tests/User/UserTest.php | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/apps/user_ldap/tests/User/UserTest.php b/apps/user_ldap/tests/User/UserTest.php index 63c90c6ac72..6ff9defe47b 100644 --- a/apps/user_ldap/tests/User/UserTest.php +++ b/apps/user_ldap/tests/User/UserTest.php @@ -998,25 +998,35 @@ class UserTest extends \Test\TestCase { public function displayNameProvider() { return [ - ['Roland Deschain', '', 'Roland Deschain'], - ['Roland Deschain', null, 'Roland Deschain'], - ['Roland Deschain', 'gunslinger@darktower.com', 'Roland Deschain (gunslinger@darktower.com)'], + ['Roland Deschain', '', 'Roland Deschain', false], + ['Roland Deschain', '', 'Roland Deschain', true], + ['Roland Deschain', null, 'Roland Deschain', false], + ['Roland Deschain', 'gunslinger@darktower.com', 'Roland Deschain (gunslinger@darktower.com)', false], + ['Roland Deschain', 'gunslinger@darktower.com', 'Roland Deschain (gunslinger@darktower.com)', true], ]; } /** * @dataProvider displayNameProvider */ - public function testComposeAndStoreDisplayName($part1, $part2, $expected) { + public function testComposeAndStoreDisplayName($part1, $part2, $expected, $expectTriggerChange) { $this->config->expects($this->once()) ->method('setUserValue'); + $oldName = $expectTriggerChange ? 'xxGunslingerxx' : null; $this->config->expects($this->once()) - ->method('getUserValue'); + ->method('getUserValue') + ->with($this->user->getUsername(), 'user_ldap', 'displayName', null) + ->willReturn($oldName); $ncUserObj = $this->createMock(\OC\User\User::class); - $ncUserObj->expects($this->once()) - ->method('triggerChange') - ->with('displayName', $expected); + if ($expectTriggerChange) { + $ncUserObj->expects($this->once()) + ->method('triggerChange') + ->with('displayName', $expected); + } else { + $ncUserObj->expects($this->never()) + ->method('triggerChange'); + } $this->userManager->expects($this->once()) ->method('get') ->willReturn($ncUserObj); |