AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added more unit tests for LDAP user class

This commit is contained in:
Frederic Guillot 2016-07-02 18:23:47 -04:00
parent 43337d58c0
commit a8a8bfb0af
No known key found for this signature in database
GPG Key ID: 92D77191BA7FBC99
2 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Core/Ldap/User.php
View File

@ -116,7 +116,7 @@ class User
*/
protected function getRole(array $groupIds)
{
if ($this->hasGroupsNotConfigured()) {
if (! $this->hasGroupsConfigured()) {
return null;
}
@ -278,14 +278,14 @@ class User
}
/**
* Return true if LDAP Group mapping is not configured
* Return true if LDAP Group mapping are configured
*
* @access public
* @return boolean
*/
public function hasGroupsNotConfigured()
public function hasGroupsConfigured()
{
return !$this->getGroupAdminDn() && !$this->getGroupManagerDn();
return $this->getGroupAdminDn() || $this->getGroupManagerDn();
}
/**

60
tests/units/Core/Ldap/LdapUserTest.php
View File

@ -845,4 +845,64 @@ class LdapUserTest extends Base
$this->assertTrue($this->user->hasGroupUserFilter());
}
public function testHasGroupsConfigured()
{
$this->user
->expects($this->any())
->method('getGroupAdminDn')
->will($this->returnValue('something'));
$this->user
->expects($this->any())
->method('getGroupManagerDn')
->will($this->returnValue('something'));
$this->assertTrue($this->user->hasGroupsConfigured());
}
public function testHasGroupAdminDnConfigured()
{
$this->user
->expects($this->any())
->method('getGroupAdminDn')
->will($this->returnValue('something'));
$this->user
->expects($this->any())
->method('getGroupManagerDn')
->will($this->returnValue(''));
$this->assertTrue($this->user->hasGroupsConfigured());
}
public function testHasGroupManagerDnConfigured()
{
$this->user
->expects($this->any())
->method('getGroupAdminDn')
->will($this->returnValue(''));
$this->user
->expects($this->any())
->method('getGroupManagerDn')
->will($this->returnValue('something'));
$this->assertTrue($this->user->hasGroupsConfigured());
}
public function testHasGroupsNotConfigured()
{
$this->user
->expects($this->any())
->method('getGroupAdminDn')
->will($this->returnValue(''));
$this->user
->expects($this->any())
->method('getGroupManagerDn')
->will($this->returnValue(''));
$this->assertFalse($this->user->hasGroupsConfigured());
}
}