diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-01-08 23:42:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-08 23:42:52 +0300 |
commit | bb591078d0cf860e07919df10ad1eb87b91b7e6c (patch) | |
tree | 77893c7c34e7410ed70e39a7895d3b84f34c9f89 /apps | |
parent | ca90fe31d8d3b14d2cd1f21e969f6562328963c3 (diff) | |
parent | 9ac1c489a7f6f57ef357e099a9d7d33f81439bb8 (diff) |
Merge pull request #7695 from nextcloud/stable11-7694
[stable11] 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 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/user_ldap/tests/User_LDAPTest.php b/apps/user_ldap/tests/User_LDAPTest.php index 606eff4e7a7..02a424b489c 100644 --- a/apps/user_ldap/tests/User_LDAPTest.php +++ b/apps/user_ldap/tests/User_LDAPTest.php @@ -1013,9 +1013,11 @@ class User_LDAPTest extends TestCase { ->will($this->returnValue('roland')); $access->expects($this->any()) - ->method('stringResemblesDN') - ->with($this->equalTo('dnOfRoland,dc=test')) - ->will($this->returnValue(true)); + ->method('stringResemblesDN') + ->will($this->returnCallback(function($string) { + // very simplified + return strpos($string, ',') !== false; + })); $access->expects($this->any()) ->method('setPassword') |