ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Rename permissions in backend

Browse Source
This commit is contained in:
Julius Haertl
2017-01-19 11:03:04 +01:00
parent 5f9e65aa96
commit f936afd972
15 changed files with 93 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit/Db/AclMapperTest.php
View File

@@ -66,12 +66,12 @@ class AclMapperTest extends MapperTestUtility {
}
}
/** @return Acl */
public function getAcl($type='user', $participant='admin', $write=false, $invite=false, $manage=false, $boardId=123) {
public function getAcl($type='user', $participant='admin', $edit=false, $share=false, $manage=false, $boardId=123) {
$acl = new Acl();
$acl->setParticipant($participant);
$acl->setType('user');
$acl->setPermissionWrite($write);
$acl->setPermissionInvite($invite);
$acl->setPermissionEdit($edit);
$acl->setPermissionShare($share);
$acl->setPermissionManage($manage);
$acl->setBoardId($boardId);
return $acl;

24
tests/unit/Db/AclTest.php
View File

@@ -30,8 +30,8 @@ class AclTest extends \PHPUnit_Framework_TestCase {
$acl->setParticipant("admin");
$acl->setType("user");
$acl->setBoardId(1);
$acl->setPermissionWrite(1);
$acl->setPermissionInvite(1);
$acl->setPermissionEdit(1);
$acl->setPermissionShare(1);
$acl->setPermissionManage(1);
return $acl;
}
@@ -41,8 +41,8 @@ class AclTest extends \PHPUnit_Framework_TestCase {
$acl->setParticipant("administrators");
$acl->setType("group");
$acl->setBoardId(1);
$acl->setPermissionWrite(1);
$acl->setPermissionInvite(1);
$acl->setPermissionEdit(1);
$acl->setPermissionShare(1);
$acl->setPermissionManage(1);
return $acl;
}
@@ -53,8 +53,8 @@ class AclTest extends \PHPUnit_Framework_TestCase {
'participant' => 'admin',
'type' => 'user',
'boardId' => 1,
'permissionWrite' => 1,
'permissionInvite' => 1,
'permissionEdit' => 1,
'permissionShare' => 1,
'permissionManage' => 1,
'owner' => 0
], $acl->jsonSerialize());
@@ -64,8 +64,8 @@ class AclTest extends \PHPUnit_Framework_TestCase {
'participant' => 'administrators',
'type' => 'group',
'boardId' => 1,
'permissionWrite' => 1,
'permissionInvite' => 1,
'permissionEdit' => 1,
'permissionShare' => 1,
'permissionManage' => 1,
'owner' => 0
], $acl->jsonSerialize());
@@ -78,8 +78,8 @@ class AclTest extends \PHPUnit_Framework_TestCase {
'participant' => 'admin',
'type' => 'user',
'boardId' => 1,
'permissionWrite' => 1,
'permissionInvite' => 1,
'permissionEdit' => 1,
'permissionShare' => 1,
'permissionManage' => 1,
'owner' => 1
], $acl->jsonSerialize());
@@ -92,8 +92,8 @@ class AclTest extends \PHPUnit_Framework_TestCase {
$this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_EDIT));
$this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_MANAGE));
$this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_SHARE));
$acl->setPermissionWrite(0);
$acl->setPermissionInvite(0);
$acl->setPermissionEdit(0);
$acl->setPermissionShare(0);
$acl->setPermissionManage(0);
$this->assertEquals(true, $acl->getPermission(Acl::PERMISSION_READ));
$this->assertEquals(false, $acl->getPermission(Acl::PERMISSION_EDIT));

6
tests/unit/Db/BoardMapperTest.php
View File

