Added internal task links to activity stream
This commit is contained in:
@@ -2,12 +2,12 @@
|
||||
|
||||
require_once __DIR__.'/../Base.php';
|
||||
|
||||
use Kanboard\EventBuilder\TaskLinkEventBuilder;
|
||||
use Kanboard\Model\TaskCreationModel;
|
||||
use Kanboard\Model\TaskFinderModel;
|
||||
use Kanboard\Model\ProjectModel;
|
||||
use Kanboard\Model\TaskLinkModel;
|
||||
use Kanboard\Model\CategoryModel;
|
||||
use Kanboard\Event\TaskLinkEvent;
|
||||
use Kanboard\Action\TaskAssignCategoryLink;
|
||||
|
||||
class TaskAssignCategoryLinkTest extends Base
|
||||
@@ -18,6 +18,7 @@ class TaskAssignCategoryLinkTest extends Base
|
||||
$taskFinderModel = new TaskFinderModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$categoryModel = new CategoryModel($this->container);
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
|
||||
$action = new TaskAssignCategoryLink($this->container);
|
||||
$action->setProjectId(1);
|
||||
@@ -27,13 +28,12 @@ class TaskAssignCategoryLinkTest extends Base
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
|
||||
$this->assertEquals(1, $categoryModel->create(array('name' => 'C1', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'T2', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 2));
|
||||
|
||||
$event = new TaskLinkEvent(array(
|
||||
'project_id' => 1,
|
||||
'task_id' => 1,
|
||||
'opposite_task_id' => 2,
|
||||
'link_id' => 2,
|
||||
));
|
||||
$event = TaskLinkEventBuilder::getInstance($this->container)
|
||||
->withTaskLinkId(1)
|
||||
->build();
|
||||
|
||||
$this->assertTrue($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
|
||||
|
||||
@@ -44,51 +44,58 @@ class TaskAssignCategoryLinkTest extends Base
|
||||
public function testWhenLinkDontMatch()
|
||||
{
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$taskFinderModel = new TaskFinderModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$categoryModel = new CategoryModel($this->container);
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
|
||||
$action = new TaskAssignCategoryLink($this->container);
|
||||
$action->setProjectId(1);
|
||||
$action->setParam('category_id', 1);
|
||||
$action->setParam('link_id', 1);
|
||||
$action->setParam('link_id', 2);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
|
||||
$this->assertEquals(1, $categoryModel->create(array('name' => 'C1', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'T2', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
|
||||
|
||||
$event = new TaskLinkEvent(array(
|
||||
'project_id' => 1,
|
||||
'task_id' => 1,
|
||||
'opposite_task_id' => 2,
|
||||
'link_id' => 2,
|
||||
));
|
||||
$event = TaskLinkEventBuilder::getInstance($this->container)
|
||||
->withTaskLinkId(1)
|
||||
->build();
|
||||
|
||||
$this->assertFalse($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
|
||||
|
||||
$task = $taskFinderModel->getById(1);
|
||||
$this->assertEquals(0, $task['category_id']);
|
||||
}
|
||||
|
||||
public function testThatExistingCategoryWillNotChange()
|
||||
{
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$taskFinderModel = new TaskFinderModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$categoryModel = new CategoryModel($this->container);
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
|
||||
$action = new TaskAssignCategoryLink($this->container);
|
||||
$action->setProjectId(1);
|
||||
$action->setParam('category_id', 2);
|
||||
$action->setParam('category_id', 1);
|
||||
$action->setParam('link_id', 2);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
|
||||
$this->assertEquals(1, $categoryModel->create(array('name' => 'C1', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $categoryModel->create(array('name' => 'C2', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1, 'category_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'T2', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 2));
|
||||
|
||||
$event = new TaskLinkEvent(array(
|
||||
'project_id' => 1,
|
||||
'task_id' => 1,
|
||||
'opposite_task_id' => 2,
|
||||
'link_id' => 2,
|
||||
));
|
||||
$event = TaskLinkEventBuilder::getInstance($this->container)
|
||||
->withTaskLinkId(1)
|
||||
->build();
|
||||
|
||||
$this->assertFalse($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
|
||||
|
||||
$task = $taskFinderModel->getById(1);
|
||||
$this->assertEquals(1, $task['category_id']);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
require_once __DIR__.'/../Base.php';
|
||||
|
||||
use Kanboard\Event\GenericEvent;
|
||||
use Kanboard\EventBuilder\TaskLinkEventBuilder;
|
||||
use Kanboard\Model\TaskCreationModel;
|
||||
use Kanboard\Model\TaskFinderModel;
|
||||
use Kanboard\Model\ProjectModel;
|
||||
@@ -13,42 +13,55 @@ class TaskAssignColorLinkTest extends Base
|
||||
{
|
||||
public function testChangeColor()
|
||||
{
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$taskFinderModel = new TaskFinderModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
|
||||
|
||||
$event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'link_id' => 1));
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
|
||||
$action = new TaskAssignColorLink($this->container);
|
||||
$action->setProjectId(1);
|
||||
$action->setParam('link_id', 2);
|
||||
$action->setParam('color_id', 'red');
|
||||
$action->setParam('link_id', 1);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'T2', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 2));
|
||||
|
||||
$event = TaskLinkEventBuilder::getInstance($this->container)
|
||||
->withTaskLinkId(1)
|
||||
->build();
|
||||
|
||||
$this->assertTrue($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
|
||||
|
||||
$task = $taskFinderModel->getById(1);
|
||||
$this->assertNotEmpty($task);
|
||||
$this->assertEquals('red', $task['color_id']);
|
||||
}
|
||||
|
||||
public function testWithWrongLink()
|
||||
{
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
|
||||
|
||||
$event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'link_id' => 2));
|
||||
$taskFinderModel = new TaskFinderModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
|
||||
$action = new TaskAssignColorLink($this->container);
|
||||
$action->setProjectId(1);
|
||||
$action->setParam('link_id', 2);
|
||||
$action->setParam('color_id', 'red');
|
||||
$action->setParam('link_id', 1);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'P1')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'T1', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'T2', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
|
||||
|
||||
$event = TaskLinkEventBuilder::getInstance($this->container)
|
||||
->withTaskLinkId(1)
|
||||
->build();
|
||||
|
||||
$this->assertFalse($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
|
||||
|
||||
$task = $taskFinderModel->getById(1);
|
||||
$this->assertEquals('yellow', $task['color_id']);
|
||||
}
|
||||
}
|
||||
|
||||
70
tests/units/EventBuilder/TaskLinkEventBuilderTest.php
Normal file
70
tests/units/EventBuilder/TaskLinkEventBuilderTest.php
Normal file
@@ -0,0 +1,70 @@
|
||||
<?php
|
||||
|
||||
use Kanboard\EventBuilder\TaskLinkEventBuilder;
|
||||
use Kanboard\Model\ProjectModel;
|
||||
use Kanboard\Model\TaskCreationModel;
|
||||
use Kanboard\Model\TaskLinkModel;
|
||||
|
||||
require_once __DIR__.'/../Base.php';
|
||||
|
||||
class TaskLinkEventBuilderTest extends Base
|
||||
{
|
||||
public function testWithMissingLink()
|
||||
{
|
||||
$taskLinkEventBuilder = new TaskLinkEventBuilder($this->container);
|
||||
$taskLinkEventBuilder->withTaskLinkId(42);
|
||||
$this->assertNull($taskLinkEventBuilder->build());
|
||||
}
|
||||
|
||||
public function testBuild()
|
||||
{
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskLinkEventBuilder = new TaskLinkEventBuilder($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'task 1', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'task 2', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
|
||||
|
||||
$event = $taskLinkEventBuilder->withTaskLinkId(1)->build();
|
||||
|
||||
$this->assertInstanceOf('Kanboard\Event\TaskLinkEvent', $event);
|
||||
$this->assertNotEmpty($event['task_link']);
|
||||
$this->assertNotEmpty($event['task']);
|
||||
}
|
||||
|
||||
public function testBuildTitle()
|
||||
{
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskLinkEventBuilder = new TaskLinkEventBuilder($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'task 1', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'task 2', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
|
||||
|
||||
$eventData = $taskLinkEventBuilder->withTaskLinkId(1)->build();
|
||||
|
||||
$title = $taskLinkEventBuilder->buildTitleWithAuthor('Foobar', TaskLinkModel::EVENT_CREATE_UPDATE, $eventData->getAll());
|
||||
$this->assertEquals('Foobar set a new internal link for the task #1', $title);
|
||||
|
||||
$title = $taskLinkEventBuilder->buildTitleWithAuthor('Foobar', TaskLinkModel::EVENT_DELETE, $eventData->getAll());
|
||||
$this->assertEquals('Foobar removed an internal link for the task #1', $title);
|
||||
|
||||
$title = $taskLinkEventBuilder->buildTitleWithAuthor('Foobar', 'not found', $eventData->getAll());
|
||||
$this->assertSame('', $title);
|
||||
|
||||
$title = $taskLinkEventBuilder->buildTitleWithoutAuthor(TaskLinkModel::EVENT_CREATE_UPDATE, $eventData->getAll());
|
||||
$this->assertEquals('A new internal link for the task #1 have been defined', $title);
|
||||
|
||||
$title = $taskLinkEventBuilder->buildTitleWithoutAuthor(TaskLinkModel::EVENT_DELETE, $eventData->getAll());
|
||||
$this->assertEquals('Internal link removed for the task #1', $title);
|
||||
|
||||
$title = $taskLinkEventBuilder->buildTitleWithoutAuthor('not found', $eventData->getAll());
|
||||
$this->assertSame('', $title);
|
||||
}
|
||||
}
|
||||
65
tests/units/Job/TaskLinkEventJobTest.php
Normal file
65
tests/units/Job/TaskLinkEventJobTest.php
Normal file
@@ -0,0 +1,65 @@
|
||||
<?php
|
||||
|
||||
use Kanboard\Job\TaskLinkEventJob;
|
||||
use Kanboard\Model\ProjectModel;
|
||||
use Kanboard\Model\TaskCreationModel;
|
||||
use Kanboard\Model\TaskLinkModel;
|
||||
|
||||
require_once __DIR__.'/../Base.php';
|
||||
|
||||
class TaskLinkEventJobTest extends Base
|
||||
{
|
||||
public function testJobParams()
|
||||
{
|
||||
$taskLinkEventJob = new TaskLinkEventJob($this->container);
|
||||
$taskLinkEventJob->withParams(123, 'foobar');
|
||||
|
||||
$this->assertSame(array(123, 'foobar'), $taskLinkEventJob->getJobParams());
|
||||
}
|
||||
|
||||
public function testWithMissingLink()
|
||||
{
|
||||
$this->container['dispatcher']->addListener(TaskLinkModel::EVENT_CREATE_UPDATE, function() {});
|
||||
|
||||
$taskLinkEventJob = new TaskLinkEventJob($this->container);
|
||||
$taskLinkEventJob->execute(42, TaskLinkModel::EVENT_CREATE_UPDATE);
|
||||
|
||||
$called = $this->container['dispatcher']->getCalledListeners();
|
||||
$this->assertEmpty($called);
|
||||
}
|
||||
|
||||
public function testTriggerCreationEvents()
|
||||
{
|
||||
$this->container['dispatcher']->addListener(TaskLinkModel::EVENT_CREATE_UPDATE, function() {});
|
||||
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'task 1', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'task 2', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
|
||||
|
||||
$called = $this->container['dispatcher']->getCalledListeners();
|
||||
$this->assertArrayHasKey(TaskLinkModel::EVENT_CREATE_UPDATE.'.closure', $called);
|
||||
}
|
||||
|
||||
public function testTriggerDeleteEvents()
|
||||
{
|
||||
$this->container['dispatcher']->addListener(TaskLinkModel::EVENT_DELETE, function() {});
|
||||
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'task 1', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'task 2', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
|
||||
$this->assertTrue($taskLinkModel->remove(1));
|
||||
|
||||
$called = $this->container['dispatcher']->getCalledListeners();
|
||||
$this->assertArrayHasKey(TaskLinkModel::EVENT_DELETE.'.closure', $called);
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ use Kanboard\Model\TaskCreationModel;
|
||||
use Kanboard\Model\SubtaskModel;
|
||||
use Kanboard\Model\CommentModel;
|
||||
use Kanboard\Model\TaskFileModel;
|
||||
use Kanboard\Model\TaskLinkModel;
|
||||
use Kanboard\Model\TaskModel;
|
||||
use Kanboard\Model\ProjectModel;
|
||||
use Kanboard\Model\NotificationModel;
|
||||
@@ -23,47 +24,38 @@ class NotificationModelTest extends Base
|
||||
$subtaskModel = new SubtaskModel($this->container);
|
||||
$commentModel = new CommentModel($this->container);
|
||||
$taskFileModel = new TaskFileModel($this->container);
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $subtaskModel->create(array('title' => 'test', 'task_id' => 1)));
|
||||
$this->assertEquals(1, $commentModel->create(array('comment' => 'test', 'task_id' => 1, 'user_id' => 1)));
|
||||
$this->assertEquals(1, $taskFileModel->create(1, 'test', 'blah', 123));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
|
||||
|
||||
$task = $taskFinderModel->getDetails(1);
|
||||
$subtask = $subtaskModel->getById(1, true);
|
||||
$comment = $commentModel->getById(1);
|
||||
$file = $commentModel->getById(1);
|
||||
$tasklink = $taskLinkModel->getById(1);
|
||||
|
||||
$this->assertNotEmpty($task);
|
||||
$this->assertNotEmpty($subtask);
|
||||
$this->assertNotEmpty($comment);
|
||||
$this->assertNotEmpty($file);
|
||||
|
||||
foreach (NotificationSubscriber::getSubscribedEvents() as $event_name => $values) {
|
||||
$title = $notificationModel->getTitleWithoutAuthor($event_name, array(
|
||||
foreach (NotificationSubscriber::getSubscribedEvents() as $eventName => $values) {
|
||||
$eventData = array(
|
||||
'task' => $task,
|
||||
'comment' => $comment,
|
||||
'subtask' => $subtask,
|
||||
'file' => $file,
|
||||
'task_link' => $tasklink,
|
||||
'changes' => array()
|
||||
));
|
||||
);
|
||||
|
||||
$this->assertNotEmpty($title);
|
||||
|
||||
$title = $notificationModel->getTitleWithAuthor('foobar', $event_name, array(
|
||||
'task' => $task,
|
||||
'comment' => $comment,
|
||||
'subtask' => $subtask,
|
||||
'file' => $file,
|
||||
'changes' => array()
|
||||
));
|
||||
|
||||
$this->assertNotEmpty($title);
|
||||
$this->assertNotEmpty($notificationModel->getTitleWithoutAuthor($eventName, $eventData));
|
||||
$this->assertNotEmpty($notificationModel->getTitleWithAuthor('Foobar', $eventName, $eventData));
|
||||
}
|
||||
|
||||
$this->assertNotEmpty($notificationModel->getTitleWithoutAuthor(TaskModel::EVENT_OVERDUE, array('tasks' => array(array('id' => 1)))));
|
||||
$this->assertNotEmpty($notificationModel->getTitleWithoutAuthor('unkown', array()));
|
||||
$this->assertNotEmpty($notificationModel->getTitleWithoutAuthor('unknown', array()));
|
||||
}
|
||||
|
||||
public function testGetTaskIdFromEvent()
|
||||
@@ -75,6 +67,7 @@ class NotificationModelTest extends Base
|
||||
$subtaskModel = new SubtaskModel($this->container);
|
||||
$commentModel = new CommentModel($this->container);
|
||||
$taskFileModel = new TaskFileModel($this->container);
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
|
||||
@@ -86,18 +79,20 @@ class NotificationModelTest extends Base
|
||||
$subtask = $subtaskModel->getById(1, true);
|
||||
$comment = $commentModel->getById(1);
|
||||
$file = $commentModel->getById(1);
|
||||
$tasklink = $taskLinkModel->getById(1);
|
||||
|
||||
$this->assertNotEmpty($task);
|
||||
$this->assertNotEmpty($subtask);
|
||||
$this->assertNotEmpty($comment);
|
||||
$this->assertNotEmpty($file);
|
||||
|
||||
foreach (NotificationSubscriber::getSubscribedEvents() as $event_name => $values) {
|
||||
$task_id = $notificationModel->getTaskIdFromEvent($event_name, array(
|
||||
foreach (NotificationSubscriber::getSubscribedEvents() as $eventName => $values) {
|
||||
$task_id = $notificationModel->getTaskIdFromEvent($eventName, array(
|
||||
'task' => $task,
|
||||
'comment' => $comment,
|
||||
'subtask' => $subtask,
|
||||
'file' => $file,
|
||||
'task_link' => $tasklink,
|
||||
'changes' => array()
|
||||
));
|
||||
|
||||
|
||||
@@ -9,6 +9,34 @@ use Kanboard\Model\ProjectModel;
|
||||
|
||||
class TaskLinkModelTest extends Base
|
||||
{
|
||||
public function testGeyById()
|
||||
{
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'A')));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'B')));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 6));
|
||||
|
||||
$taskLink = $taskLinkModel->getById(1);
|
||||
$this->assertEquals(1, $taskLink['id']);
|
||||
$this->assertEquals(1, $taskLink['task_id']);
|
||||
$this->assertEquals(2, $taskLink['opposite_task_id']);
|
||||
$this->assertEquals(6, $taskLink['link_id']);
|
||||
$this->assertEquals(7, $taskLink['opposite_link_id']);
|
||||
$this->assertEquals('is a child of', $taskLink['label']);
|
||||
|
||||
$taskLink = $taskLinkModel->getById(2);
|
||||
$this->assertEquals(2, $taskLink['id']);
|
||||
$this->assertEquals(2, $taskLink['task_id']);
|
||||
$this->assertEquals(1, $taskLink['opposite_task_id']);
|
||||
$this->assertEquals(7, $taskLink['link_id']);
|
||||
$this->assertEquals(6, $taskLink['opposite_link_id']);
|
||||
$this->assertEquals('is a parent of', $taskLink['label']);
|
||||
}
|
||||
|
||||
// Check postgres issue: "Cardinality violation: 7 ERROR: more than one row returned by a subquery used as an expression"
|
||||
public function testGetTaskWithMultipleMilestoneLink()
|
||||
{
|
||||
|
||||
117
tests/units/Notification/MailNotificationTest.php
Normal file
117
tests/units/Notification/MailNotificationTest.php
Normal file
@@ -0,0 +1,117 @@
|
||||
<?php
|
||||
|
||||
require_once __DIR__.'/../Base.php';
|
||||
|
||||
use Kanboard\Model\TaskFinderModel;
|
||||
use Kanboard\Model\TaskCreationModel;
|
||||
use Kanboard\Model\SubtaskModel;
|
||||
use Kanboard\Model\CommentModel;
|
||||
use Kanboard\Model\TaskLinkModel;
|
||||
use Kanboard\Model\UserModel;
|
||||
use Kanboard\Model\TaskFileModel;
|
||||
use Kanboard\Model\ProjectModel;
|
||||
use Kanboard\Model\TaskModel;
|
||||
use Kanboard\Notification\MailNotification;
|
||||
use Kanboard\Subscriber\NotificationSubscriber;
|
||||
|
||||
class MailNotificationTest extends Base
|
||||
{
|
||||
public function testGetMailContent()
|
||||
{
|
||||
$mailNotification = new MailNotification($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskFinderModel = new TaskFinderModel($this->container);
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$subtaskModel = new SubtaskModel($this->container);
|
||||
$commentModel = new CommentModel($this->container);
|
||||
$fileModel = new TaskFileModel($this->container);
|
||||
$taskLinkModel = new TaskLinkModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
|
||||
$this->assertEquals(2, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $subtaskModel->create(array('title' => 'test', 'task_id' => 1)));
|
||||
$this->assertEquals(1, $commentModel->create(array('comment' => 'test', 'task_id' => 1, 'user_id' => 1)));
|
||||
$this->assertEquals(1, $fileModel->create(1, 'test', 'blah', 123));
|
||||
$this->assertEquals(1, $taskLinkModel->create(1, 2, 1));
|
||||
|
||||
$task = $taskFinderModel->getDetails(1);
|
||||
$subtask = $subtaskModel->getById(1, true);
|
||||
$comment = $commentModel->getById(1);
|
||||
$file = $commentModel->getById(1);
|
||||
$tasklink = $taskLinkModel->getById(1);
|
||||
|
||||
$this->assertNotEmpty($task);
|
||||
$this->assertNotEmpty($subtask);
|
||||
$this->assertNotEmpty($comment);
|
||||
$this->assertNotEmpty($file);
|
||||
|
||||
foreach (NotificationSubscriber::getSubscribedEvents() as $eventName => $values) {
|
||||
$eventData = array(
|
||||
'task' => $task,
|
||||
'comment' => $comment,
|
||||
'subtask' => $subtask,
|
||||
'file' => $file,
|
||||
'task_link' => $tasklink,
|
||||
'changes' => array()
|
||||
);
|
||||
$this->assertNotEmpty($mailNotification->getMailContent($eventName, $eventData));
|
||||
$this->assertNotEmpty($mailNotification->getMailSubject($eventName, $eventData));
|
||||
}
|
||||
}
|
||||
|
||||
public function testSendWithEmailAddress()
|
||||
{
|
||||
$mailNotification = new MailNotification($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskFinderModel = new TaskFinderModel($this->container);
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$userModel = new UserModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
|
||||
$this->assertTrue($userModel->update(array('id' => 1, 'email' => 'test@localhost')));
|
||||
|
||||
$this->container['emailClient'] = $this
|
||||
->getMockBuilder('\Kanboard\Core\Mail\Client')
|
||||
->setConstructorArgs(array($this->container))
|
||||
->setMethods(array('send'))
|
||||
->getMock();
|
||||
|
||||
$this->container['emailClient']
|
||||
->expects($this->once())
|
||||
->method('send')
|
||||
->with(
|
||||
$this->equalTo('test@localhost'),
|
||||
$this->equalTo('admin'),
|
||||
$this->equalTo('[test][New task] test (#1)'),
|
||||
$this->stringContains('test')
|
||||
);
|
||||
|
||||
$mailNotification->notifyUser($userModel->getById(1), TaskModel::EVENT_CREATE, array('task' => $taskFinderModel->getDetails(1)));
|
||||
}
|
||||
|
||||
public function testSendWithoutEmailAddress()
|
||||
{
|
||||
$mailNotification = new MailNotification($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskFinderModel = new TaskFinderModel($this->container);
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$userModel = new UserModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('title' => 'test', 'project_id' => 1)));
|
||||
|
||||
$this->container['emailClient'] = $this
|
||||
->getMockBuilder('\Kanboard\Core\Mail\Client')
|
||||
->setConstructorArgs(array($this->container))
|
||||
->setMethods(array('send'))
|
||||
->getMock();
|
||||
|
||||
$this->container['emailClient']
|
||||
->expects($this->never())
|
||||
->method('send');
|
||||
|
||||
$mailNotification->notifyUser($userModel->getById(1), TaskModel::EVENT_CREATE, array('task' => $taskFinderModel->getDetails(1)));
|
||||
}
|
||||
}
|
||||
@@ -1,117 +0,0 @@
|
||||
<?php
|
||||
|
||||
require_once __DIR__.'/../Base.php';
|
||||
|
||||
use Kanboard\Model\TaskFinderModel;
|
||||
use Kanboard\Model\TaskCreationModel;
|
||||
use Kanboard\Model\SubtaskModel;
|
||||
use Kanboard\Model\CommentModel;
|
||||
use Kanboard\Model\UserModel;
|
||||
use Kanboard\Model\TaskFileModel;
|
||||
use Kanboard\Model\ProjectModel;
|
||||
use Kanboard\Model\TaskModel;
|
||||
use Kanboard\Notification\MailNotification;
|
||||
use Kanboard\Subscriber\NotificationSubscriber;
|
||||
|
||||
class MailTest extends Base
|
||||
{
|
||||
public function testGetMailContent()
|
||||
{
|
||||
$en = new MailNotification($this->container);
|
||||
$p = new ProjectModel($this->container);
|
||||
$tf = new TaskFinderModel($this->container);
|
||||
$tc = new TaskCreationModel($this->container);
|
||||
$s = new SubtaskModel($this->container);
|
||||
$c = new CommentModel($this->container);
|
||||
$f = new TaskFileModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $p->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
|
||||
$this->assertEquals(1, $s->create(array('title' => 'test', 'task_id' => 1)));
|
||||
$this->assertEquals(1, $c->create(array('comment' => 'test', 'task_id' => 1, 'user_id' => 1)));
|
||||
$this->assertEquals(1, $f->create(1, 'test', 'blah', 123));
|
||||
|
||||
$task = $tf->getDetails(1);
|
||||
$subtask = $s->getById(1, true);
|
||||
$comment = $c->getById(1);
|
||||
$file = $c->getById(1);
|
||||
|
||||
$this->assertNotEmpty($task);
|
||||
$this->assertNotEmpty($subtask);
|
||||
$this->assertNotEmpty($comment);
|
||||
$this->assertNotEmpty($file);
|
||||
|
||||
foreach (NotificationSubscriber::getSubscribedEvents() as $event => $values) {
|
||||
$this->assertNotEmpty($en->getMailContent($event, array(
|
||||
'task' => $task,
|
||||
'comment' => $comment,
|
||||
'subtask' => $subtask,
|
||||
'file' => $file,
|
||||
'changes' => array())
|
||||
));
|
||||
|
||||
$this->assertNotEmpty($en->getMailSubject($event, array(
|
||||
'task' => $task,
|
||||
'comment' => $comment,
|
||||
'subtask' => $subtask,
|
||||
'file' => $file,
|
||||
'changes' => array())
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
public function testSendWithEmailAddress()
|
||||
{
|
||||
$en = new MailNotification($this->container);
|
||||
$p = new ProjectModel($this->container);
|
||||
$tf = new TaskFinderModel($this->container);
|
||||
$tc = new TaskCreationModel($this->container);
|
||||
$u = new UserModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $p->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
|
||||
$this->assertTrue($u->update(array('id' => 1, 'email' => 'test@localhost')));
|
||||
|
||||
$this->container['emailClient'] = $this
|
||||
->getMockBuilder('\Kanboard\Core\Mail\Client')
|
||||
->setConstructorArgs(array($this->container))
|
||||
->setMethods(array('send'))
|
||||
->getMock();
|
||||
|
||||
$this->container['emailClient']
|
||||
->expects($this->once())
|
||||
->method('send')
|
||||
->with(
|
||||
$this->equalTo('test@localhost'),
|
||||
$this->equalTo('admin'),
|
||||
$this->equalTo('[test][New task] test (#1)'),
|
||||
$this->stringContains('test')
|
||||
);
|
||||
|
||||
$en->notifyUser($u->getById(1), TaskModel::EVENT_CREATE, array('task' => $tf->getDetails(1)));
|
||||
}
|
||||
|
||||
public function testSendWithoutEmailAddress()
|
||||
{
|
||||
$en = new MailNotification($this->container);
|
||||
$p = new ProjectModel($this->container);
|
||||
$tf = new TaskFinderModel($this->container);
|
||||
$tc = new TaskCreationModel($this->container);
|
||||
$u = new UserModel($this->container);
|
||||
|
||||
$this->assertEquals(1, $p->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1)));
|
||||
|
||||
$this->container['emailClient'] = $this
|
||||
->getMockBuilder('\Kanboard\Core\Mail\Client')
|
||||
->setConstructorArgs(array($this->container))
|
||||
->setMethods(array('send'))
|
||||
->getMock();
|
||||
|
||||
$this->container['emailClient']
|
||||
->expects($this->never())
|
||||
->method('send');
|
||||
|
||||
$en->notifyUser($u->getById(1), TaskModel::EVENT_CREATE, array('task' => $tf->getDetails(1)));
|
||||
}
|
||||
}
|
||||
@@ -7,23 +7,23 @@ use Kanboard\Model\TaskCreationModel;
|
||||
use Kanboard\Model\ProjectModel;
|
||||
use Kanboard\Subscriber\NotificationSubscriber;
|
||||
|
||||
class WebhookTest extends Base
|
||||
class WebhookNotificationTest extends Base
|
||||
{
|
||||
public function testTaskCreation()
|
||||
{
|
||||
$c = new ConfigModel($this->container);
|
||||
$p = new ProjectModel($this->container);
|
||||
$tc = new TaskCreationModel($this->container);
|
||||
$configModel = new ConfigModel($this->container);
|
||||
$projectModel = new ProjectModel($this->container);
|
||||
$taskCreationModel = new TaskCreationModel($this->container);
|
||||
$this->container['dispatcher']->addSubscriber(new NotificationSubscriber($this->container));
|
||||
|
||||
$c->save(array('webhook_url' => 'http://localhost/?task-creation'));
|
||||
$configModel->save(array('webhook_url' => 'http://localhost/?task-creation'));
|
||||
|
||||
$this->container['httpClient']
|
||||
->expects($this->once())
|
||||
->method('postJson')
|
||||
->with($this->stringContains('http://localhost/?task-creation&token='), $this->anything());
|
||||
|
||||
$this->assertEquals(1, $p->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $tc->create(array('project_id' => 1, 'title' => 'test')));
|
||||
$this->assertEquals(1, $projectModel->create(array('name' => 'test')));
|
||||
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user