Extract project permissions to a separate class

This commit is contained in:
Frédéric Guillot
2014-09-20 12:52:48 +02:00
parent 5f96af82f2
commit 00cdc609d1
15 changed files with 452 additions and 413 deletions

View File

@@ -0,0 +1,160 @@
<?php
require_once __DIR__.'/Base.php';
use Model\Project;
use Model\ProjectPermission;
use Model\User;
class ProjectPermissionTest extends Base
{
public function testAllowEverybody()
{
// We create a regular user
$user = new User($this->registry);
$user->create(array('username' => 'unittest', 'password' => 'unittest'));
$p = new Project($this->registry);
$pp = new ProjectPermission($this->registry);
$this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
$this->assertEmpty($pp->getAllowedUsers(1)); // Nobody is specified for the given project
$this->assertTrue($pp->isUserAllowed(1, 1)); // Everybody should be allowed
$this->assertTrue($pp->isUserAllowed(1, 2)); // Everybody should be allowed
}
public function testAllowUser()
{
$p = new Project($this->registry);
$pp = new ProjectPermission($this->registry);
$user = new User($this->registry);
$user->create(array('username' => 'unittest', 'password' => 'unittest'));
// We create a project
$this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
// We allow the admin user
$this->assertTrue($pp->allowUser(1, 1));
// Non-existant project
$this->assertFalse($pp->allowUser(50, 1));
// Non-existant user
$this->assertFalse($pp->allowUser(1, 50));
// Our admin user should be allowed
$this->assertEquals(array('1' => 'admin'), $pp->getAllowedUsers(1));
$this->assertTrue($pp->isUserAllowed(1, 1));
// Our regular user should be forbidden
$this->assertFalse($pp->isUserAllowed(1, 2));
}
public function testRevokeUser()
{
$p = new Project($this->registry);
$pp = new ProjectPermission($this->registry);
$user = new User($this->registry);
$user->create(array('username' => 'unittest', 'password' => 'unittest'));
// We create a project
$this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
// We revoke our admin user (not existing row)
$this->assertFalse($pp->revokeUser(1, 1));
// We should have nobody in the users list
$this->assertEmpty($pp->getAllowedUsers(1));
// Our admin user and our regular user should be allowed
$this->assertTrue($pp->isUserAllowed(1, 1));
$this->assertTrue($pp->isUserAllowed(1, 2));
// We allow only the regular user
$this->assertTrue($pp->allowUser(1, 2));
// All users should be allowed (admin and regular)
$this->assertTrue($pp->isUserAllowed(1, 1));
$this->assertTrue($pp->isUserAllowed(1, 2));
// However, we should have only our regular user in the list
$this->assertEquals(array('2' => 'unittest'), $pp->getAllowedUsers(1));
// We allow our admin, we should have both in the list
$this->assertTrue($pp->allowUser(1, 1));
$this->assertEquals(array('1' => 'admin', '2' => 'unittest'), $pp->getAllowedUsers(1));
$this->assertTrue($pp->isUserAllowed(1, 1));
$this->assertTrue($pp->isUserAllowed(1, 2));
// We revoke the regular user
$this->assertTrue($pp->revokeUser(1, 2));
// Only admin should be allowed
$this->assertTrue($pp->isUserAllowed(1, 1));
$this->assertFalse($pp->isUserAllowed(1, 2));
// We should have only admin in the list
$this->assertEquals(array('1' => 'admin'), $pp->getAllowedUsers(1));
// We revoke the admin user
$this->assertTrue($pp->revokeUser(1, 1));
$this->assertEmpty($pp->getAllowedUsers(1));
// Everybody should be allowed again
$this->assertTrue($pp->isUserAllowed(1, 1));
$this->assertTrue($pp->isUserAllowed(1, 2));
}
public function testUsersList()
{
$p = new Project($this->registry);
$pp = new ProjectPermission($this->registry);
$user = new User($this->registry);
$user->create(array('username' => 'unittest', 'password' => 'unittest'));
// We create project
$this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
// No restriction, we should have everybody
$this->assertEquals(
array('Unassigned', 'admin', 'unittest'),
$pp->getUsersList(1)
);
// We allow only the regular user
$this->assertTrue($pp->allowUser(1, 2));
$this->assertEquals(
array(0 => 'Unassigned', 2 => 'unittest'),
$pp->getUsersList(1)
);
// We allow the admin user
$this->assertTrue($pp->allowUser(1, 1));
$this->assertEquals(
array(0 => 'Unassigned', 1 => 'admin', 2 => 'unittest'),
$pp->getUsersList(1)
);
// We revoke only the regular user
$this->assertTrue($pp->revokeUser(1, 2));
$this->assertEquals(
array(0 => 'Unassigned', 1 => 'admin'),
$pp->getUsersList(1)
);
// We revoke only the admin user, we should have everybody
$this->assertTrue($pp->revokeUser(1, 1));
$this->assertEquals(
array(0 => 'Unassigned', 1 => 'admin', 2 => 'unittest'),
$pp->getUsersList(1)
);
}
}

View File