@@ -71,12 +71,12 @@ class BoardMapperTest extends MapperTestUtility {
}
}
/** @return Acl */
public function getAcl($type='user', $participant='admin', $write=false, $invite=false, $manage=false, $boardId=123) {
public function getAcl($type='user', $participant='admin', $edit=false, $share=false, $manage=false, $boardId=123) {
$acl = new Acl();
$acl->setParticipant($participant);
$acl->setType('user');
$acl->setPermissionWrite($write);
$acl->setPermissionInvite($invite);
$acl->setPermissionEdit($edit);
$acl->setPermissionShare($share);
$acl->setPermissionManage($manage);
$acl->setBoardId($boardId);
return $acl;

16
tests/unit/Service/BoardServiceTest.php
View File

@@ -144,8 +144,8 @@ class BoardServiceTest extends \PHPUnit_Framework_TestCase {
$acl->setBoardId(123);
$acl->setType('user');
$acl->setParticipant('admin');
$acl->setPermissionWrite(true);
$acl->setPermissionInvite(true);
$acl->setPermissionEdit(true);
$acl->setPermissionShare(true);
$acl->setPermissionManage(true);
$this->aclMapper->expects($this->once())
->method('insert')
@@ -161,8 +161,8 @@ class BoardServiceTest extends \PHPUnit_Framework_TestCase {
$acl->setBoardId(123);
$acl->setType('user');
$acl->setParticipant('admin');
$acl->setPermissionWrite(true);
$acl->setPermissionInvite(true);
$acl->setPermissionEdit(true);
$acl->setPermissionShare(true);
$acl->setPermissionManage(true);
$this->aclMapper->expects($this->once())
@@ -178,8 +178,8 @@ class BoardServiceTest extends \PHPUnit_Framework_TestCase {
123, false, false, false
);
$this->assertFalse($result->getPermissionWrite());
$this->assertFalse($result->getPermissionInvite());
$this->assertFalse($result->getPermissionEdit());
$this->assertFalse($result->getPermissionShare());
$this->assertFalse($result->getPermissionManage());
}
@@ -189,8 +189,8 @@ class BoardServiceTest extends \PHPUnit_Framework_TestCase {
$acl->setBoardId(123);
$acl->setType('user');
$acl->setParticipant('admin');
$acl->setPermissionWrite(true);
$acl->setPermissionInvite(true);
$acl->setPermissionEdit(true);
$acl->setPermissionShare(true);
$acl->setPermissionManage(true);
$this->aclMapper->expects($this->once())
->method('find')

14
tests/unit/Service/PermissionServiceTest.php
View File

@@ -88,8 +88,8 @@ class PermissionServiceTest extends \PHPUnit_Framework_TestCase {
$aclUser = new Acl();
$aclUser->setType('user');
$aclUser->setParticipant('admin');
$aclUser->setPermissionWrite(true);
$aclUser->setPermissionInvite(true);
$aclUser->setPermissionEdit(true);
$aclUser->setPermissionShare(true);
$aclUser->setPermissionManage(true);
$this->aclMapper->expects($this->once())
->method('findAll')
@@ -150,8 +150,8 @@ class PermissionServiceTest extends \PHPUnit_Framework_TestCase {
$aclUser = new Acl();
$aclUser->setType($type);
$aclUser->setParticipant($participant);
$aclUser->setPermissionWrite($edit);
$aclUser->setPermissionInvite($share);
$aclUser->setPermissionEdit($edit);
$aclUser->setPermissionShare($share);
$aclUser->setPermissionManage($manage);
$acls = [
$aclUser
@@ -257,13 +257,13 @@ class PermissionServiceTest extends \PHPUnit_Framework_TestCase {
$this->service->checkPermission($mapper, 1234, Acl::PERMISSION_READ);
}
private function generateAcl($boardId, $type, $participant, $write, $manage, $share) {
private function generateAcl($boardId, $type, $participant, $edit, $manage, $share) {
$acl = new Acl();
$acl->setParticipant($participant);
$acl->setBoardId($boardId);
$acl->setType($type);
$acl->setPermissionWrite($write);
$acl->setPermissionInvite($share);
$acl->setPermissionEdit($edit);
$acl->setPermissionShare($share);
$acl->setPermissionManage($manage);
return $acl;
}

2
tests/unit/controller/CardControllerTest.php
View File

@@ -108,7 +108,7 @@ class CardControllerTest extends \PHPUnit_Framework_TestCase {
$this->cardService->expects($this->once())->method('reorder');
$this->controller->reorder(1, 2, 3);
}
public function testRename() {
$this->cardService->expects($this->once())->method('rename');
$this->controller->rename(1, 'test');

8
tests/unit/controller/ShareControllerTest.php
View File

@@ -96,8 +96,8 @@ class ShareControllerTest extends \PHPUnit_Framework_TestCase {
$acl = new Acl();
$acl->setType('group');
$acl->setParticipant('foo');
$acl->setPermissionWrite(true);
$acl->setPermissionInvite(true);
$acl->setPermissionEdit(true);
$acl->setPermissionShare(true);
$acl->setPermissionManage(true);
$this->assertEquals([$acl], $actual);
}
@@ -122,8 +122,8 @@ class ShareControllerTest extends \PHPUnit_Framework_TestCase {
$acl = new Acl();
$acl->setType('user');
$acl->setParticipant('foo');
$acl->setPermissionWrite(true);
$acl->setPermissionInvite(true);
$acl->setPermissionEdit(true);
$acl->setPermissionShare(true);
$acl->setPermissionManage(true);
$this->assertEquals([$acl], $actual);
}