Merge pull request phacility#132 from wmde/mergedinto

Consider merged tasks as done

Author: manicki

app/Phragile/ClosedTimeByStatusFieldDispatcher.php

@@ -7,8 +7,11 @@ class ClosedTimeByStatusFieldDispatcher implements ClosedTimeDispatcher {
 
 	public function isClosingTransaction(array $transaction)
 	{
-		return $transaction['transactionType'] === 'status'
-			&& in_array($transaction['oldValue'], self::$STATUS_OPEN)
-			&& !in_array($transaction['newValue'], self::$STATUS_OPEN);
+		if ($transaction['transactionType'] === 'status') {
+			return in_array($transaction['oldValue'], self::$STATUS_OPEN) &&
+			       !in_array($transaction['newValue'], self::$STATUS_OPEN);
+		}
+
+		return $transaction['transactionType'] === 'mergedinto';
 	}
 }

tests/unit/BurndownChartTest.php

@@ -229,4 +229,19 @@ public function testOpenTaskTransactionsAreIgnored()
 
 		$this->assertNull($burndown->getPointsClosedBeforeSprint());
 	}
+
+	public function testClosedPerDayDetectsMergedTasks()
+	{
+		$burndown = $this->mockWithTransactions(
+			$this->tasks,
+			[
+				'1' => [[
+					        'transactionType' => 'mergedinto',
+					        'dateCreated' => '1418040000', // Dec 8
+				        ]],
+			]
+		);
+
+		$this->assertSame(8, $burndown->getPointsClosedPerDay()['2014-12-08']);
+	}
 }