Create new class SubtaskStatusModel

12 files changed, 506 insertions, 486 deletions

diff --git a/app/Controller/SubtaskRestrictionController.php b/app/Controller/SubtaskRestrictionController.php
index 084fc0d9..cb642e1c 100644
--- a/app/Controller/SubtaskRestrictionController.php
+++ b/app/Controller/SubtaskRestrictionController.php
@@ -27,7 +27,7 @@ class SubtaskRestrictionController extends BaseController
                 SubtaskModel::STATUS_TODO => t('Todo'),
                 SubtaskModel::STATUS_DONE => t('Done'),
             ),
-            'subtask_inprogress' => $this->subtaskModel->getSubtaskInProgress($this->userSession->getId()),
+            'subtask_inprogress' => $this->subtaskStatusModel->getSubtaskInProgress($this->userSession->getId()),
             'subtask' => $subtask,
             'task' => $task,
         )));
diff --git a/app/Controller/SubtaskStatusController.php b/app/Controller/SubtaskStatusController.php
index 699951fe..d4d356c3 100644
--- a/app/Controller/SubtaskStatusController.php
+++ b/app/Controller/SubtaskStatusController.php
@@ -20,7 +20,7 @@ class SubtaskStatusController extends BaseController
         $task = $this->getTask();
         $subtask = $this->getSubtask();
 
