diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-08-26 11:42:47 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-08-26 11:42:47 +0200 |
| commit | 27af0e82ddba29512a4a5fe08cbd060cc6251264 (patch) | |
| tree | e2e1e8f721305e3abdb95f13ac55e921db61c4c1 /apps/user_ldap/tests | |
| parent | 7ed8c7f75c0aa035b44e7db6fa1f9f486dedbdf8 (diff) | |
| parent | a55f233e9ffac7d492733f50a37343b4243898bf (diff) | |
| download | nextcloud-server-27af0e82ddba29512a4a5fe08cbd060cc6251264.tar.gz nextcloud-server-27af0e82ddba29512a4a5fe08cbd060cc6251264.zip | |
Merge pull request #18042 from GreenArchon/master
Properly nest groups when using memberOf to detect group membership, …
Diffstat (limited to 'apps/user_ldap/tests')
| -rw-r--r-- | apps/user_ldap/tests/group_ldap.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php index f716618ce48..805238e7d37 100644 --- a/apps/user_ldap/tests/group_ldap.php +++ b/apps/user_ldap/tests/group_ldap.php @@ -395,16 +395,15 @@ class Test_Group_Ldap extends \Test\TestCase { ->method('username2dn') ->will($this->returnValue($dn)); - $access->expects($this->once()) + $access->expects($this->exactly(3)) ->method('readAttribute') - ->with($dn, 'memberOf') - ->will($this->returnValue(['cn=groupA,dc=foobar', 'cn=groupB,dc=foobar'])); + ->will($this->onConsecutiveCalls(['cn=groupA,dc=foobar', 'cn=groupB,dc=foobar'], [], [])); $access->expects($this->exactly(2)) ->method('dn2groupname') ->will($this->returnArgument(0)); - $access->expects($this->once()) + $access->expects($this->exactly(3)) ->method('groupsMatchFilter') ->will($this->returnArgument(0)); |