Fixing some tests and providing better output in system test case failure.

1 files changed, 5 insertions, 3 deletions

diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index f774bee68d..36d0007f83 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -358,9 +358,11 @@ class API extends \Piwik\Plugin\API
              || empty($columns))
             && $idGoal === GoalManager::IDGOAL_ORDER
         ) {
-            $extraProcessedMetrics = $dataTable->getMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME);
-            $extraProcessedMetrics[] = new AverageOrderRevenue();
-            $dataTable->setMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME, $extraProcessedMetrics);
+            $dataTable->filter(function (DataTable $table) {
+                $extraProcessedMetrics = $table->getMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME);
+                $extraProcessedMetrics[] = new AverageOrderRevenue();
+                $table->setMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME, $extraProcessedMetrics);
+            });
         }
 
         return $dataTable;