diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-03 23:45:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 23:45:31 +0100 |
| commit | 19280adc0d360e546d49e07bb4866e6e756fcbdb (patch) | |
| tree | 171d4e9aed97debfe0072b5acfbd507dd7a99f9c /apps | |
| parent | 5011142024a2563ac162e17417dd9b7edcae0ff5 (diff) | |
| parent | e9eccf34f9258a3720afb3cde218275f4b35f884 (diff) | |
| download | nextcloud-server-19280adc0d360e546d49e07bb4866e6e756fcbdb.tar.gz nextcloud-server-19280adc0d360e546d49e07bb4866e6e756fcbdb.zip | |
Merge pull request #7611 from nextcloud/fix-7445
Don't attempt to translate login names to uids when uids are provided
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/tests/User_LDAPTest.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index 5b53cc3da2c..3262a2360ad 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -1343,10 +1343,6 @@ class User_LDAPTest extends TestCase { } return true; })); - - $access->userManager->expects($this->atLeastOnce()) - ->method('get') - ->willReturn($this->createMock(User::class)); } /** @@ -1357,6 +1353,9 @@ class User_LDAPTest extends TestCase { $access = $this->getAccessMock(); $this->prepareAccessForSetPassword($access); + $access->userManager->expects($this->atLeastOnce()) + ->method('get') + ->willReturn($this->createMock(User::class)); $backend = new UserLDAP($access, $this->createMock(IConfig::class), $this->createMock(INotificationManager::class), $this->createMock(Session::class), $this->getDefaultPluginManagerMock()); \OC_User::useBackend($backend); |