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

Move dashboard pagination into separate classes

Browse Source
This commit is contained in:
Frederic Guillot
2016-07-24 12:09:41 -04:00
parent 506ebf3bac
commit 51b2193fc4
19 changed files with 337 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/units/Model/TaskFinderModelTest.php
View File

@@ -9,7 +9,7 @@ use Kanboard\Model\ProjectModel;
class TaskFinderModelTest extends Base
{
public function testGetTasksForDashboard()
public function testGetTasksForDashboardWithHiddenColumn()
{
$taskCreationModel = new TaskCreationModel($this->container);
$taskFinderModel = new TaskFinderModel($this->container);

35
tests/units/Pagination/ProjectPaginationTest.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
use Kanboard\Core\Security\Role;
use Kanboard\Model\ProjectModel;
use Kanboard\Model\ProjectUserRoleModel;
use Kanboard\Model\UserModel;
use Kanboard\Pagination\ProjectPagination;
require_once __DIR__.'/../Base.php';
class ProjectPaginationTest extends Base
{
public function testDashboardPagination()
{
$projectModel = new ProjectModel($this->container);
$projectUserRoleModel = new ProjectUserRoleModel($this->container);
$userModel = new UserModel($this->container);
$projectPagination = new ProjectPagination($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertEquals(2, $projectModel->create(array('name' => 'Project #2', 'is_private' => 1)));
$this->assertEquals(3, $projectModel->create(array('name' => 'Project #3')));
$this->assertEquals(4, $projectModel->create(array('name' => 'Project #4', 'is_private' => 1)));
$this->assertEquals(2, $userModel->create(array('username' => 'test')));
$this->assertTrue($projectUserRoleModel->addUser(1, 2, Role::PROJECT_MANAGER));
$this->assertTrue($projectUserRoleModel->addUser(2, 2, Role::PROJECT_MANAGER));
$this->assertCount(2, $projectPagination->getDashboardPaginator(2, 'projects', 5)->getCollection());
$this->assertCount(0, $projectPagination->getDashboardPaginator(3, 'projects', 5)->getCollection());
$this->assertCount(2, $projectPagination->getDashboardPaginator(2, 'projects', 5)->setOrder(ProjectModel::TABLE.'.id')->getCollection());
$this->assertCount(2, $projectPagination->getDashboardPaginator(2, 'projects', 5)->setOrder(ProjectModel::TABLE.'.is_private')->getCollection());
$this->assertCount(2, $projectPagination->getDashboardPaginator(2, 'projects', 5)->setOrder(ProjectModel::TABLE.'.name')->getCollection());
}
}

36
tests/units/Pagination/SubtaskPaginationTest.php Normal file
View File

@@ -0,0 +1,36 @@
<?php
use Kanboard\Model\ProjectModel;
use Kanboard\Model\SubtaskModel;
use Kanboard\Model\TaskCreationModel;
use Kanboard\Model\TaskModel;
use Kanboard\Pagination\SubtaskPagination;
require_once __DIR__.'/../Base.php';
class SubtaskPaginationTest extends Base
{
public function testDashboardPagination()
{
$taskCreationModel = new TaskCreationModel($this->container);
$projectModel = new ProjectModel($this->container);
$subtaskModel = new SubtaskModel($this->container);
$subtaskPagination = new SubtaskPagination($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1)));
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 1)));
$this->assertEquals(1, $subtaskModel->create(array('task_id' => 1, 'title' => 'subtask #1', 'user_id' => 1)));
$this->assertEquals(2, $subtaskModel->create(array('task_id' => 2, 'title' => 'subtask #1', 'user_id' => 1)));
$this->assertEquals(3, $subtaskModel->create(array('task_id' => 1, 'title' => 'subtask #1', 'user_id' => 1)));
$this->assertEquals(4, $subtaskModel->create(array('task_id' => 2, 'title' => 'subtask #1')));
$this->assertEquals(5, $subtaskModel->create(array('task_id' => 1, 'title' => 'subtask #1')));
$this->assertCount(3, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->getCollection());
$this->assertCount(0, $subtaskPagination->getDashboardPaginator(2, 'subtasks', 5)->getCollection());
$this->assertCount(3, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->setOrder(TaskModel::TABLE.'.id')->getCollection());
$this->assertCount(3, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->setOrder('project_name')->getCollection());
$this->assertCount(3, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->setOrder('task_name')->getCollection());
$this->assertCount(3, $subtaskPagination->getDashboardPaginator(1, 'subtasks', 5)->setOrder(SubtaskModel::TABLE.'.title')->getCollection());
}
}

30
tests/units/Pagination/TaskPaginationTest.php Normal file
View File

@@ -0,0 +1,30 @@
<?php
use Kanboard\Model\ProjectModel;
use Kanboard\Model\TaskCreationModel;
use Kanboard\Model\TaskModel;
use Kanboard\Pagination\TaskPagination;
require_once __DIR__.'/../Base.php';
class TaskPaginationTest extends Base
{
public function testDashboardPagination()
{
$taskCreationModel = new TaskCreationModel($this->container);
$projectModel = new ProjectModel($this->container);
$taskPagination = new TaskPagination($this->container);
$this->assertEquals(1, $projectModel->create(array('name' => 'Project #1')));
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'Task #1', 'project_id' => 1)));
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'Task #2', 'project_id' => 1, 'column_id' => 2, 'owner_id' => 1)));
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->getCollection());
$this->assertCount(0, $taskPagination->getDashboardPaginator(2, 'tasks', 5)->getCollection());
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->setOrder(TaskModel::TABLE.'.id')->getCollection());
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->setOrder('project_name')->getCollection());
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->setOrder(TaskModel::TABLE.'.title')->getCollection());
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->setOrder(TaskModel::TABLE.'.priority')->getCollection());
$this->assertCount(1, $taskPagination->getDashboardPaginator(1, 'tasks', 5)->setOrder(TaskModel::TABLE.'.date_due')->getCollection());
}
}

27
tests/units/Pagination/UserPaginationTest.php Normal file
View File

@@ -0,0 +1,27 @@
<?php
use Kanboard\Model\UserModel;
use Kanboard\Pagination\UserPagination;
require_once __DIR__.'/../Base.php';
class UserPaginationTest extends Base
{
public function testListingPagination()
{
$userModel = new UserModel($this->container);
$userPagination = new UserPagination($this->container);
$this->assertEquals(2, $userModel->create(array('username' => 'test1')));
$this->assertEquals(3, $userModel->create(array('username' => 'test2')));
$this->assertCount(3, $userPagination->getListingPaginator()->setOrder('id')->getCollection());
$this->assertCount(3, $userPagination->getListingPaginator()->setOrder('username')->getCollection());
$this->assertCount(3, $userPagination->getListingPaginator()->setOrder('name')->getCollection());
$this->assertCount(3, $userPagination->getListingPaginator()->setOrder('email')->getCollection());
$this->assertCount(3, $userPagination->getListingPaginator()->setOrder('role')->getCollection());
$this->assertCount(3, $userPagination->getListingPaginator()->setOrder('twofactor_activated')->setDirection('DESC')->getCollection());
$this->assertCount(3, $userPagination->getListingPaginator()->setOrder('is_ldap_user')->getCollection());
$this->assertCount(3, $userPagination->getListingPaginator()->setOrder('is_active')->getCollection());
}
}