Rewrite of the authentication and authorization system

1 files changed, 23 insertions, 6 deletions

diff --git a/tests/units/Core/Security/AccessMapTest.php b/tests/units/Core/Security/AccessMapTest.php
index ab74e036..61693ce8 100644
--- a/tests/units/Core/Security/AccessMapTest.php
+++ b/tests/units/Core/Security/AccessMapTest.php
@@ -6,17 +6,34 @@ use Kanboard\Core\Security\AccessMap;
 
 class AccessMapTest extends Base
 {
-    public function testGetRoles()
+    public function testRoleHierarchy()
+    {
+        $acl = new AccessMap;
+        $acl->setRoleHierarchy('admin', array('manager', 'user'));
+        $acl->setRoleHierarchy('manager', array('user'));
+
+        $this->assertEquals(array('admin'), $acl->getRoleHierarchy('admin'));
+        $this->assertEquals(array('manager', 'admin'), $acl->getRoleHierarchy('manager'));
+        $this->assertEquals(array('user', 'admin', 'manager'), $acl->getRoleHierarchy('user'));
+    }
+
+    public function testAddRulesAndGetRoles()
     {
         $acl = new AccessMap;
         $acl->setDefaultRole('role3');
-        $acl->add('MyController', 'myAction1', array('role1', 'role2'));
-        $acl->add('MyController', 'myAction2', array('role1'));
-        $acl->add('MyAdminController', '*', array('role2'));
+        $acl->setRoleHierarchy('role2', array('role1'));
+
+        $acl->add('MyController', 'myAction1', 'role2');
+        $acl->add('MyController', 'myAction2', 'role1');
+        $acl->add('MyAdminController', '*', 'role2');
+        $acl->add('SomethingElse', array('actionA', 'actionB'), 'role2');
 
-        $this->assertEquals(array('role1', 'role2'), $acl->getRoles('mycontroller', 'MyAction1'));
-        $this->assertEquals(array('role1'), $acl->getRoles('mycontroller', 'MyAction2'));
+        $this->assertEquals(array('role2'), $acl->getRoles('mycontroller', 'MyAction1'));
+        $this->assertEquals(array('role1', 'role2'), $acl->getRoles('mycontroller', 'MyAction2'));
         $this->assertEquals(array('role2'), $acl->getRoles('Myadmincontroller', 'MyAction'));
         $this->assertEquals(array('role3'), $acl->getRoles('AnotherController', 'ActionNotFound'));
+        $this->assertEquals(array('role2'), $acl->getRoles('somethingelse', 'actiona'));
+        $this->assertEquals(array('role2'), $acl->getRoles('somethingelse', 'actionb'));
+        $this->assertEquals(array('role3'), $acl->getRoles('somethingelse', 'actionc'));
     }
 }