Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

1 files changed, 29 insertions, 16 deletions

diff --git a/tests/units/Action/TaskAssignColorLinkTest.php b/tests/units/Action/TaskAssignColorLinkTest.php
index 07d0969b..77a6c90e 100644
--- a/tests/units/Action/TaskAssignColorLinkTest.php
+++ b/tests/units/Action/TaskAssignColorLinkTest.php
@@ -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)
+            ->buildEvent();
 
         $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)
+            ->buildEvent();
 
         $this->assertFalse($action->execute($event, TaskLinkModel::EVENT_CREATE_UPDATE));
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertEquals('yellow', $task['color_id']);
     }
 }