-        $status = $this->subtaskModel->toggleStatus($subtask['id']);
+        $status = $this->subtaskStatusModel->toggleStatus($subtask['id']);
 
         if ($this->request->getIntegerParam('refresh-table') === 0) {
             $subtask['status'] = $status;
diff --git a/app/Core/Base.php b/app/Core/Base.php
index 8b9bf085..563013bd 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -91,6 +91,7 @@ use Pimple\Container;
  * @property \Kanboard\Model\RememberMeSessionModel              $rememberMeSessionModel
  * @property \Kanboard\Model\SubtaskModel                        $subtaskModel
  * @property \Kanboard\Model\SubtaskPositionModel                $subtaskPositionModel
+ * @property \Kanboard\Model\SubtaskStatusModel                  $subtaskStatusModel
  * @property \Kanboard\Model\SubtaskTaskConversionModel          $subtaskTaskConversionModel
  * @property \Kanboard\Model\SubtaskTimeTrackingModel            $subtaskTimeTrackingModel
  * @property \Kanboard\Model\SwimlaneModel                       $swimlaneModel
diff --git a/app/Model/SubtaskModel.php b/app/Model/SubtaskModel.php
index 2ac6095c..568e27a4 100644
--- a/app/Model/SubtaskModel.php
+++ b/app/Model/SubtaskModel.php
@@ -21,25 +21,13 @@ class SubtaskModel extends Base
     const TABLE = 'subtasks';
 
     /**
-     * Task "done" status
-     *
-     * @var integer
-     */
-    const STATUS_DONE = 2;
-
-    /**
-     * Task "in progress" status
-     *
-     * @var integer
-     */
-    const STATUS_INPROGRESS = 1;
-
-    /**
-     * Task "todo" status
+     * Subtask status
      *
      * @var integer
      */
     const STATUS_TODO = 0;
+    const STATUS_INPROGRESS = 1;
+    const STATUS_DONE = 2;
 
     /**
      * Events
@@ -82,26 +70,6 @@ class SubtaskModel extends Base
     }
 
     /**
-     * Add subtask status status to the resultset
-     *
-     * @access public
-     * @param  array    $subtasks   Subtasks
-     * @return array
-     */
-    public function addStatusName(array $subtasks)
-    {
-        $status = $this->getStatusList();
-
-        foreach ($subtasks as &$subtask) {
-            $subtask['status_name'] = $status[$subtask['status']];
-            $subtask['timer_start_date'] = isset($subtask['timer_start_date']) ? $subtask['timer_start_date'] : 0;
-            $subtask['is_timer_started'] = ! empty($subtask['timer_start_date']);
-        }
-
-        return $subtasks;
-    }
-
-    /**
      * Get the query to fetch subtasks assigned to a user
      *
      * @access public
@@ -177,35 +145,6 @@ class SubtaskModel extends Base
     }
 
     /**
-     * Prepare data before insert/update
-     *
-     * @access public
-     * @param  array    $values    Form values
-     */
-    public function prepare(array &$values)
-    {
-        $this->helper->model->removeFields($values, array('another_subtask'));
-        $this->helper->model->resetFields($values, array('time_estimated', 'time_spent'));
-    }
-
-    /**
-     * Prepare data before insert
-     *
-     * @access public
-     * @param  array    $values    Form values
-     */
-    public function prepareCreation(array &$values)
-    {
-        $this->prepare($values);
-
-        $values['position'] = $this->getLastPosition($values['task_id']) + 1;
-        $values['status'] = isset($values['status']) ? $values['status'] : self::STATUS_TODO;
-        $values['time_estimated'] = isset($values['time_estimated']) ? $values['time_estimated'] : 0;
-        $values['time_spent'] = isset($values['time_spent']) ? $values['time_spent'] : 0;
-        $values['user_id'] = isset($values['user_id']) ? $values['user_id'] : 0;
-    }
-
-    /**
      * Get the position of the last column for a given project
      *
      * @access public
@@ -261,74 +200,6 @@ class SubtaskModel extends Base
     }
 
     /**
-     * Close all subtasks of a task
-     *
-     * @access public
-     * @param  integer  $task_id
-     * @return boolean
-     */
-    public function closeAll($task_id)
-    {
-        return $this->db->table(self::TABLE)->eq('task_id', $task_id)->update(array('status' => self::STATUS_DONE));
-    }
-
-    /**
-     * Change the status of subtask
-     *
-     * @access public
-     * @param  integer  $subtask_id
-     * @return boolean|integer
-     */
-    public function toggleStatus($subtask_id)
-    {
-        $subtask = $this->getById($subtask_id);
-        $status = ($subtask['status'] + 1) % 3;
-
-        $values = array(
-            'id' => $subtask['id'],
-            'status' => $status,
-            'task_id' => $subtask['task_id'],
-        );
-
-        if (empty($subtask['user_id']) && $this->userSession->isLogged()) {
-            $values['user_id'] = $this->userSession->getId();
-        }
-
-        return $this->update($values) ? $status : false;
-    }
-
-    /**
-     * Get the subtask in progress for this user
-     *
-     * @access public
-     * @param  integer   $user_id
-     * @return array
-     */
-    public function getSubtaskInProgress($user_id)
-    {
-        return $this->db->table(self::TABLE)
-                        ->eq('status', self::STATUS_INPROGRESS)
-                        ->eq('user_id', $user_id)
-                        ->findOne();
-    }
-
-    /**
-     * Return true if the user have a subtask in progress
-     *
-     * @access public
-     * @param  integer   $user_id
-     * @return boolean
-     */
-    public function hasSubtaskInProgress($user_id)
-    {
-        return $this->configModel->get('subtask_restriction') == 1 &&
-               $this->db->table(self::TABLE)
-                        ->eq('status', self::STATUS_INPROGRESS)
-                        ->eq('user_id', $user_id)
-                        ->exists();
-    }
-
-    /**
      * Remove
      *
      * @access public
@@ -368,4 +239,53 @@ class SubtaskModel extends Base
             }
         });
     }
+
+    /**
+     * Prepare data before insert/update
+     *
+     * @access protected
+     * @param  array    $values    Form values
+     */
+    protected function prepare(array &$values)
+    {
+        $this->helper->model->removeFields($values, array('another_subtask'));
+        $this->helper->model->resetFields($values, array('time_estimated', 'time_spent'));
+    }
+
+    /**
+     * Prepare data before insert
+     *
+     * @access protected
+     * @param  array    $values    Form values
+     */
+    protected function prepareCreation(array &$values)
+    {
+        $this->prepare($values);
+
+        $values['position'] = $this->getLastPosition($values['task_id']) + 1;
+        $values['status'] = isset($values['status']) ? $values['status'] : self::STATUS_TODO;
+        $values['time_estimated'] = isset($values['time_estimated']) ? $values['time_estimated'] : 0;
+        $values['time_spent'] = isset($values['time_spent']) ? $values['time_spent'] : 0;
+        $values['user_id'] = isset($values['user_id']) ? $values['user_id'] : 0;
+    }
+
+    /**
+     * Add subtask status status to the resultset
+     *
+     * @access public
+     * @param  array    $subtasks   Subtasks
+     * @return array
+     */
+    public function addStatusName(array $subtasks)
+    {
+        $status = $this->getStatusList();
+
+        foreach ($subtasks as &$subtask) {
+            $subtask['status_name'] = $status[$subtask['status']];
+            $subtask['timer_start_date'] = isset($subtask['timer_start_date']) ? $subtask['timer_start_date'] : 0;
+            $subtask['is_timer_started'] = ! empty($subtask['timer_start_date']);
+        }
+
+        return $subtasks;
+    }
 }
