AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve column restrictions

Browse Source
This commit is contained in:
Frederic Guillot
2016-09-11 18:32:47 -04:00
parent d8f6d85683
commit c84df535b6
9 changed files with 66 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/units/Model/ColumnMoveRestrictionModelTest.php
View File

@@ -54,32 +54,6 @@ class ColumnMoveRestrictionModelTest extends Base
$this->assertEquals(3, $restriction['dst_column_id']);
}
public function testGetSrcColumns()
{
$projectModel = new ProjectModel($this->container);
$projectRoleModel = new ProjectRoleModel($this->container);
$columnMoveRestrictionModel = new ColumnMoveRestrictionModel($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
$this->assertEquals(2, $projectModel->create(array('name' => 'Test')));
$this->assertEquals(1, $projectRoleModel->create(1, 'Role A'));
$this->assertEquals(2, $projectRoleModel->create(1, 'Role B'));
$this->assertEquals(3, $projectRoleModel->create(2, 'Role C'));
$this->assertEquals(1, $columnMoveRestrictionModel->create(1, 1, 2, 3));
$this->assertEquals(2, $columnMoveRestrictionModel->create(1, 2, 3, 4));
$columnIds = $columnMoveRestrictionModel->getAllSrcColumns(1, 'Role A');
$this->assertEquals(2, $columnIds[2]);
$this->assertEmpty($columnMoveRestrictionModel->getAllSrcColumns(2, 'Role A'));
$this->assertEmpty($columnMoveRestrictionModel->getAllSrcColumns(2, 'Role C'));
$columnIds = $columnMoveRestrictionModel->getAllSrcColumns(1, 'Role B');
$this->assertEquals(3, $columnIds[3]);
}
public function testGetAll()
{
$projectModel = new ProjectModel($this->container);
@@ -115,24 +89,4 @@ class ColumnMoveRestrictionModelTest extends Base
$this->assertEquals(3, $restrictions[1]['src_column_id']);
$this->assertEquals(4, $restrictions[1]['dst_column_id']);
}
public function testIsAllowed()
{
$projectModel = new ProjectModel($this->container);
$projectRoleModel = new ProjectRoleModel($this->container);
$columnMoveRestrictionModel = new ColumnMoveRestrictionModel($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Test')));
$this->assertEquals(2, $projectModel->create(array('name' => 'Test')));
$this->assertEquals(1, $projectRoleModel->create(1, 'Role A'));
$this->assertEquals(2, $projectRoleModel->create(1, 'Role B'));
$this->assertEquals(3, $projectRoleModel->create(2, 'Role C'));
$this->assertEquals(1, $columnMoveRestrictionModel->create(1, 1, 2, 3));
$this->assertEquals(2, $columnMoveRestrictionModel->create(1, 2, 3, 4));
$this->assertFalse($columnMoveRestrictionModel->isAllowed(1, 'Role A', 1, 2));
$this->assertTrue($columnMoveRestrictionModel->isAllowed(1, 'Role A', 2, 3));
}
}