diff --git a/tests/UnicaenAuthTest/Entity/Ldap/PeopleTest.php b/tests/UnicaenAuthTest/Entity/Ldap/PeopleTest.php
index 785038a3e5b00d767bab832584f857176a1699fd..8ba2660519025d088507e5888d3e3e9b0644c4b8 100644
--- a/tests/UnicaenAuthTest/Entity/Ldap/PeopleTest.php
+++ b/tests/UnicaenAuthTest/Entity/Ldap/PeopleTest.php
@@ -119,8 +119,10 @@ class PeopleTest extends \PHPUnit_Framework_TestCase
$this->entity->setPassword('whatever');
}
- public function testCanGettingRolesReturnsMembership()
+ public function testGettingRolesContainsMembershipAndSupannRole()
{
- $this->assertEquals($this->entity->getMemberOf(), $this->entity->getRoles());
+ $this->assertEquals(
+ array_merge($this->entity->getMemberOf(), $this->entity->getSupannRolesEntite()),
+ $this->entity->getRoles());
}
}
\ No newline at end of file
diff --git a/tests/UnicaenAuthTest/Provider/Identity/ChainTest.php b/tests/UnicaenAuthTest/Provider/Identity/ChainTest.php
index 7f6fd299da3c1052eba7835bda811227442d2cc7..2e10921e2f37d65ded9acb7659308f19768f6d4d 100644
--- a/tests/UnicaenAuthTest/Provider/Identity/ChainTest.php
+++ b/tests/UnicaenAuthTest/Provider/Identity/ChainTest.php
@@ -116,6 +116,6 @@ class ChainTest extends PHPUnit_Framework_TestCase
->method('getRole')
->will($this->returnValue($role = new NamedRole('role 1')));
- $this->assertEquals(array($role), $this->provider->getIdentityRoles());
+ $this->assertEquals(array('role 1' => $role), $this->provider->getIdentityRoles());
}
}
\ No newline at end of file
diff --git a/tests/UnicaenAuthTest/Provider/Identity/DbTest.php b/tests/UnicaenAuthTest/Provider/Identity/DbTest.php
index 11de7693ece0c88c1adca085ec15198fd448dd0e..905dc2e4d172b83b9de184332d117636b87c7f59 100644
--- a/tests/UnicaenAuthTest/Provider/Identity/DbTest.php
+++ b/tests/UnicaenAuthTest/Provider/Identity/DbTest.php
@@ -1,8 +1,6 @@
<?php
namespace UnicaenAuthTest\Provider\Identity;
-use UnicaenAuth\Acl\NamedRole;
-
/**
* Description of LdapTest
*
@@ -17,24 +15,32 @@ class DbTest extends BaseTest
$role = new \UnicaenAuth\Entity\Db\Role();
$role->setRoleId('role id');
- $identity1 = $this->getMock('UnicaenAuth\Entity\Db\User');
+ $identity1 = $this->getMock('UnicaenAuth\Entity\Db\User', array('getRoles', 'getUsername'));
$identity1->expects($this->once())
->method('getRoles')
->will($this->returnValue(array($role)));
+ $identity1->expects($this->once())
+ ->method('getUsername')
+ ->will($this->returnValue($username = 'username1'));
+
+ $expectedRoles1 = array($role, $username);
$role2 = new \UnicaenAuth\Entity\Db\Role();
$role2->setRoleId('role id 2');
- $identity2 = $this->getMock('UnicaenAuth\Entity\Db\User');
+ $identity2 = $this->getMock('UnicaenAuth\Entity\Db\User', array('getRoles', 'getUsername'));
$identity2->expects($this->once())
->method('getRoles')
->will($this->returnValue(array($role)));
+ $identity2->expects($this->once())
+ ->method('getUsername')
+ ->will($this->returnValue($username = 'username2'));
- $expectedRoles = array($role);
+ $expectedRoles2 = array($role, $username);
return array(
- 'object-identity' => array($identity1, $expectedRoles),
- 'array-identity' => array(array('db' => $identity2), $expectedRoles),
+ 'object-identity' => array($identity1, $expectedRoles1),
+ 'array-identity' => array(array('db' => $identity2), $expectedRoles2),
);
}
@@ -46,7 +52,7 @@ class DbTest extends BaseTest
$this->authService->expects($this->once())
->method('getIdentity')
->will($this->returnValue($identity));
-
+
$roles = $this->provider->getIdentityRoles();
$this->assertEquals($expectedRoles, $roles);
diff --git a/tests/UnicaenAuthTest/Provider/Identity/LdapTest.php b/tests/UnicaenAuthTest/Provider/Identity/LdapTest.php
index ab2c610fb7b0be9f8389e235cabff48a85d65c6a..9521f084213b447e06ccba1b6b7ca30c37f168ad 100644
--- a/tests/UnicaenAuthTest/Provider/Identity/LdapTest.php
+++ b/tests/UnicaenAuthTest/Provider/Identity/LdapTest.php
@@ -1,9 +1,6 @@
<?php
namespace UnicaenAuthTest\Provider\Identity;
-use UnicaenApp\Entity\Ldap\Group;
-use UnicaenAuth\Acl\NamedRole;
-
/**
* Description of LdapTest
*
@@ -23,55 +20,47 @@ class LdapTest extends BaseTest
parent::setUp();
$this->mapper = $this->getMock('UnicaenApp\Mapper\Ldap\Db', array('findOneByDn'));
-
- $this->provider->setServiceLocator($this->serviceManager);
}
public function provideAuthServiceIdentity()
{
- $identity1 = $this->getMock('UnicaenAuth\Entity\Ldap\People');
+ $identity1 = $this->getMock('UnicaenAuth\Entity\Ldap\People', array('getRoles', 'getUsername'));
$identity1->expects($this->once())
->method('getRoles')
->will($this->returnValue(array('cn=admin_reseau,ou=groups,dc=unicaen,dc=fr')));
+ $identity1->expects($this->once())
+ ->method('getUsername')
+ ->will($this->returnValue('username1'));
- $identity2 = $this->getMock('UnicaenAuth\Entity\Ldap\People');
+ $expectedRoles1 = array('cn=admin_reseau,ou=groups,dc=unicaen,dc=fr', 'username1');
+
+ $identity2 = $this->getMock('UnicaenAuth\Entity\Ldap\People', array('getRoles', 'getUsername'));
$identity2->expects($this->once())
->method('getRoles')
->will($this->returnValue(array('cn=admin_reseau,ou=groups,dc=unicaen,dc=fr')));
+ $identity2->expects($this->once())
+ ->method('getUsername')
+ ->will($this->returnValue('username2'));
+
+ $expectedRoles2 = array('cn=admin_reseau,ou=groups,dc=unicaen,dc=fr', 'username2');
return array(
- 'object-identity' => array($identity1),
- 'array-identity' => array(array('ldap' => $identity2)),
+ 'object-identity' => array($identity1, $expectedRoles1),
+ 'array-identity' => array(array('ldap' => $identity2), $expectedRoles2),
);
}
/**
* @dataProvider provideAuthServiceIdentity
*/
- public function testGettingIdentityRolesReturnsPeopleRoles($identity)
+ public function testGettingIdentityRolesReturnsPeopleRoles($identity, $expectedRoles)
{
- $group = new Group(array(
- 'dn' => 'cn=admin_reseau,ou=groups,dc=unicaen,dc=fr',
- 'description' => 'ldap group'
- ));
-
$this->authService->expects($this->once())
->method('getIdentity')
->will($this->returnValue($identity));
- $this->mapper->expects($this->once())
- ->method('findOneByDn')
- ->with($group->getDn())
- ->will($this->returnValue($group));
-
- $this->serviceManager->expects($this->once())
- ->method('get')
- ->with('ldap_group_mapper')
- ->will($this->returnValue($this->mapper));
-
$roles = $this->provider->getIdentityRoles();
- $expected = array(new NamedRole($group->getDn(), null, $group->getDescription()));
- $this->assertEquals($expected, $roles);
+ $this->assertEquals($expectedRoles, $roles);
}
}
\ No newline at end of file
diff --git a/tests/UnicaenAuthTest/Provider/Role/DbServiceFactoryTest.php b/tests/UnicaenAuthTest/Provider/Role/DbServiceFactoryTest.php
index c0d2cc5dc9cd24a8da153bbe46bc3e06e9320308..ea2997abf59a6f74c1a93bc4c89064937dea8000 100644
--- a/tests/UnicaenAuthTest/Provider/Role/DbServiceFactoryTest.php
+++ b/tests/UnicaenAuthTest/Provider/Role/DbServiceFactoryTest.php
@@ -9,8 +9,8 @@ namespace UnicaenAuthTest\Provider\Role;
*/
class DbServiceFactoryTest extends BaseServiceFactoryTest
{
- protected $factoryClass = 'UnicaenAuth\Provider\Role\DbServiceFactory';
- protected $serviceClass = 'UnicaenAuth\Provider\Role\Db';
+ protected $factoryClass = 'UnicaenAuth\Provider\Role\DbRoleServiceFactory';
+ protected $serviceClass = 'UnicaenAuth\Provider\Role\DbRole';
public function provideInvalidOptions()
{
@@ -18,9 +18,9 @@ class DbServiceFactoryTest extends BaseServiceFactoryTest
'a' => array(array()),
'b' => array(array('role_providers')),
'c' => array(array('role_providers' => array())),
- 'd' => array(array('role_providers' => array('UnicaenAuth\Provider\Role\Db' => array()))),
- 'e' => array(array('role_providers' => array('UnicaenAuth\Provider\Role\Db' => array('role_entity_class' => null)))),
- 'f' => array(array('role_providers' => array('UnicaenAuth\Provider\Role\Db' => array('role_entity_class' => 'A', 'object_manager' => null)))),
+ 'd' => array(array('role_providers' => array('UnicaenAuth\Provider\Role\DbRole' => array()))),
+ 'e' => array(array('role_providers' => array('UnicaenAuth\Provider\Role\DbRole' => array('role_entity_class' => null)))),
+ 'f' => array(array('role_providers' => array('UnicaenAuth\Provider\Role\DbRole' => array('role_entity_class' => 'A', 'object_manager' => null)))),
);
}
@@ -42,7 +42,7 @@ class DbServiceFactoryTest extends BaseServiceFactoryTest
{
$options = array(
'role_providers' => array(
- 'UnicaenAuth\Provider\Role\Db' => array(
+ 'UnicaenAuth\Provider\Role\DbRole' => array(
'role_entity_class' => 'Entity',
'object_manager' => 'orm_default',
)
@@ -64,6 +64,6 @@ class DbServiceFactoryTest extends BaseServiceFactoryTest
$service = $this->factory->createService($this->serviceLocator);
- $this->assertInstanceOf('UnicaenAuth\Provider\Role\Db', $service);
+ $this->assertInstanceOf('UnicaenAuth\Provider\Role\DbRole', $service);
}
}
\ No newline at end of file
diff --git a/tests/UnicaenAuthTest/Provider/Role/DbTest.php b/tests/UnicaenAuthTest/Provider/Role/DbTest.php
index 18ea314fd2a78031d53404848d14bb798d41a268..7a528ef9da697b8f12116b6c6cab3ca1ba97d6bd 100644
--- a/tests/UnicaenAuthTest/Provider/Role/DbTest.php
+++ b/tests/UnicaenAuthTest/Provider/Role/DbTest.php
@@ -3,7 +3,7 @@
namespace UnicaenAuthTest\Provider\Role;
use PHPUnit_Framework_TestCase;
-use UnicaenAuth\Provider\Role\Db;
+use UnicaenAuth\Provider\Role\DbRole;
use BjyAuthorize\Provider\Role\ObjectRepositoryProvider;
/**
@@ -19,7 +19,7 @@ class DbTest extends PHPUnit_Framework_TestCase
protected function setUp()
{
$this->objectRepository = $this->getMock('Doctrine\Common\Persistence\ObjectRepository', array());
- $this->provider = new Db($this->objectRepository);
+ $this->provider = new DbRole($this->objectRepository);
}
public function testGettingRolesReturnsParentClassRoles()
diff --git a/tests/UnicaenAuthTest/View/Helper/UserCurrentTest.php b/tests/UnicaenAuthTest/View/Helper/UserCurrentTest.php
index e53d1c18e7f8442cf4d9f99fe49a6963652f5353..f623610731c38e7541968a6b98119f846e009dda 100644
--- a/tests/UnicaenAuthTest/View/Helper/UserCurrentTest.php
+++ b/tests/UnicaenAuthTest/View/Helper/UserCurrentTest.php
@@ -6,7 +6,7 @@ use UnicaenAuth\View\Helper\UserCurrent;
use Zend\I18n\Translator\Translator;
/**
- * Description of AppConnectionTest
+ * Description of UserCurrentTest
*
* @property UserCurrent $helper Description
* @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
@@ -28,9 +28,10 @@ class UserCurrentTest extends AbstractTest
{
parent::setUp();
- $this->userStatusHelper = $userStatusHelper = $this->getMock('UnicaenAuth\View\Helper\UserStatus', array('__invoke'));
- $this->userProfileHelper = $userProfileHelper = $this->getMock('UnicaenAuth\View\Helper\UserProfile', array('__toString'));
- $this->userInfoHelper = $userInfoHelper = $this->getMock('UnicaenAuth\View\Helper\UserInfo', array('__invoke'));
+ $this->userStatusHelper = $userStatusHelper = $this->getMock('UnicaenAuth\View\Helper\UserStatus', array('__invoke'));
+ $this->userProfileHelper = $userProfileHelper = $this->getMock('UnicaenAuth\View\Helper\UserProfile', array('__toString'));
+ $this->userInfoHelper = $userInfoHelper = $this->getMock('UnicaenAuth\View\Helper\UserInfo', array('__invoke'));
+ $this->inlineScriptHelper = $inlineScriptHelper = $this->getMock('Zend\View\Helper\InlineScript', array('__invoke'));
$this->userStatusHelper
->expects($this->any())
@@ -44,11 +45,15 @@ class UserCurrentTest extends AbstractTest
->expects($this->any())
->method('__invoke')
->will($this->returnValue('User Info Helper Markup'));
+ $this->inlineScriptHelper
+ ->expects($this->any())
+ ->method('__invoke')
+ ->will($this->returnValue('InlineScript Helper Markup'));
$this->renderer = $this->getMock('Zend\View\Renderer\PhpRenderer', array('plugin'));
$this->renderer->expects($this->any())
->method('plugin')
- ->will($this->returnCallback(function ($helper) use ($userStatusHelper, $userProfileHelper, $userInfoHelper) {
+ ->will($this->returnCallback(function ($helper) use ($userStatusHelper, $userProfileHelper, $userInfoHelper, $inlineScriptHelper) {
if ('userstatus' === strtolower($helper)) {
return $userStatusHelper;
}
@@ -58,6 +63,9 @@ class UserCurrentTest extends AbstractTest
if ('userinfo' === strtolower($helper)) {
return $userInfoHelper;
}
+ if ('inlinescript' === strtolower($helper)) {
+ return $inlineScriptHelper;
+ }
return null;
}));
diff --git a/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/js.phtml b/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/js.phtml
new file mode 100644
index 0000000000000000000000000000000000000000..89191034337dc70319b9fa7b07af9e79914e6467
--- /dev/null
+++ b/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/js.phtml
@@ -0,0 +1,5 @@
+<script type="text/javascript">
+ $(function() {
+ $("#user-current-info").popover({ html: true, container: '#navbar' });
+ });
+</script>
\ No newline at end of file
diff --git a/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-in-translated.phtml b/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-in-translated.phtml
index b9bb7cf4eeb9146f26c8a333ff45d2bbbe049456..14ae2ef23b455454a42e2bd0022ce44826cad756 100644
--- a/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-in-translated.phtml
+++ b/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-in-translated.phtml
@@ -5,8 +5,3 @@
data-toggle="popover"
data-content="User Profile Helper MarkupUser Info Helper Markup"
href="#">User Status Helper Markup</a>
-<script type="text/javascript">
- $(function() {
- $("#user-current-info").popover({ html: true, container: '#navbar' });
- });
-</script>
diff --git a/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-in.phtml b/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-in.phtml
index a213151b0657937b01c022b9a5dd069064d21610..55a49900a137652012f3e59c6818bfacc8e3eee9 100644
--- a/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-in.phtml
+++ b/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-in.phtml
@@ -5,8 +5,3 @@
data-toggle="popover"
data-content="User Profile Helper MarkupUser Info Helper Markup"
href="#">User Status Helper Markup</a>
-<script type="text/javascript">
- $(function() {
- $("#user-current-info").popover({ html: true, container: '#navbar' });
- });
-</script>
diff --git a/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-out-translated.phtml b/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-out-translated.phtml
index d4d926687dec4e9ba25ad8d9b921459158ba210d..09fd022dd9caa4b29a1c941d3c4a5ca5aa815695 100644
--- a/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-out-translated.phtml
+++ b/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-out-translated.phtml
@@ -5,8 +5,3 @@
data-toggle="popover"
data-content="None"
href="#">User Status Helper Markup</a>
-<script type="text/javascript">
- $(function() {
- $("#user-current-info").popover({ html: true, container: '#navbar' });
- });
-</script>
diff --git a/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-out.phtml b/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-out.phtml
index fc06f5ce74787c508fe2fc5dbde1e3b3dd3871b1..8e5a62d442e7a74679e8eb7def62a497fd413060 100644
--- a/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-out.phtml
+++ b/tests/UnicaenAuthTest/View/Helper/_files/expected/user_current/logged-out.phtml
@@ -5,8 +5,3 @@
data-toggle="popover"
data-content="Aucun"
href="#">User Status Helper Markup</a>
-<script type="text/javascript">
- $(function() {
- $("#user-current-info").popover({ html: true, container: '#navbar' });
- });
-</script>