Add projects to the dashboard and rename some methods
This commit is contained in:
@@ -31,7 +31,7 @@ class NotificationTest extends Base
|
||||
$this->assertTrue($u->create(array('username' => 'user4')));
|
||||
|
||||
// Nobody is member of any projects
|
||||
$this->assertEmpty($pp->getAllowedUsers(1));
|
||||
$this->assertEmpty($pp->getMembers(1));
|
||||
$this->assertEmpty($n->getUsersWithNotification(1));
|
||||
|
||||
// We allow all users to be member of our projects
|
||||
@@ -40,7 +40,7 @@ class NotificationTest extends Base
|
||||
$this->assertTrue($pp->allowUser(1, 3));
|
||||
$this->assertTrue($pp->allowUser(1, 4));
|
||||
|
||||
$this->assertNotEmpty($pp->getAllowedUsers(1));
|
||||
$this->assertNotEmpty($pp->getMembers(1));
|
||||
$users = $n->getUsersWithNotification(1);
|
||||
|
||||
$this->assertNotEmpty($users);
|
||||
|
||||
@@ -22,16 +22,16 @@ class ProjectPermissionTest extends Base
|
||||
$this->assertTrue($pp->isUserAllowed(1, 1));
|
||||
$this->assertFalse($pp->isUserAllowed(1, 2));
|
||||
$this->assertFalse($pp->isUserAllowed(1, 3));
|
||||
$this->assertEquals(array(), $pp->getAllowedUsers(1));
|
||||
$this->assertEquals(array('Unassigned'), $pp->getUsersList(1));
|
||||
$this->assertEquals(array(), $pp->getMembers(1));
|
||||
$this->assertEquals(array('Unassigned'), $pp->getMemberList(1));
|
||||
|
||||
$this->assertTrue($p->update(array('id' => 1, 'is_everybody_allowed' => 1)));
|
||||
$this->assertTrue($pp->isEverybodyAllowed(1));
|
||||
$this->assertTrue($pp->isUserAllowed(1, 1));
|
||||
$this->assertTrue($pp->isUserAllowed(1, 2));
|
||||
$this->assertTrue($pp->isUserAllowed(1, 3));
|
||||
$this->assertEquals(array('1' => 'admin', '2' => 'unittest#1', '3' => 'unittest#2'), $pp->getAllowedUsers(1));
|
||||
$this->assertEquals(array('Unassigned', '1' => 'admin', '2' => 'unittest#1', '3' => 'unittest#2'), $pp->getUsersList(1));
|
||||
$this->assertEquals(array('1' => 'admin', '2' => 'unittest#1', '3' => 'unittest#2'), $pp->getMembers(1));
|
||||
$this->assertEquals(array('Unassigned', '1' => 'admin', '2' => 'unittest#1', '3' => 'unittest#2'), $pp->getMemberList(1));
|
||||
}
|
||||
|
||||
public function testDisallowEverybody()
|
||||
@@ -45,7 +45,7 @@ class ProjectPermissionTest extends Base
|
||||
|
||||
$this->assertEquals(1, $p->create(array('name' => 'UnitTest')));
|
||||
|
||||
$this->assertEmpty($pp->getAllowedUsers(1)); // Nobody is specified for the given project
|
||||
$this->assertEmpty($pp->getMembers(1)); // Nobody is specified for the given project
|
||||
$this->assertTrue($pp->isUserAllowed(1, 1)); // Admin should be allowed
|
||||
$this->assertFalse($pp->isUserAllowed(1, 2)); // Regular user should be denied
|
||||
}
|
||||
@@ -72,7 +72,7 @@ class ProjectPermissionTest extends Base
|
||||
$this->assertFalse($pp->allowUser(1, 50));
|
||||
|
||||
// Both users should be allowed
|
||||
$this->assertEquals(array('1' => 'admin', '2' => 'unittest'), $pp->getAllowedUsers(1));
|
||||
$this->assertEquals(array('1' => 'admin', '2' => 'unittest'), $pp->getMembers(1));
|
||||
$this->assertTrue($pp->isUserAllowed(1, 1));
|
||||
$this->assertTrue($pp->isUserAllowed(1, 2));
|
||||
}
|
||||
@@ -92,7 +92,7 @@ class ProjectPermissionTest extends Base
|
||||
$this->assertFalse($pp->revokeUser(1, 1));
|
||||
|
||||
// We should have nobody in the users list
|
||||
$this->assertEmpty($pp->getAllowedUsers(1));
|
||||
$this->assertEmpty($pp->getMembers(1));
|
||||
|
||||
// Only admin is allowed
|
||||
$this->assertTrue($pp->isUserAllowed(1, 1));
|
||||
@@ -106,11 +106,11 @@ class ProjectPermissionTest extends Base
|
||||
$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));
|
||||
$this->assertEquals(array('2' => 'unittest'), $pp->getMembers(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->assertEquals(array('1' => 'admin', '2' => 'unittest'), $pp->getMembers(1));
|
||||
$this->assertTrue($pp->isUserAllowed(1, 1));
|
||||
$this->assertTrue($pp->isUserAllowed(1, 2));
|
||||
|
||||
@@ -122,11 +122,11 @@ class ProjectPermissionTest extends Base
|
||||
$this->assertFalse($pp->isUserAllowed(1, 2));
|
||||
|
||||
// We should have only admin in the list
|
||||
$this->assertEquals(array('1' => 'admin'), $pp->getAllowedUsers(1));
|
||||
$this->assertEquals(array('1' => 'admin'), $pp->getMembers(1));
|
||||
|
||||
// We revoke the admin user
|
||||
$this->assertTrue($pp->revokeUser(1, 1));
|
||||
$this->assertEmpty($pp->getAllowedUsers(1));
|
||||
$this->assertEmpty($pp->getMembers(1));
|
||||
|
||||
// Only admin should be allowed again
|
||||
$this->assertTrue($pp->isUserAllowed(1, 1));
|
||||
@@ -147,7 +147,7 @@ class ProjectPermissionTest extends Base
|
||||
// No restriction, we should have no body
|
||||
$this->assertEquals(
|
||||
array('Unassigned'),
|
||||
$pp->getUsersList(1)
|
||||
$pp->getMemberList(1)
|
||||
);
|
||||
|
||||
// We allow only the regular user
|
||||
@@ -155,7 +155,7 @@ class ProjectPermissionTest extends Base
|
||||
|
||||
$this->assertEquals(
|
||||
array(0 => 'Unassigned', 2 => 'unittest'),
|
||||
$pp->getUsersList(1)
|
||||
$pp->getMemberList(1)
|
||||
);
|
||||
|
||||
// We allow the admin user
|
||||
@@ -163,7 +163,7 @@ class ProjectPermissionTest extends Base
|
||||
|
||||
$this->assertEquals(
|
||||
array(0 => 'Unassigned', 1 => 'admin', 2 => 'unittest'),
|
||||
$pp->getUsersList(1)
|
||||
$pp->getMemberList(1)
|
||||
);
|
||||
|
||||
// We revoke only the regular user
|
||||
@@ -171,7 +171,7 @@ class ProjectPermissionTest extends Base
|
||||
|
||||
$this->assertEquals(
|
||||
array(0 => 'Unassigned', 1 => 'admin'),
|
||||
$pp->getUsersList(1)
|
||||
$pp->getMemberList(1)
|
||||
);
|
||||
|
||||
// We revoke only the admin user, we should have everybody
|
||||
@@ -179,7 +179,7 @@ class ProjectPermissionTest extends Base
|
||||
|
||||
$this->assertEquals(
|
||||
array(0 => 'Unassigned'),
|
||||
$pp->getUsersList(1)
|
||||
$pp->getMemberList(1)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ class ProjectTest extends Base
|
||||
|
||||
$pp = new ProjectPermission($this->registry);
|
||||
|
||||
$this->assertEquals(array(1 => 'admin'), $pp->getAllowedUsers(3));
|
||||
$this->assertEquals(array(1 => 'admin'), $pp->getAllowedUsers(4));
|
||||
$this->assertEquals(array(1 => 'admin'), $pp->getMembers(3));
|
||||
$this->assertEquals(array(1 => 'admin'), $pp->getMembers(4));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user