Added internal task links to activity stream

tests/units/Notification/MailNotificationTest.php

@@ -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)));
+    }
+}

tests/units/Notification/MailTest.php

@@ -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)));
-    }
-}

tests/units/Notification/WebhookNotificationTest.php

@@ -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')));
     }
 }