Fixing tests and regressions.

core/API/DataTablePostProcessor.php

@@ -156,7 +156,8 @@ class DataTablePostProcessor
             $self = $this;
             $report = $this->report;
             $dataTable->filter(function (DataTable $table) use ($genericFilter, $report, $self) {
-                if ($genericFilter->areProcessedMetricsNeededFor($this->getProcessedMetricsFor($table, $this->report))) {
+                $processedMetrics = $this->getProcessedMetricsFor($table, $report);
+                if ($genericFilter->areProcessedMetricsNeededFor($processedMetrics)) {
                     $self->computeProcessedMetrics($table);
                 }
             });
@@ -235,7 +236,7 @@ class DataTablePostProcessor
         if ($applyFormatting) {
             $dataTable->filter(array($this, 'formatProcessedMetrics'));
         } else {
-            $dataTable->queueFilter(array($this, 'formatProcessedMetrics')); // TODO: queuing does not always work.
+            $dataTable->queueFilter(array($this, 'formatProcessedMetrics'));
         }
         return $dataTable;
     }

plugins/Goals/Reports/GetEcommerceAbandonedCart.php

@@ -17,9 +17,9 @@ class GetEcommerceAbandonedCart extends BaseEcommerce
         parent::init();
         $this->action = 'get';
         $this->name = Piwik::translate('General_AbandonedCarts');
-        $this->processedMetrics = false;
+        $this->processedMetrics = array('avg_order_revenue');
         $this->order = 15;
-        $this->metrics = array('nb_conversions', 'revenue', 'items');
+        $this->metrics = array('nb_conversions', 'conversion_rate', 'revenue', 'items');
 
         $this->parameters = array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART);
     }

plugins/Goals/Reports/GetEcommerceOrder.php

@@ -33,7 +33,8 @@ class GetEcommerceOrder extends BaseEcommerce
         $this->parameters = array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
     }
 
