Fixed empty title for web notification with only one overdue task

2 files changed, 109 insertions, 68 deletions

diff --git a/tests/units/Model/NotificationModelTest.php b/tests/units/Model/NotificationModelTest.php
new file mode 100644
index 00000000..889f3349
--- /dev/null
+++ b/tests/units/Model/NotificationModelTest.php
@@ -0,0 +1,109 @@
+<?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\TaskFileModel;
+use Kanboard\Model\TaskModel;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\NotificationModel;
+use Kanboard\Subscriber\NotificationSubscriber;
+
+class NotificationModelTest extends Base
+{
+    public function testGetTitle()
+    {
+        $notificationModel = new NotificationModel($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);
+        $taskFileModel = new TaskFileModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $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));
+
+        $task = $taskFinderModel->getDetails(1);
+        $subtask = $subtaskModel->getById(1, true);
+        $comment = $commentModel->getById(1);
+        $file = $commentModel->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(
+                'task' => $task,
+                'comment' => $comment,
+                'subtask' => $subtask,
+                'file' => $file,
+                'changes' => array()
+            ));
+
+            $this->assertNotEmpty($title);
+        }
+
+        $this->assertNotEmpty($notificationModel->getTitleWithoutAuthor(TaskModel::EVENT_OVERDUE, array('tasks' => array(array('id' => 1)))));
+        $this->assertNotEmpty($notificationModel->getTitleWithoutAuthor('unkown', array()));
+    }
+
+    public function testGetTaskIdFromEvent()
+    {
+        $notificationModel = new NotificationModel($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);
+        $taskFileModel = new TaskFileModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test')));
+        $this->assertEquals(1, $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));
+
+        $task = $taskFinderModel->getDetails(1);
+        $subtask = $subtaskModel->getById(1, true);
+        $comment = $commentModel->getById(1);
+        $file = $commentModel->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(
+                'task'    => $task,
+                'comment' => $comment,
+                'subtask' => $subtask,
+                'file'    => $file,
+                'changes' => array()
+            ));
+
+            $this->assertEquals($task_id, $task['id']);
+        }
+
+        $this->assertEquals(1, $notificationModel->getTaskIdFromEvent(TaskModel::EVENT_OVERDUE, array('tasks' => array(array('id' => 1)))));
+    }
+}
diff --git a/tests/units/Model/NotificationTest.php b/tests/units/Model/NotificationTest.php
deleted file mode 100644
index 96ee5f4e..00000000
--- a/tests/units/Model/NotificationTest.php
+++ /dev/null
@@ -1,68 +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\TaskFileModel;
-use Kanboard\Model\TaskModel;
-use Kanboard\Model\ProjectModel;
-use Kanboard\Model\NotificationModel;
-use Kanboard\Subscriber\NotificationSubscriber;
-
-class NotificationTest extends Base
-{
-    public function testGetTitle()
-    {
-        $wn = new NotificationModel($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_name => $values) {
-            $title = $wn->getTitleWithoutAuthor($event_name, array(
-                'task' => $task,
-                'comment' => $comment,
-                'subtask' => $subtask,
-                'file' => $file,
-                'changes' => array()
-            ));
-
-            $this->assertNotEmpty($title);
-
-            $title = $wn->getTitleWithAuthor('foobar', $event_name, array(
-                'task' => $task,
-                'comment' => $comment,
-                'subtask' => $subtask,
-                'file' => $file,
-                'changes' => array()
-            ));
-
-            $this->assertNotEmpty($title);
-        }
-
-        $this->assertNotEmpty($wn->getTitleWithoutAuthor(TaskModel::EVENT_OVERDUE, array('tasks' => array(array('id' => 1)))));
-        $this->assertNotEmpty($wn->getTitleWithoutAuthor('unkown', array()));
-    }
-}