From 8dd68247349c8df89408b41de37b3dc144712a48 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Thu, 11 Jun 2015 20:36:42 -0400
Subject: [PATCH] Fix notification template issues

---
 ...omment_creation.php => comment_create.php} |  0
 .../{file_creation.php => file_create.php}    |  0
 ...ubtask_creation.php => subtask_create.php} |  0
 .../{task_creation.php => task_create.php}    |  6 ++--
 tests/units/NotificationTest.php              | 33 ++++++++++++++++++-
 5 files changed, 35 insertions(+), 4 deletions(-)
 rename app/Template/notification/{comment_creation.php => comment_create.php} (100%)
 rename app/Template/notification/{file_creation.php => file_create.php} (100%)
 rename app/Template/notification/{subtask_creation.php => subtask_create.php} (100%)
 rename app/Template/notification/{task_creation.php => task_create.php} (85%)

diff --git a/app/Template/notification/comment_creation.php b/app/Template/notification/comment_create.php
similarity index 100%
rename from app/Template/notification/comment_creation.php
rename to app/Template/notification/comment_create.php
diff --git a/app/Template/notification/file_creation.php b/app/Template/notification/file_create.php
similarity index 100%
rename from app/Template/notification/file_creation.php
rename to app/Template/notification/file_create.php
diff --git a/app/Template/notification/subtask_creation.php b/app/Template/notification/subtask_create.php
similarity index 100%
rename from app/Template/notification/subtask_creation.php
rename to app/Template/notification/subtask_create.php
diff --git a/app/Template/notification/task_creation.php b/app/Template/notification/task_create.php
similarity index 85%
rename from app/Template/notification/task_creation.php
rename to app/Template/notification/task_create.php
index 0905d3f54..1d834d449 100644
--- a/app/Template/notification/task_creation.php
+++ b/app/Template/notification/task_create.php
@@ -9,14 +9,14 @@
         <strong><?= dt('Must be done before %B %e, %Y', $task['date_due']) ?></strong>
     </li>
     <?php endif ?>
-    <?php if ($task['creator_username']): ?>
+    <?php if (! empty($task['creator_username'])): ?>
     <li>
         <?= t('Created by %s', $task['creator_name'] ?: $task['creator_username']) ?>
     </li>
     <?php endif ?>
     <li>
         <strong>
-        <?php if ($task['assignee_username']): ?>
+        <?php if (! empty($task['assignee_username'])): ?>
             <?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?>
         <?php else: ?>
             <?= t('There is nobody assigned') ?>
@@ -28,7 +28,7 @@
         <strong><?= $this->e($task['column_title']) ?></strong>
     </li>
     <li><?= t('Task position:').' '.$this->e($task['position']) ?></li>
-    <?php if ($task['category_name']): ?>
+    <?php if (! empty($task['category_name'])): ?>
     <li>
         <?= t('Category:') ?> <strong><?= $this->e($task['category_name']) ?></strong>
     </li>
diff --git a/tests/units/NotificationTest.php b/tests/units/NotificationTest.php
index 4421fd47d..5a7a782c7 100644
--- a/tests/units/NotificationTest.php
+++ b/tests/units/NotificationTest.php
@@ -2,10 +2,16 @@
 
 require_once __DIR__.'/Base.php';
 
+use Model\TaskFinder;
+use Model\TaskCreation;
+use Model\Subtask;
+use Model\Comment;
 use Model\User;
+use Model\File;
 use Model\Project;
 use Model\ProjectPermission;
 use Model\Notification;
+use Subscriber\NotificationSubscriber;
 
 class NotificationTest extends Base
 {
@@ -230,7 +236,32 @@ class NotificationTest extends Base
     public function testGetMailContent()
     {
         $n = new Notification($this->container);
-        $this->assertNotEmpty($n->getMailContent('task.open', array('task' => array('id' => 2, 'title' => 'blah'))));
+        $p = new Project($this->container);
+        $tf = new TaskFinder($this->container);
+        $tc = new TaskCreation($this->container);
+        $s = new Subtask($this->container);
+        $c = new Comment($this->container);
+        $f = new File($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', false, 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 (Subscriber\NotificationSubscriber::getSubscribedEvents() as $event => $values) {
+            $this->assertNotEmpty($n->getMailContent($event, array('task' => $task, 'comment' => $comment, 'subtask' => $subtask, 'file' => $file)));
+        }
     }
 
     public function testGetEmailSubject()