-    public function getMetrics() {
+    public function getMetrics()
+    {
         $metrics = parent::getMetrics();
 
         $metrics['nb_conversions'] = Piwik::translate('General_EcommerceOrders');

plugins/UserSettings/Reports/GetPlugin.php

@@ -22,7 +22,7 @@ class GetPlugin extends Base
         $this->documentation = Piwik::translate('UserSettings_WidgetPluginsDocumentation', '<br />');
         $this->metrics       = array('nb_visits');
         $this->constantRowsCount = true;
-        $this->processedMetrics = array();
+        $this->processedMetrics = array('nb_visits_percentage');
         $this->order = 4;
         $this->widgetTitle  = 'UserSettings_WidgetPlugins';
     }

tests/PHPUnit/System/expected/test_ArchiveCronTest_noOptions__VisitsSummary.get_month.xml

@@ -9,8 +9,8 @@
 		<bounce_count>25</bounce_count>
 		<sum_visit_length>305</sum_visit_length>
 		<max_actions>3</max_actions>
-		<bounce_rate>92.59%</bounce_rate>
-		<nb_actions_per_visit>1.11</nb_actions_per_visit>
+		<bounce_rate>93%</bounce_rate>
+		<nb_actions_per_visit>1.1</nb_actions_per_visit>
 		<avg_time_on_site>11</avg_time_on_site>
 	</result>
 	<result idSite="2">

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml

@@ -6,7 +6,7 @@
 	<bounce_count>14</bounce_count>
 	<sum_visit_length>16393</sum_visit_length>
 	<max_actions>3</max_actions>
-	<bounce_rate>51.85%</bounce_rate>
-	<nb_actions_per_visit>1.74</nb_actions_per_visit>
+	<bounce_rate>52%</bounce_rate>
+	<nb_actions_per_visit>1.7</nb_actions_per_visit>
 	<avg_time_on_site>607</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml

@@ -6,7 +6,7 @@
 	<bounce_count>14</bounce_count>
 	<sum_visit_length>16393</sum_visit_length>
 	<max_actions>3</max_actions>
-	<bounce_rate>51.85%</bounce_rate>
-	<nb_actions_per_visit>1.74</nb_actions_per_visit>
+	<bounce_rate>52%</bounce_rate>
+	<nb_actions_per_visit>1.7</nb_actions_per_visit>
 	<avg_time_on_site>607</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName1__VisitsSummary.get_range.xml

@@ -6,7 +6,7 @@
 	<bounce_count>17</bounce_count>
 	<sum_visit_length>16393</sum_visit_length>
 	<max_actions>3</max_actions>
-	<bounce_rate>56.67%</bounce_rate>
-	<nb_actions_per_visit>1.67</nb_actions_per_visit>
+	<bounce_rate>57%</bounce_rate>
+	<nb_actions_per_visit>1.7</nb_actions_per_visit>
 	<avg_time_on_site>546</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableName5__VisitsSummary.get_range.xml

@@ -6,7 +6,7 @@
 	<bounce_count>17</bounce_count>
 	<sum_visit_length>16393</sum_visit_length>
 	<max_actions>3</max_actions>
-	<bounce_rate>56.67%</bounce_rate>
-	<nb_actions_per_visit>1.67</nb_actions_per_visit>
+	<bounce_rate>57%</bounce_rate>
+	<nb_actions_per_visit>1.7</nb_actions_per_visit>
 	<avg_time_on_site>546</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue1__VisitsSummary.get_range.xml

@@ -6,7 +6,7 @@
 	<bounce_count>4</bounce_count>
 	<sum_visit_length>3783</sum_visit_length>
 	<max_actions>2</max_actions>
-	<bounce_rate>57.14%</bounce_rate>
-	<nb_actions_per_visit>1.43</nb_actions_per_visit>
+	<bounce_rate>57%</bounce_rate>
+	<nb_actions_per_visit>1.4</nb_actions_per_visit>
 	<avg_time_on_site>540</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_customVariableValue5__VisitsSummary.get_range.xml

@@ -6,7 +6,7 @@
 	<bounce_count>4</bounce_count>
 	<sum_visit_length>3783</sum_visit_length>
 	<max_actions>2</max_actions>
-	<bounce_rate>57.14%</bounce_rate>
-	<nb_actions_per_visit>1.43</nb_actions_per_visit>
+	<bounce_rate>57%</bounce_rate>
+	<nb_actions_per_visit>1.4</nb_actions_per_visit>
 	<avg_time_on_site>540</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceFirstVisit__VisitsSummary.get_range.xml

@@ -7,6 +7,6 @@
 	<sum_visit_length>21437</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>0%</bounce_rate>
-	<nb_actions_per_visit>2.53</nb_actions_per_visit>
+	<nb_actions_per_visit>2.5</nb_actions_per_visit>
 	<avg_time_on_site>1261</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastEcommerceOrder__VisitsSummary.get_range.xml

@@ -7,6 +7,6 @@
 	<sum_visit_length>21437</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>0%</bounce_rate>
-	<nb_actions_per_visit>2.53</nb_actions_per_visit>
+	<nb_actions_per_visit>2.5</nb_actions_per_visit>
 	<avg_time_on_site>1261</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_daysSinceLastVisit__VisitsSummary.get_range.xml

@@ -7,6 +7,6 @@
 	<sum_visit_length>21437</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>0%</bounce_rate>
-	<nb_actions_per_visit>2.53</nb_actions_per_visit>
+	<nb_actions_per_visit>2.5</nb_actions_per_visit>
 	<avg_time_on_site>1261</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceType__VisitsSummary.get_range.xml

@@ -6,7 +6,7 @@
 	<bounce_count>15</bounce_count>
 	<sum_visit_length>16393</sum_visit_length>
 	<max_actions>3</max_actions>
-	<bounce_rate>53.57%</bounce_rate>
-	<nb_actions_per_visit>1.71</nb_actions_per_visit>
+	<bounce_rate>54%</bounce_rate>
+	<nb_actions_per_visit>1.7</nb_actions_per_visit>
 	<avg_time_on_site>585</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_latitude__VisitsSummary.get_range.xml

@@ -7,6 +7,6 @@
 	<sum_visit_length>3783</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>50%</bounce_rate>
-	<nb_actions_per_visit>1.67</nb_actions_per_visit>
+	<nb_actions_per_visit>1.7</nb_actions_per_visit>
 	<avg_time_on_site>631</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_operatingSystemCode__VisitsSummary.get_range.xml

@@ -6,7 +6,7 @@
 	<bounce_count>15</bounce_count>
 	<sum_visit_length>16393</sum_visit_length>
 	<max_actions>3</max_actions>
-	<bounce_rate>53.57%</bounce_rate>
-	<nb_actions_per_visit>1.71</nb_actions_per_visit>
+	<bounce_rate>54%</bounce_rate>
+	<nb_actions_per_visit>1.7</nb_actions_per_visit>
 	<avg_time_on_site>585</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_pageUrl__VisitsSummary.get_range.xml

@@ -7,6 +7,6 @@
 	<sum_visit_length>21437</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>0%</bounce_rate>
-	<nb_actions_per_visit>2.53</nb_actions_per_visit>
+	<nb_actions_per_visit>2.5</nb_actions_per_visit>
 	<avg_time_on_site>1261</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_referrerType__VisitsSummary.get_range.xml

@@ -7,6 +7,6 @@
 	<sum_visit_length>21437</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>50%</bounce_rate>
-	<nb_actions_per_visit>1.76</nb_actions_per_visit>
+	<nb_actions_per_visit>1.8</nb_actions_per_visit>
 	<avg_time_on_site>631</avg_time_on_site>
 </result>
\ No newline at end of file

tests/PHPUnit/System/expected/test_AutoSuggestAPITest_regionCode__VisitsSummary.get_range.xml

@@ -7,6 +7,6 @@
 	<sum_visit_length>3783</sum_visit_length>
 	<max_actions>3</max_actions>
 	<bounce_rate>50%</bounce_rate>
-	<nb_actions_per_visit>1.67</nb_actions_per_visit>
+	<nb_actions_per_visit>1.7</nb_actions_per_visit>
 	<avg_time_on_site>631</avg_time_on_site>
 </result>
\ No newline at end of file