Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

1 files changed, 0 insertions, 240 deletions

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']);
-    }
-}