summaryrefslogtreecommitdiff
path: root/app/Action
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-06-20 19:21:35 -0400
committerFrederic Guillot <fred@kanboard.net>2015-06-20 19:21:35 -0400
commit7b947ebdbd3b6bcd9de10ea4255bfa11fc88695c (patch)
treeec67439696608efb9e330c527c6a8f76da9d5c6d /app/Action
parent22b26d0b4d68f0492275ec93eb4df1a975a8fc80 (diff)
Allow sync of Github comments without common username and add unit tests
Diffstat (limited to 'app/Action')
-rw-r--r--app/Action/ActionCommentCreationTest.php71
-rw-r--r--app/Action/CommentCreation.php3
2 files changed, 72 insertions, 2 deletions
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'],