1 files changed, 22 insertions, 111 deletions
diff --git a/tests/units/Action/TaskEmailTest.php b/tests/units/Action/TaskEmailTest.php
index 404865f4..ef32a296 100644
--- a/tests/units/Action/TaskEmailTest.php
+++ b/tests/units/Action/TaskEmailTest.php
@@ -5,98 +5,30 @@ require_once __DIR__.'/../Base.php';
 use Kanboard\Event\GenericEvent;
 use Kanboard\Model\Task;
 use Kanboard\Model\TaskCreation;
-use Kanboard\Model\TaskFinder;
 use Kanboard\Model\Project;
 use Kanboard\Model\User;
 use Kanboard\Action\TaskEmail;
 
 class TaskEmailTest extends Base
 {
-    public function testNoEmail()
+    public function testSuccess()
     {
-        $action = new TaskEmail($this->container, 1, Task::EVENT_MOVE_COLUMN);
-        $action->setParam('column_id', 2);
-        $action->setParam('user_id', 1);
-        $action->setParam('subject', 'My email subject');
-
-        // We create a task in the first column
-        $tc = new TaskCreation($this->container);
-        $tf = new TaskFinder($this->container);
-        $p = new Project($this->container);
-        $u = new User($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1)));
+        $userModel = new User($this->container);
+        $projectModel = new Project($this->container);
+        $taskCreationModel = new TaskCreation($this->container);
 
-        // We create an event to move the task to the 2nd column
-        $event = array(
-            'project_id' => 1,
-            'task_id' => 1,
-            'column_id' => 2,
-        );
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
+        $this->assertTrue($userModel->update(array('id' => 1, 'email' => 'admin@localhost')));
 
-        // Email should be not be sent
-        $this->container['emailClient']->expects($this->never())->method('send');
+        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 2));
 
-        // Our event should be executed
-        $this->assertFalse($action->execute(new GenericEvent($event)));
-    }
-
-    public function testWrongColumn()
-    {
-        $action = new TaskEmail($this->container, 1, Task::EVENT_MOVE_COLUMN);
-        $action->setParam('column_id', 2);
-        $action->setParam('user_id', 1);
-        $action->setParam('subject', 'My email subject');
-
-        // We create a task in the first column
-        $tc = new TaskCreation($this->container);
-        $tf = new TaskFinder($this->container);
-        $p = new Project($this->container);
-        $u = new User($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,
-            'column_id' => 3,
-        );
-
-        // Email should be not be sent
-        $this->container['emailClient']->expects($this->never())->method('send');
-
-        // Our event should be executed
-        $this->assertFalse($action->execute(new GenericEvent($event)));
-    }
-
-    public function testMoveColumn()
-    {
-        $action = new TaskEmail($this->container, 1, Task::EVENT_MOVE_COLUMN);
+        $action = new TaskEmail($this->container);
+        $action->setProjectId(1);
         $action->setParam('column_id', 2);
         $action->setParam('user_id', 1);
         $action->setParam('subject', 'My email subject');
 
-        // We create a task in the first column
-        $tc = new TaskCreation($this->container);
-        $tf = new TaskFinder($this->container);
-        $p = new Project($this->container);
-        $u = new User($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertTrue($u->update(array('id' => 1, 'email' => 'admin@localhost')));
-
-        // We create an event to move the task to the 2nd column
-        $event = array(
-            'project_id' => 1,
-            'task_id' => 1,
-            'column_id' => 2,
-        );
-
-        // Email should be sent
         $this->container['emailClient']->expects($this->once())
             ->method('send')
             ->with(
@@ -106,45 +38,24 @@ class TaskEmailTest extends Base
                 $this->stringContains('test')
             );
 
-        // Our event should be executed
-        $this->assertTrue($action->execute(new GenericEvent($event)));
+        $this->assertTrue($action->execute($event, Task::EVENT_CLOSE));
     }
 
-    public function testTaskClose()
+    public function testWithWrongColumn()
     {
-        $action = new TaskEmail($this->container, 1, Task::EVENT_CLOSE);
-        $action->setParam('column_id', 2);
-        $action->setParam('user_id', 1);
-        $action->setParam('subject', 'My email subject');
-
-        // We create a task in the first column
-        $tc = new TaskCreation($this->container);
-        $tf = new TaskFinder($this->container);
-        $p = new Project($this->container);
-        $u = new User($this->container);
+        $projectModel = new Project($this->container);
+        $taskCreationModel = new TaskCreation($this->container);
 
-        $this->assertEquals(1, $p->create(array('name' => 'test')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1)));
-        $this->assertTrue($u->update(array('id' => 1, 'email' => 'admin@localhost')));
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
 
-        // We create an event
-        $event = array(
-            'project_id' => 1,
-            'task_id' => 1,
-            'column_id' => 2,
-        );
+        $event = new GenericEvent(array('project_id' => 1, 'task_id' => 1, 'column_id' => 3));
 
-        // Email should be sent
-        $this->container['emailClient']->expects($this->once())
-            ->method('send')
-            ->with(
-                $this->equalTo('admin@localhost'),
-                $this->equalTo('admin'),
-                $this->equalTo('My email subject'),
-                $this->stringContains('test')
-            );
+        $action = new TaskEmail($this->container);
+        $action->setProjectId(1);
+        $action->setParam('column_id', 2);
+        $action->setParam('user_id', 1);
+        $action->setParam('subject', 'My email subject');
 
-        // Our event should be executed
-        $this->assertTrue($action->execute(new GenericEvent($event)));
+        $this->assertFalse($action->execute($event, Task::EVENT_CLOSE));
     }
 }