diff --git a/app/Model/SubtaskStatusModel.php b/app/Model/SubtaskStatusModel.php
new file mode 100644
index 00000000..26cbb67d
--- /dev/null
+++ b/app/Model/SubtaskStatusModel.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Kanboard\Model;
+
+use Kanboard\Core\Base;
+
+/**
+ * Class SubtaskStatusModel
+ *
+ * @package Kanboard\Model
+ * @author  Frederic Guillot
+ */
+class SubtaskStatusModel extends Base
+{
+    /**
+     * Get the subtask in progress for this user
+     *
+     * @access public
+     * @param  integer   $user_id
+     * @return array
+     */
+    public function getSubtaskInProgress($user_id)
+    {
+        return $this->db->table(SubtaskModel::TABLE)
+            ->eq('status', SubtaskModel::STATUS_INPROGRESS)
+            ->eq('user_id', $user_id)
+            ->findOne();
+    }
+
+    /**
+     * Return true if the user have a subtask in progress
+     *
+     * @access public
+     * @param  integer   $user_id
+     * @return boolean
+     */
+    public function hasSubtaskInProgress($user_id)
+    {
+        return $this->configModel->get('subtask_restriction') == 1 &&
+            $this->db->table(SubtaskModel::TABLE)
+                ->eq('status', SubtaskModel::STATUS_INPROGRESS)
+                ->eq('user_id', $user_id)
+                ->exists();
+    }
+
+    /**
+     * Change the status of subtask
+     *
+     * @access public
+     * @param  integer  $subtask_id
+     * @return boolean|integer
+     */
+    public function toggleStatus($subtask_id)
+    {
+        $subtask = $this->subtaskModel->getById($subtask_id);
+        $status = ($subtask['status'] + 1) % 3;
+
+        $values = array(
+            'id' => $subtask['id'],
+            'status' => $status,
+            'task_id' => $subtask['task_id'],
+        );
+
+        if (empty($subtask['user_id']) && $this->userSession->isLogged()) {
+            $values['user_id'] = $this->userSession->getId();
+        }
+
+        return $this->subtaskModel->update($values) ? $status : false;
+    }
+
+    /**
+     * Close all subtasks of a task
+     *
+     * @access public
+     * @param  integer  $task_id
+     * @return boolean
+     */
+    public function closeAll($task_id)
+    {
+        return $this->db
+            ->table(SubtaskModel::TABLE)
+            ->eq('task_id', $task_id)
+            ->update(array('status' => SubtaskModel::STATUS_DONE));
+    }
+}
diff --git a/app/Model/TaskStatusModel.php b/app/Model/TaskStatusModel.php
index ea304beb..dc114698 100644
--- a/app/Model/TaskStatusModel.php
+++ b/app/Model/TaskStatusModel.php
@@ -45,7 +45,7 @@ class TaskStatusModel extends Base
      */
     public function close($task_id)
     {
-        $this->subtaskModel->closeAll($task_id);
+        $this->subtaskStatusModel->closeAll($task_id);
         return $this->changeStatus($task_id, TaskModel::STATUS_CLOSED, time(), TaskModel::EVENT_CLOSE);
     }
 
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index ad69d5fb..9a71148b 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -61,6 +61,7 @@ class ClassProvider implements ServiceProviderInterface
             'RememberMeSessionModel',
             'SubtaskModel',
             'SubtaskPositionModel',
+            'SubtaskStatusModel',
             'SubtaskTaskConversionModel',
             'SubtaskTimeTrackingModel',
             'SwimlaneModel',
diff --git a/app/Subscriber/BootstrapSubscriber.php b/app/Subscriber/BootstrapSubscriber.php
index 7d12e9ae..3618f30f 100644
--- a/app/Subscriber/BootstrapSubscriber.php
+++ b/app/Subscriber/BootstrapSubscriber.php
@@ -21,7 +21,7 @@ class BootstrapSubscriber extends BaseSubscriber implements EventSubscriberInter
         $this->actionManager->attachEvents();
 
         if ($this->userSession->isLogged()) {
-            $this->sessionStorage->hasSubtaskInProgress = $this->subtaskModel->hasSubtaskInProgress($this->userSession->getId());
+            $this->sessionStorage->hasSubtaskInProgress = $this->subtaskStatusModel->hasSubtaskInProgress($this->userSession->getId());
         }
     }
 
diff --git a/tests/units/Model/SubtaskModelTest.php b/tests/units/Model/SubtaskModelTest.php
index d270e177..23183d22 100644
--- a/tests/units/Model/SubtaskModelTest.php
+++ b/tests/units/Model/SubtaskModelTest.php
@@ -5,7 +5,6 @@ require_once __DIR__.'/../Base.php';
 use Kanboard\Model\TaskCreationModel;
 use Kanboard\Model\SubtaskModel;
 use Kanboard\Model\ProjectModel;
-use Kanboard\Model\TaskFinderModel;
 
 class SubtaskModelTest extends Base
 {
@@ -74,115 +73,6 @@ class SubtaskModelTest extends Base
         $this->assertEmpty($subtask);
     }
 
