From 4ebaee91aa7d4f374278bace1aae87d0eab19649 Mon Sep 17 00:00:00 2001 From: DavidBadura Date: Thu, 23 Apr 2015 19:55:25 +0000 Subject: [PATCH] fix deleting recurring task --- src/TaskManager.php | 9 ++------- tests/TaskManagerTest.php | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/TaskManager.php b/src/TaskManager.php index 6a4f077..a4445e9 100644 --- a/src/TaskManager.php +++ b/src/TaskManager.php @@ -133,13 +133,8 @@ class TaskManager return; } - if ($task->isRecurring()) { - $task->setUntil('now'); - $this->save($task); - } else { - $this->taskwarrior->delete($task->getUuid()); - $this->refresh($task); - } + $this->taskwarrior->delete($task->getUuid()); + $this->refresh($task); } /** diff --git a/tests/TaskManagerTest.php b/tests/TaskManagerTest.php index 6f6d29a..1f01620 100644 --- a/tests/TaskManagerTest.php +++ b/tests/TaskManagerTest.php @@ -670,8 +670,6 @@ class TaskManagerTest extends \PHPUnit_Framework_TestCase public function testRecurringDelete() { - $this->markTestIncomplete('not working yet'); - $recur1 = new Recurring(Recurring::DAILY); $task1 = new Task(); @@ -683,12 +681,14 @@ class TaskManagerTest extends \PHPUnit_Framework_TestCase $this->taskManager->clear(); $this->assertCount(1, $this->taskManager->filterAll('status:recurring')); + $this->assertCount(2, $this->taskManager->filterAll()); $this->taskManager->delete($task1); $this->taskManager->clear(); $this->assertCount(0, $this->taskManager->filterAll('status:recurring')); + $this->assertCount(2, $this->taskManager->filterAll()); } public function testUntil()