From c0d8407d9a880a8e05063281b129fc84b73017b5 Mon Sep 17 00:00:00 2001 From: Rafael de Camargo Date: Wed, 28 Aug 2019 00:23:48 -0300 Subject: Fix automatic action condition check Checks for source column instead of current column because the condition is "moved away" Closes #4277 --- .../Action/TaskUpdateStartDateOnMoveColumnTest.php | 38 ++++++++-------------- 1 file changed, 13 insertions(+), 25 deletions(-) (limited to 'tests') diff --git a/tests/units/Action/TaskUpdateStartDateOnMoveColumnTest.php b/tests/units/Action/TaskUpdateStartDateOnMoveColumnTest.php index f95492d6..f2d0a0fc 100644 --- a/tests/units/Action/TaskUpdateStartDateOnMoveColumnTest.php +++ b/tests/units/Action/TaskUpdateStartDateOnMoveColumnTest.php @@ -19,17 +19,13 @@ class TaskUpdateStartDateOnMoveColumnTest extends Base $this->assertEquals(1, $projectModel->create(array('name' => 'test1'))); $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'column_id' => 1))); - $this->container['db']->table(TaskModel::TABLE)->eq('id', 1)->update(array('column_id' => 2)); - - $task = $taskFinderModel->getById(1); - $this->assertNotEmpty($task); $event = new TaskEvent(array( - 'task_id' => $task['id'], + 'task_id' => 1, 'task' => array( - 'project_id' => $task['project_id'], - 'column_id' => $task['column_id'], - ) + 'project_id' => 1, + ), + 'src_column_id' => 1, )); $action = new TaskUpdateStartDateOnMoveColumn($this->container); @@ -49,17 +45,13 @@ class TaskUpdateStartDateOnMoveColumnTest extends Base $this->assertEquals(1, $projectModel->create(array('name' => 'test1'))); $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'column_id' => 2))); - $this->container['db']->table(TaskModel::TABLE)->eq('id', 1)->update(array('column_id' => 1)); - - $task = $taskFinderModel->getById(1); - $this->assertNotEmpty($task); $event = new TaskEvent(array( - 'task_id' => $task['id'], + 'task_id' => 1, 'task' => array( - 'project_id' => $task['project_id'], - 'column_id' => $task['column_id'], - ) + 'project_id' => 1, + ), + 'src_column_id' => 2, )); $action = new TaskUpdateStartDateOnMoveColumn($this->container); @@ -76,18 +68,14 @@ class TaskUpdateStartDateOnMoveColumnTest extends Base $this->assertEquals(1, $projectModel->create(array('name' => 'test1'))); $this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test', 'column_id' => 1, 'date_started' => time()))); - $this->container['db']->table(TaskModel::TABLE)->eq('id', 1)->update(array('column_id' => 2)); - - $task = $taskFinderModel->getById(1); - $this->assertNotEmpty($task); $event = new TaskEvent(array( - 'task_id' => $task['id'], + 'task_id' => 1, 'task' => array( - 'project_id' => $task['project_id'], - 'column_id' => $task['column_id'], - 'date_started' => $task['date_started'], - ) + 'project_id' => 1, + 'date_started' => time(), + ), + 'src_column_id' => 1, )); $action = new TaskUpdateStartDateOnMoveColumn($this->container); -- cgit v1.2.3