@@ -136,146 +136,4 @@ class ProjectTest extends Base
$this->assertFalse($p->disablePublicAccess(123));
}
public function testAllowEverybody()
{
// We create a regular user
$user = new User($this->registry);
$user->create(array('username' => 'unittest', 'password' => 'unittest'));
$p = new Project($this->registry);
$this->assertEmpty($p->getAllowedUsers(1)); // Nobody is specified for the given project
$this->assertTrue($p->isUserAllowed(1, 1)); // Everybody should be allowed
$this->assertTrue($p->isUserAllowed(1, 2)); // Everybody should be allowed
}
public function testAllowUser()
{
$p = new Project($this->registry);
$user = new User($this->registry);
$user->create(array('username' => 'unittest', 'password' => 'unittest'));
// We create a project
$this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
// We allow the admin user
$this->assertTrue($p->allowUser(1, 1));
// Non-existant project
$this->assertFalse($p->allowUser(50, 1));
// Non-existant user
$this->assertFalse($p->allowUser(1, 50));
// Our admin user should be allowed
$this->assertEquals(array('1' => 'admin'), $p->getAllowedUsers(1));
$this->assertTrue($p->isUserAllowed(1, 1));
// Our regular user should be forbidden
$this->assertFalse($p->isUserAllowed(1, 2));
}
public function testRevokeUser()
{
$p = new Project($this->registry);
$user = new User($this->registry);
$user->create(array('username' => 'unittest', 'password' => 'unittest'));
// We create a project
$this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
// We revoke our admin user (not existing row)
$this->assertFalse($p->revokeUser(1, 1));
// We should have nobody in the users list
$this->assertEmpty($p->getAllowedUsers(1));
// Our admin user and our regular user should be allowed
$this->assertTrue($p->isUserAllowed(1, 1));
$this->assertTrue($p->isUserAllowed(1, 2));
// We allow only the regular user
$this->assertTrue($p->allowUser(1, 2));
// All users should be allowed (admin and regular)
$this->assertTrue($p->isUserAllowed(1, 1));
$this->assertTrue($p->isUserAllowed(1, 2));
// However, we should have only our regular user in the list
$this->assertEquals(array('2' => 'unittest'), $p->getAllowedUsers(1));
// We allow our admin, we should have both in the list
$this->assertTrue($p->allowUser(1, 1));
$this->assertEquals(array('1' => 'admin', '2' => 'unittest'), $p->getAllowedUsers(1));
$this->assertTrue($p->isUserAllowed(1, 1));
$this->assertTrue($p->isUserAllowed(1, 2));
// We revoke the regular user
$this->assertTrue($p->revokeUser(1, 2));
// Only admin should be allowed
$this->assertTrue($p->isUserAllowed(1, 1));
$this->assertFalse($p->isUserAllowed(1, 2));
// We should have only admin in the list
$this->assertEquals(array('1' => 'admin'), $p->getAllowedUsers(1));
// We revoke the admin user
$this->assertTrue($p->revokeUser(1, 1));
$this->assertEmpty($p->getAllowedUsers(1));
// Everybody should be allowed again
$this->assertTrue($p->isUserAllowed(1, 1));
$this->assertTrue($p->isUserAllowed(1, 2));
}
public function testUsersList()
{
$p = new Project($this->registry);
$user = new User($this->registry);
$user->create(array('username' => 'unittest', 'password' => 'unittest'));
// We create project
$this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
// No restriction, we should have everybody
$this->assertEquals(
array('Unassigned', 'admin', 'unittest'),
$p->getUsersList(1)
);
// We allow only the regular user
$this->assertTrue($p->allowUser(1, 2));
$this->assertEquals(
array(0 => 'Unassigned', 2 => 'unittest'),
$p->getUsersList(1)
);
// We allow the admin user
$this->assertTrue($p->allowUser(1, 1));
$this->assertEquals(
array(0 => 'Unassigned', 1 => 'admin', 2 => 'unittest'),
$p->getUsersList(1)
);
// We revoke only the regular user
$this->assertTrue($p->revokeUser(1, 2));
$this->assertEquals(
array(0 => 'Unassigned', 1 => 'admin'),
$p->getUsersList(1)
);
// We revoke only the admin user, we should have everybody
$this->assertTrue($p->revokeUser(1, 1));
$this->assertEquals(
array(0 => 'Unassigned', 1 => 'admin', 2 => 'unittest'),
$p->getUsersList(1)
);
}
}

View File

@@ -4,6 +4,7 @@ require_once __DIR__.'/Base.php';
use Model\Task;
use Model\Project;
use Model\ProjectPermission;
use Model\Category;
use Model\User;
@@ -536,6 +537,7 @@ class TaskTest extends Base
{
$t = new Task($this->registry);
$p = new Project($this->registry);
$pp = new ProjectPermission($this->registry);
$user = new User($this->registry);
// We create a regular user
@@ -566,7 +568,7 @@ class TaskTest extends Base
$this->assertEquals('test', $task['title']);
// We allow only one user on the second project
$this->assertTrue($p->allowUser(2, 2));
$this->assertTrue($pp->allowUser(2, 2));
// The owner should be reseted
$task = $t->getById(2);