From 7b947ebdbd3b6bcd9de10ea4255bfa11fc88695c Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 20 Jun 2015 19:21:35 -0400
Subject: Allow sync of Github comments without common username and add unit
 tests

---
 app/Action/ActionCommentCreationTest.php | 71 ++++++++++++++++++++++++++++++++
 app/Action/CommentCreation.php           |  3 +-
 2 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 app/Action/ActionCommentCreationTest.php

(limited to 'app/Action')

diff --git a/app/Action/ActionCommentCreationTest.php b/app/Action/ActionCommentCreationTest.php
new file mode 100644
index 00000000..6531c5b3
--- /dev/null
+++ b/app/Action/ActionCommentCreationTest.php
@@ -0,0 +1,71 @@
+<?php
+
+require_once __DIR__.'/Base.php';
+
+use Event\GenericEvent;
+use Model\Task;
+use Model\TaskCreation;
+use Model\Comment;
+use Model\Project;
+use Integration\GithubWebhook;
+
+class ActionCommentCreationTest extends Base
+{
+    public function testWithUser()
+    {
+        $action = new Action\CommentCreation($this->container, 1, GithubWebhook::EVENT_ISSUE_COMMENT);
+
+        // We create a task in the first column
+        $tc = new TaskCreation($this->container);
+        $p = new Project($this->container);
+        $c = new Comment($this->container);
+        $this->assertEquals(1, $p->create(array('name' => 'test')));
+        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1)));
+
+        // We create an event to move the task to the 2nd column
+        $event = array(
+            'project_id' => 1,
+            'task_id' => 1,
+            'user_id' => 1,
+            'comment' => 'youpi',
+        );
+
+        // Our event should be executed
+        $this->assertTrue($action->execute(new GenericEvent($event)));
+
+        $comment = $c->getById(1);
+        $this->assertNotEmpty($comment);
+        $this->assertEquals(1, $comment['task_id']);
+        $this->assertEquals(1, $comment['user_id']);
+        $this->assertEquals('youpi', $comment['comment']);
+    }
+
+    public function testWithNoUser()
+    {
+        $action = new Action\CommentCreation($this->container, 1, GithubWebhook::EVENT_ISSUE_COMMENT);
+
+        // We create a task in the first column
+        $tc = new TaskCreation($this->container);
+        $p = new Project($this->container);
+        $c = new Comment($this->container);
+        $this->assertEquals(1, $p->create(array('name' => 'test')));
+        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1)));
+
+        // We create an event to move the task to the 2nd column
+        $event = array(
+            'project_id' => 1,
+            'task_id' => 1,
+            'user_id' => 0,
+            'comment' => 'youpi',
+        );
+
+        // Our event should be executed
+        $this->assertTrue($action->execute(new GenericEvent($event)));
+
+        $comment = $c->getById(1);
+        $this->assertNotEmpty($comment);
+        $this->assertEquals(1, $comment['task_id']);
+        $this->assertEquals(0, $comment['user_id']);
+        $this->assertEquals('youpi', $comment['comment']);
+    }
+}
diff --git a/app/Action/CommentCreation.php b/app/Action/CommentCreation.php
index 54d7be7d..44deb819 100644
--- a/app/Action/CommentCreation.php
+++ b/app/Action/CommentCreation.php
@@ -45,7 +45,6 @@ class CommentCreation extends Base
     public function getEventRequiredParameters()
     {
         return array(
-            'reference',
             'comment',
             'user_id',
             'task_id',
@@ -62,7 +61,7 @@ class CommentCreation extends Base
     public function doAction(array $data)
     {
         return (bool) $this->comment->create(array(
-            'reference' => $data['reference'],
+            'reference' => isset($data['reference']) ? $data['reference'] : '',
             'comment' => $data['comment'],
             'task_id' => $data['task_id'],
             'user_id' => $data['user_id'],
-- 
cgit v1.2.3