-    public function testToggleStatusWithoutSession()
-    {
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $subtaskModel = new SubtaskModel($this->container);
-        $projectModel = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
-
-        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
-
-        $subtask = $subtaskModel->getById(1);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
-        $this->assertEquals(0, $subtask['user_id']);
-        $this->assertEquals(1, $subtask['task_id']);
-
-        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtaskModel->toggleStatus(1));
-
-        $subtask = $subtaskModel->getById(1);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtask['status']);
-        $this->assertEquals(0, $subtask['user_id']);
-        $this->assertEquals(1, $subtask['task_id']);
-
-        $this->assertEquals(SubtaskModel::STATUS_DONE, $subtaskModel->toggleStatus(1));
-
-        $subtask = $subtaskModel->getById(1);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(SubtaskModel::STATUS_DONE, $subtask['status']);
-        $this->assertEquals(0, $subtask['user_id']);
-        $this->assertEquals(1, $subtask['task_id']);
-
-        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtaskModel->toggleStatus(1));
-
-        $subtask = $subtaskModel->getById(1);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
-        $this->assertEquals(0, $subtask['user_id']);
-        $this->assertEquals(1, $subtask['task_id']);
-    }
-
-    public function testToggleStatusWithSession()
-    {
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $subtaskModel = new SubtaskModel($this->container);
-        $projectModel = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
-
-        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
-
-        $subtask = $subtaskModel->getById(1);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
-        $this->assertEquals(0, $subtask['user_id']);
-        $this->assertEquals(1, $subtask['task_id']);
-
-        // Set the current logged user
-        $this->container['sessionStorage']->user = array('id' => 1);
-
-        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtaskModel->toggleStatus(1));
-
-        $subtask = $subtaskModel->getById(1);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtask['status']);
-        $this->assertEquals(1, $subtask['user_id']);
-        $this->assertEquals(1, $subtask['task_id']);
-
-        $this->assertEquals(SubtaskModel::STATUS_DONE, $subtaskModel->toggleStatus(1));
-
-        $subtask = $subtaskModel->getById(1);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(SubtaskModel::STATUS_DONE, $subtask['status']);
-        $this->assertEquals(1, $subtask['user_id']);
-        $this->assertEquals(1, $subtask['task_id']);
-
-        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtaskModel->toggleStatus(1));
-
-        $subtask = $subtaskModel->getById(1);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
-        $this->assertEquals(1, $subtask['user_id']);
-        $this->assertEquals(1, $subtask['task_id']);
-    }
-
-    public function testCloseAll()
-    {
-        $taskCreationModel = new TaskCreationModel($this->container);
-        $subtaskModel = new SubtaskModel($this->container);
-        $projectModel = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
-        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
-
-        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
-        $this->assertEquals(2, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1)));
-
-        $this->assertTrue($subtaskModel->closeAll(1));
-
-        $subtasks = $subtaskModel->getAll(1);
-        $this->assertNotEmpty($subtasks);
-
-        foreach ($subtasks as $subtask) {
-            $this->assertEquals(SubtaskModel::STATUS_DONE, $subtask['status']);
-        }
-    }
-
     public function testDuplicate()
     {
         $taskCreationModel = new TaskCreationModel($this->container);
diff --git a/tests/units/Model/SubtaskStatusModelTest.php b/tests/units/Model/SubtaskStatusModelTest.php
new file mode 100644
index 00000000..af4c3955
--- /dev/null
+++ b/tests/units/Model/SubtaskStatusModelTest.php
@@ -0,0 +1,123 @@
+<?php
+
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\SubtaskModel;
+use Kanboard\Model\SubtaskStatusModel;
+use Kanboard\Model\TaskCreationModel;
+
+require_once __DIR__.'/../Base.php';
+
+class SubtaskStatusModelTest extends Base
+{
+    public function testToggleStatusWithoutSession()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $subtaskStatusModel = new SubtaskStatusModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
+
+        $subtask = $subtaskModel->getById(1);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
+        $this->assertEquals(0, $subtask['user_id']);
+        $this->assertEquals(1, $subtask['task_id']);
+
+        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtaskStatusModel->toggleStatus(1));
+
+        $subtask = $subtaskModel->getById(1);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtask['status']);
+        $this->assertEquals(0, $subtask['user_id']);
+        $this->assertEquals(1, $subtask['task_id']);
+
+        $this->assertEquals(SubtaskModel::STATUS_DONE, $subtaskStatusModel->toggleStatus(1));
+
+        $subtask = $subtaskModel->getById(1);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(SubtaskModel::STATUS_DONE, $subtask['status']);
+        $this->assertEquals(0, $subtask['user_id']);
+        $this->assertEquals(1, $subtask['task_id']);
+
+        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtaskStatusModel->toggleStatus(1));
+
+        $subtask = $subtaskModel->getById(1);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
+        $this->assertEquals(0, $subtask['user_id']);
+        $this->assertEquals(1, $subtask['task_id']);
+    }
+
+    public function testToggleStatusWithSession()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $subtaskStatusModel = new SubtaskStatusModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
+
+        $subtask = $subtaskModel->getById(1);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
+        $this->assertEquals(0, $subtask['user_id']);
+        $this->assertEquals(1, $subtask['task_id']);
+
+        // Set the current logged user
+        $this->container['sessionStorage']->user = array('id' => 1);
+
+        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtaskStatusModel->toggleStatus(1));
+
+        $subtask = $subtaskModel->getById(1);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(SubtaskModel::STATUS_INPROGRESS, $subtask['status']);
+        $this->assertEquals(1, $subtask['user_id']);
+        $this->assertEquals(1, $subtask['task_id']);
+
+        $this->assertEquals(SubtaskModel::STATUS_DONE, $subtaskStatusModel->toggleStatus(1));
+
+        $subtask = $subtaskModel->getById(1);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(SubtaskModel::STATUS_DONE, $subtask['status']);
+        $this->assertEquals(1, $subtask['user_id']);
+        $this->assertEquals(1, $subtask['task_id']);
+
+        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtaskStatusModel->toggleStatus(1));
+
+        $subtask = $subtaskModel->getById(1);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(SubtaskModel::STATUS_TODO, $subtask['status']);
+        $this->assertEquals(1, $subtask['user_id']);
+        $this->assertEquals(1, $subtask['task_id']);
+    }
+
+    public function testCloseAll()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+        $subtaskStatusModel = new SubtaskStatusModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1)));
+        $this->assertEquals(2, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1)));
+
+        $this->assertTrue($subtaskStatusModel->closeAll(1));
+
+        $subtasks = $subtaskModel->getAll(1);
+        $this->assertNotEmpty($subtasks);
+
+        foreach ($subtasks as $subtask) {
+            $this->assertEquals(SubtaskModel::STATUS_DONE, $subtask['status']);
+        }
+    }
+}
diff --git a/tests/units/Model/SubtaskTimeTrackingModelTest.php b/tests/units/Model/SubtaskTimeTrackingModelTest.php
new file mode 100644
index 00000000..cfee5b14
--- /dev/null
+++ b/tests/units/Model/SubtaskTimeTrackingModelTest.php
@@ -0,0 +1,240 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Model\TaskFinderModel;
+use Kanboard\Model\TaskCreationModel;
+use Kanboard\Model\SubtaskModel;
+use Kanboard\Model\SubtaskTimeTrackingModel;
+use Kanboard\Model\ProjectModel;
+
+class SubtaskTimeTrackingModelTest extends Base
+{
+    public function testHasTimer()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $subtaskTimeTrackingModel = new SubtaskTimeTrackingModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1, 'user_id' => 1)));
+
+        $this->assertFalse($subtaskTimeTrackingModel->hasTimer(1, 1));
+        $this->assertTrue($subtaskTimeTrackingModel->logStartTime(1, 1));
+        $this->assertTrue($subtaskTimeTrackingModel->hasTimer(1, 1));
+        $this->assertFalse($subtaskTimeTrackingModel->logStartTime(1, 1));
+        $this->assertTrue($subtaskTimeTrackingModel->logEndTime(1, 1));
+        $this->assertFalse($subtaskTimeTrackingModel->hasTimer(1, 1));
+    }
+
+    public function testGetTimerStatus()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $subtaskTimeTrackingModel = new SubtaskTimeTrackingModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->container['sessionStorage']->user = array('id' => 1);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1, 'user_id' => 1)));
+
+        // Nothing started
+        $subtasks = $subtaskModel->getAll(1);
+        $this->assertNotEmpty($subtasks);
+        $this->assertEquals(0, $subtasks[0]['timer_start_date']);
+        $this->assertFalse($subtasks[0]['is_timer_started']);
+
+        $subtask = $subtaskModel->getById(1, true);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(0, $subtask['timer_start_date']);
+        $this->assertFalse($subtask['is_timer_started']);
+
+        // Start the clock
+        $this->assertTrue($subtaskTimeTrackingModel->logStartTime(1, 1));
+
+        $subtasks = $subtaskModel->getAll(1);
+        $this->assertNotEmpty($subtasks);
+        $this->assertEquals(time(), $subtasks[0]['timer_start_date'], '', 3);
+        $this->assertTrue($subtasks[0]['is_timer_started']);
+
+        $subtask = $subtaskModel->getById(1, true);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(time(), $subtask['timer_start_date'], '', 3);
+        $this->assertTrue($subtask['is_timer_started']);
+
+        // Stop the clock
+        $this->assertTrue($subtaskTimeTrackingModel->logEndTime(1, 1));
+        $subtasks = $subtaskModel->getAll(1);
+        $this->assertNotEmpty($subtasks);
+        $this->assertEquals(0, $subtasks[0]['timer_start_date']);
+        $this->assertFalse($subtasks[0]['is_timer_started']);
+
+        $subtask = $subtaskModel->getById(1, true);
+        $this->assertNotEmpty($subtask);
+        $this->assertEquals(0, $subtask['timer_start_date']);
+        $this->assertFalse($subtask['is_timer_started']);
+    }
+
+    public function testLogStartTime()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $subtaskTimeTrackingModel = new SubtaskTimeTrackingModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1, 'user_id' => 1)));
+
+        $this->assertTrue($subtaskTimeTrackingModel->logStartTime(1, 1));
+
+        $timesheet = $subtaskTimeTrackingModel->getUserTimesheet(1);
+        $this->assertNotEmpty($timesheet);
+        $this->assertCount(1, $timesheet);
+        $this->assertNotEmpty($timesheet[0]['start']);
+        $this->assertEmpty($timesheet[0]['end']);
+        $this->assertEquals(1, $timesheet[0]['user_id']);
+        $this->assertEquals(1, $timesheet[0]['subtask_id']);
+    }
+
+    public function testLogStartEnd()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $subtaskTimeTrackingModel = new SubtaskTimeTrackingModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1, 'user_id' => 1)));
+
+        // No start time
+        $this->assertTrue($subtaskTimeTrackingModel->logEndTime(1, 1));
+        $timesheet = $subtaskTimeTrackingModel->getUserTimesheet(1);
+        $this->assertEmpty($timesheet);
+
+        // Log start and end time
+        $this->assertTrue($subtaskTimeTrackingModel->logStartTime(1, 1));
+        sleep(1);
+        $this->assertTrue($subtaskTimeTrackingModel->logEndTime(1, 1));
+
+        $timesheet = $subtaskTimeTrackingModel->getUserTimesheet(1);
+        $this->assertNotEmpty($timesheet);
+        $this->assertCount(1, $timesheet);
+        $this->assertNotEmpty($timesheet[0]['start']);
+        $this->assertNotEmpty($timesheet[0]['end']);
+        $this->assertEquals(1, $timesheet[0]['user_id']);
+        $this->assertEquals(1, $timesheet[0]['subtask_id']);
+        $this->assertNotEquals($timesheet[0]['start'], $timesheet[0]['end']);
+    }
+
+    public function testCalculateSubtaskTime()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $subtaskTimeTrackingModel = new SubtaskTimeTrackingModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_spent' => 2.2, 'time_estimated' => 3.3)));
+        $this->assertEquals(2, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_spent' => 1.1, 'time_estimated' => 4.4)));
+
+        $time = $subtaskTimeTrackingModel->calculateSubtaskTime(1);
+        $this->assertCount(2, $time);
+        $this->assertEquals(3.3, $time['time_spent'], 'Total spent', 0.01);
+        $this->assertEquals(7.7, $time['time_estimated'], 'Total estimated', 0.01);
+    }
+
+    public function testUpdateSubtaskTimeSpent()
+    {
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $subtaskTimeTrackingModel = new SubtaskTimeTrackingModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_spent' => 2.2)));
+        $this->assertEquals(2, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1)));
+
+        $this->assertTrue($subtaskTimeTrackingModel->logStartTime(1, 1));
+        $this->assertTrue($subtaskTimeTrackingModel->logStartTime(2, 1));
+
+        // Fake start time
+        $this->container['db']->table(SubtaskTimeTrackingModel::TABLE)->update(array('start' => time() - 3600));
+
+        $this->assertTrue($subtaskTimeTrackingModel->logEndTime(1, 1));
+        $this->assertTrue($subtaskTimeTrackingModel->logEndTime(2, 1));
+
+        $timesheet = $subtaskTimeTrackingModel->getUserTimesheet(1);
+        $this->assertNotEmpty($timesheet);
+        $this->assertCount(2, $timesheet);
+        $this->assertEquals(3600, $timesheet[0]['end'] - $timesheet[0]['start'], 'Wrong timestamps', 1);
+        $this->assertEquals(3600, $timesheet[1]['end'] - $timesheet[1]['start'], 'Wrong timestamps', 1);
+
+        $time = $subtaskTimeTrackingModel->calculateSubtaskTime(1);
+        $this->assertEquals(4.2, $time['time_spent'], 'Total spent', 0.01);
+        $this->assertEquals(0, $time['time_estimated'], 'Total estimated', 0.01);
+
+        $time = $subtaskTimeTrackingModel->calculateSubtaskTime(2);
+        $this->assertEquals(0, $time['time_spent'], 'Total spent', 0.01);
+        $this->assertEquals(0, $time['time_estimated'], 'Total estimated', 0.01);
+    }
+
+    public function testUpdateTaskTimeTracking()
+    {
+        $taskFinderModel = new TaskFinderModel($this->container);
+        $taskCreationModel = new TaskCreationModel($this->container);
+        $subtaskModel = new SubtaskModel($this->container);
+        $subtaskTimeTrackingModel = new SubtaskTimeTrackingModel($this->container);
+        $projectModel = new ProjectModel($this->container);
+
+        $this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
+
+        $this->assertEquals(1, $taskCreationModel->create(array('title' => 'test 1', 'project_id' => 1)));
+        $this->assertEquals(2, $taskCreationModel->create(array('title' => 'test 2', 'project_id' => 1, 'time_estimated' => 1.5, 'time_spent' => 0.5)));
+        $this->assertEquals(3, $taskCreationModel->create(array('title' => 'test 3', 'project_id' => 1, 'time_estimated' => 4, 'time_spent' => 2)));
+
+        $this->assertEquals(1, $subtaskModel->create(array('title' => 'subtask #1', 'task_id' => 1, 'time_spent' => 2.2)));
+        $this->assertEquals(2, $subtaskModel->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_estimated' => 1)));
+
+        $this->assertEquals(3, $subtaskModel->create(array('title' => 'subtask #3', 'task_id' => 2, 'time_spent' => 3.4)));
+        $this->assertEquals(4, $subtaskModel->create(array('title' => 'subtask #4', 'task_id' => 2, 'time_estimated' => 1.25)));
+
+        $this->assertEquals(5, $subtaskModel->create(array('title' => 'subtask #5', 'task_id' => 3, 'time_spent' => 8)));
+
+        $subtaskTimeTrackingModel->updateTaskTimeTracking(1);
+        $subtaskTimeTrackingModel->updateTaskTimeTracking(2);
+        $subtaskTimeTrackingModel->updateTaskTimeTracking(3);
+
+        $task = $taskFinderModel->getById(1);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(2.2, $task['time_spent'], 'Total spent', 0.01);
+        $this->assertEquals(1, $task['time_estimated'], 'Total estimated', 0.01);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(3.4, $task['time_spent'], 'Total spent', 0.01);
+        $this->assertEquals(1.25, $task['time_estimated'], 'Total estimated', 0.01);
+
+        $task = $taskFinderModel->getById(3);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['time_estimated']);
+        $this->assertEquals(8, $task['time_spent']);
+
+        $this->assertTrue($subtaskModel->remove(3));
+        $this->assertTrue($subtaskModel->remove(4));
+
+        $subtaskTimeTrackingModel->updateTaskTimeTracking(2);
+
+        $task = $taskFinderModel->getById(2);
+        $this->assertNotEmpty($task);
+        $this->assertEquals(0, $task['time_estimated']);
+        $this->assertEquals(0, $task['time_spent']);
+    }
+}
diff --git a/tests/units/Model/SubtaskTimeTrackingTest.php b/tests/units/Model/SubtaskTimeTrackingTest.php
deleted file mode 100644
index d5ae62ae..00000000
--- a/tests/units/Model/SubtaskTimeTrackingTest.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-require_once __DIR__.'/../Base.php';
-
-use Kanboard\Model\TaskFinderModel;
-use Kanboard\Model\TaskCreationModel;
-use Kanboard\Model\SubtaskModel;
-use Kanboard\Model\SubtaskTimeTrackingModel;
-use Kanboard\Model\ProjectModel;
-
-class SubtaskTimeTrackingTest extends Base
-{
-    public function testHasTimer()
-    {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $st = new SubtaskTimeTrackingModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #2', 'task_id' => 1, 'user_id' => 1)));
-
-        $this->assertFalse($st->hasTimer(1, 1));
-        $this->assertTrue($st->logStartTime(1, 1));
-        $this->assertTrue($st->hasTimer(1, 1));
-        $this->assertFalse($st->logStartTime(1, 1));
-        $this->assertTrue($st->logEndTime(1, 1));
-        $this->assertFalse($st->hasTimer(1, 1));
-    }
-
-    public function testGetTimerStatus()
-    {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $st = new SubtaskTimeTrackingModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->container['sessionStorage']->user = array('id' => 1);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1, 'user_id' => 1)));
-
-        // Nothing started
-        $subtasks = $s->getAll(1);
-        $this->assertNotEmpty($subtasks);
-        $this->assertEquals(0, $subtasks[0]['timer_start_date']);
-        $this->assertFalse($subtasks[0]['is_timer_started']);
-
-        $subtask = $s->getById(1, true);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(0, $subtask['timer_start_date']);
-        $this->assertFalse($subtask['is_timer_started']);
-
-        // Start the clock
-        $this->assertTrue($st->logStartTime(1, 1));
-
-        $subtasks = $s->getAll(1);
-        $this->assertNotEmpty($subtasks);
-        $this->assertEquals(time(), $subtasks[0]['timer_start_date'], '', 3);
-        $this->assertTrue($subtasks[0]['is_timer_started']);
-
-        $subtask = $s->getById(1, true);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(time(), $subtask['timer_start_date'], '', 3);
-        $this->assertTrue($subtask['is_timer_started']);
-
-        // Stop the clock
-        $this->assertTrue($st->logEndTime(1, 1));
-        $subtasks = $s->getAll(1);
-        $this->assertNotEmpty($subtasks);
-        $this->assertEquals(0, $subtasks[0]['timer_start_date']);
-        $this->assertFalse($subtasks[0]['is_timer_started']);
-
-        $subtask = $s->getById(1, true);
-        $this->assertNotEmpty($subtask);
-        $this->assertEquals(0, $subtask['timer_start_date']);
-        $this->assertFalse($subtask['is_timer_started']);
-    }
-
-    public function testLogStartTime()
-    {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $st = new SubtaskTimeTrackingModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #2', 'task_id' => 1, 'user_id' => 1)));
-
-        $this->assertTrue($st->logStartTime(1, 1));
-
-        $timesheet = $st->getUserTimesheet(1);
-        $this->assertNotEmpty($timesheet);
-        $this->assertCount(1, $timesheet);
-        $this->assertNotEmpty($timesheet[0]['start']);
-        $this->assertEmpty($timesheet[0]['end']);
-        $this->assertEquals(1, $timesheet[0]['user_id']);
-        $this->assertEquals(1, $timesheet[0]['subtask_id']);
-    }
-
-    public function testLogStartEnd()
-    {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $st = new SubtaskTimeTrackingModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #2', 'task_id' => 1, 'user_id' => 1)));
-
-        // No start time
-        $this->assertTrue($st->logEndTime(1, 1));
-        $timesheet = $st->getUserTimesheet(1);
-        $this->assertEmpty($timesheet);
-
-        // Log start and end time
-        $this->assertTrue($st->logStartTime(1, 1));
-        sleep(1);
-        $this->assertTrue($st->logEndTime(1, 1));
-
-        $timesheet = $st->getUserTimesheet(1);
-        $this->assertNotEmpty($timesheet);
-        $this->assertCount(1, $timesheet);
-        $this->assertNotEmpty($timesheet[0]['start']);
-        $this->assertNotEmpty($timesheet[0]['end']);
-        $this->assertEquals(1, $timesheet[0]['user_id']);
-        $this->assertEquals(1, $timesheet[0]['subtask_id']);
-        $this->assertNotEquals($timesheet[0]['start'], $timesheet[0]['end']);
-    }
-
-    public function testCalculateSubtaskTime()
-    {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $st = new SubtaskTimeTrackingModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_spent' => 2.2, 'time_estimated' => 3.3)));
-        $this->assertEquals(2, $s->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_spent' => 1.1, 'time_estimated' => 4.4)));
-
-        $time = $st->calculateSubtaskTime(1);
-        $this->assertCount(2, $time);
-        $this->assertEquals(3.3, $time['time_spent'], 'Total spent', 0.01);
-        $this->assertEquals(7.7, $time['time_estimated'], 'Total estimated', 0.01);
-    }
-
-    public function testUpdateSubtaskTimeSpent()
-    {
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $st = new SubtaskTimeTrackingModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1, 'column_id' => 1, 'owner_id' => 1)));
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_spent' => 2.2)));
-        $this->assertEquals(2, $s->create(array('title' => 'subtask #2', 'task_id' => 1)));
-
-        $this->assertTrue($st->logStartTime(1, 1));
-        $this->assertTrue($st->logStartTime(2, 1));
-
-        // Fake start time
-        $this->container['db']->table(SubtaskTimeTrackingModel::TABLE)->update(array('start' => time() - 3600));
-
-        $this->assertTrue($st->logEndTime(1, 1));
-        $this->assertTrue($st->logEndTime(2, 1));
-
-        $timesheet = $st->getUserTimesheet(1);
-        $this->assertNotEmpty($timesheet);
-        $this->assertCount(2, $timesheet);
-        $this->assertEquals(3600, $timesheet[0]['end'] - $timesheet[0]['start'], 'Wrong timestamps', 1);
-        $this->assertEquals(3600, $timesheet[1]['end'] - $timesheet[1]['start'], 'Wrong timestamps', 1);
-
-        $time = $st->calculateSubtaskTime(1);
-        $this->assertEquals(4.2, $time['time_spent'], 'Total spent', 0.01);
-        $this->assertEquals(0, $time['time_estimated'], 'Total estimated', 0.01);
-
-        $time = $st->calculateSubtaskTime(2);
-        $this->assertEquals(0, $time['time_spent'], 'Total spent', 0.01);
-        $this->assertEquals(0, $time['time_estimated'], 'Total estimated', 0.01);
-    }
-
-    public function testUpdateTaskTimeTracking()
-    {
-        $tf = new TaskFinderModel($this->container);
-        $tc = new TaskCreationModel($this->container);
-        $s = new SubtaskModel($this->container);
-        $st = new SubtaskTimeTrackingModel($this->container);
-        $p = new ProjectModel($this->container);
-
-        $this->assertEquals(1, $p->create(array('name' => 'test1')));
-
-        $this->assertEquals(1, $tc->create(array('title' => 'test 1', 'project_id' => 1)));
-        $this->assertEquals(2, $tc->create(array('title' => 'test 2', 'project_id' => 1, 'time_estimated' => 1.5, 'time_spent' => 0.5)));
-        $this->assertEquals(3, $tc->create(array('title' => 'test 3', 'project_id' => 1, 'time_estimated' => 4, 'time_spent' => 2)));
-
-        $this->assertEquals(1, $s->create(array('title' => 'subtask #1', 'task_id' => 1, 'time_spent' => 2.2)));
-        $this->assertEquals(2, $s->create(array('title' => 'subtask #2', 'task_id' => 1, 'time_estimated' => 1)));
-
-        $this->assertEquals(3, $s->create(array('title' => 'subtask #3', 'task_id' => 2, 'time_spent' => 3.4)));
-        $this->assertEquals(4, $s->create(array('title' => 'subtask #4', 'task_id' => 2, 'time_estimated' => 1.25)));
-
-        $this->assertEquals(5, $s->create(array('title' => 'subtask #5', 'task_id' => 3, 'time_spent' => 8)));
-
-        $st->updateTaskTimeTracking(1);
-        $st->updateTaskTimeTracking(2);
-        $st->updateTaskTimeTracking(3);
-
-        $task = $tf->getById(1);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(2.2, $task['time_spent'], 'Total spent', 0.01);
-        $this->assertEquals(1, $task['time_estimated'], 'Total estimated', 0.01);
-
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(3.4, $task['time_spent'], 'Total spent', 0.01);
-        $this->assertEquals(1.25, $task['time_estimated'], 'Total estimated', 0.01);
-
-        $task = $tf->getById(3);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['time_estimated']);
-        $this->assertEquals(8, $task['time_spent']);
-
-        $this->assertTrue($s->remove(3));
-        $this->assertTrue($s->remove(4));
-
-        $st->updateTaskTimeTracking(2);
-
-        $task = $tf->getById(2);
-        $this->assertNotEmpty($task);
-        $this->assertEquals(0, $task['time_estimated']);
-        $this->assertEquals(0, $task['time_spent']);
-    }
-}