Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

1 files changed, 17 insertions, 22 deletions

diff --git a/tests/units/Model/NotificationModelTest.php b/tests/units/Model/NotificationModelTest.php
index 889f3349..0bd9db6e 100644
--- a/tests/units/Model/NotificationModelTest.php
+++ b/tests/units/Model/NotificationModelTest.php
@@ -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(
-                'task' => $task,
-                'comment' => $comment,
-                'subtask' => $subtask,
-                'file' => $file,
-                'changes' => array()
-            ));
-
-            $this->assertNotEmpty($title);
-
-            $title = $notificationModel->getTitleWithAuthor('foobar', $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);
+            $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()
             ));