From 2b4335542a5680923dda2d61135d71ea2b5f310f Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Sun, 16 Nov 2014 15:52:09 -0800
Subject: [PATCH] Fixing some tests.
---
...Name_lastN__API.getProcessedReport_day.xml | 2 +-
...est_CustomEvents__Events.getAction_day.xml | 12 +++---
...t_CustomEvents__Events.getAction_month.xml | 12 +++---
.../test_CustomEvents__Events.getName_day.xml | 2 +-
...est_CustomEvents__Events.getName_month.xml | 2 +-
...egoryOrNameMatch__Events.getAction_day.xml | 12 +++---
...ategoryOrNameMatch__Events.getName_day.xml | 2 +-
...nsionIsEventAction__Events.getName_day.xml | 2 +-
...ionIsEventAction__Events.getName_month.xml | 2 +-
...ionIsEventCategory__Events.getName_day.xml | 2 +-
...nIsEventCategory__Events.getName_month.xml | 2 +-
...nsionIsEventName__Events.getAction_day.xml | 12 +++---
...ionIsEventName__Events.getAction_month.xml | 12 +++---
...ionIsEventName__Events.getCategory_day.xml | 2 +-
...nIsEventName__Events.getCategory_month.xml | 2 +-
...sEventActionPlay__Events.getAction_day.xml | 10 ++---
...hesEventActionPlay__Events.getName_day.xml | 2 +-
...vExport__Live.getLastVisitsDetails_day.csv | Bin 7708 -> 7708 bytes
...msCategory__API.getProcessedReport_day.xml | 14 +++----
...a_ItemsSku__API.getProcessedReport_day.xml | 8 ++--
...edReports.generateReport_week.original.csv | 38 +++++++++---------
...dReports.generateReport_week.original.html | 38 +++++++++---------
22 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
index 15678442b5..588fe06efe 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml
@@ -52,7 +52,7 @@
<avg_event_value>9.66</avg_event_value>
</row>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_events>14</nb_events>
<nb_events_with_value>4</nb_events_with_value>
<sum_event_value>38</sum_event_value>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml
index 26752bbd7b..39d8225809 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_day.xml
@@ -82,7 +82,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -117,7 +117,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -152,7 +152,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -187,7 +187,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -222,7 +222,7 @@
<avg_event_value>9.55</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>4</nb_events>
@@ -305,7 +305,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
index 9868947268..48a1c22649 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getAction_month.xml
@@ -82,7 +82,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
<nb_events_with_value>0</nb_events_with_value>
@@ -117,7 +117,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
<nb_events_with_value>0</nb_events_with_value>
@@ -152,7 +152,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
<nb_events_with_value>0</nb_events_with_value>
@@ -187,7 +187,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
<nb_events_with_value>0</nb_events_with_value>
@@ -222,7 +222,7 @@
<avg_event_value>9.55</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>4</nb_events>
<nb_events_with_value>4</nb_events_with_value>
@@ -305,7 +305,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
<nb_events_with_value>0</nb_events_with_value>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml
index 9461eeb42e..60c5633e2a 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_day.xml
@@ -102,7 +102,7 @@
</subtable>
</row>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>12</nb_uniq_visitors>
<nb_visits>12</nb_visits>
<nb_events>14</nb_events>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
index 5f8de9463f..1d5fd32cfd 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Events.getName_month.xml
@@ -102,7 +102,7 @@
</subtable>
</row>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>12</nb_visits>
<nb_events>14</nb_events>
<nb_events_with_value>4</nb_events_with_value>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml
index d70e8c2950..f0338f0380 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getAction_day.xml
@@ -82,7 +82,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -117,7 +117,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -152,7 +152,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -187,7 +187,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -222,7 +222,7 @@
<avg_event_value>9.55</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>4</nb_events>
@@ -281,7 +281,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml
index 71ccc3d69b..8dcc330ab2 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_eventCategoryOrNameMatch__Events.getName_day.xml
@@ -102,7 +102,7 @@
</subtable>
</row>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>12</nb_uniq_visitors>
<nb_visits>12</nb_visits>
<nb_events>14</nb_events>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml
index 9461eeb42e..60c5633e2a 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_day.xml
@@ -102,7 +102,7 @@
</subtable>
</row>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>12</nb_uniq_visitors>
<nb_visits>12</nb_visits>
<nb_events>14</nb_events>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
index 5f8de9463f..1d5fd32cfd 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventAction__Events.getName_month.xml
@@ -102,7 +102,7 @@
</subtable>
</row>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>12</nb_visits>
<nb_events>14</nb_events>
<nb_events_with_value>4</nb_events_with_value>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml
index 03b5718c7b..ed806b85af 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_day.xml
@@ -25,7 +25,7 @@
</subtable>
</row>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>12</nb_uniq_visitors>
<nb_visits>12</nb_visits>
<nb_events>14</nb_events>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
index 54676e7511..8595e16fba 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventCategory__Events.getName_month.xml
@@ -25,7 +25,7 @@
</subtable>
</row>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>12</nb_visits>
<nb_events>14</nb_events>
<nb_events_with_value>4</nb_events_with_value>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml
index 26752bbd7b..39d8225809 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_day.xml
@@ -82,7 +82,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -117,7 +117,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -152,7 +152,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -187,7 +187,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -222,7 +222,7 @@
<avg_event_value>9.55</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>4</nb_events>
@@ -305,7 +305,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
index 9868947268..48a1c22649 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getAction_month.xml
@@ -82,7 +82,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
<nb_events_with_value>0</nb_events_with_value>
@@ -117,7 +117,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
<nb_events_with_value>0</nb_events_with_value>
@@ -152,7 +152,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
<nb_events_with_value>0</nb_events_with_value>
@@ -187,7 +187,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
<nb_events_with_value>0</nb_events_with_value>
@@ -222,7 +222,7 @@
<avg_event_value>9.55</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>4</nb_events>
<nb_events_with_value>4</nb_events_with_value>
@@ -305,7 +305,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
<nb_events_with_value>0</nb_events_with_value>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml
index d6f7a63bbe..26b6cd6621 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_day.xml
@@ -69,7 +69,7 @@
<avg_event_value>9.5</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>12</nb_uniq_visitors>
<nb_visits>12</nb_visits>
<nb_events>14</nb_events>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
index 835e7cc629..8139515e3f 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_secondaryDimensionIsEventName__Events.getCategory_month.xml
@@ -69,7 +69,7 @@
<avg_event_value>9.5</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_visits>12</nb_visits>
<nb_events>14</nb_events>
<nb_events_with_value>4</nb_events_with_value>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml
index 609b2b8d6c..66a7dc04c6 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getAction_day.xml
@@ -58,7 +58,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -93,7 +93,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -128,7 +128,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -163,7 +163,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
@@ -198,7 +198,7 @@
<avg_event_value>0</avg_event_value>
<subtable>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_events>2</nb_events>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml
index e1aa570c57..5b804860db 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_segmentMatchesEventActionPlay__Events.getName_day.xml
@@ -80,7 +80,7 @@
</subtable>
</row>
<row>
- <label>La fiancée de l&#039;eau</label>
+ <label>La fiancée de l'eau</label>
<nb_uniq_visitors>10</nb_uniq_visitors>
<nb_visits>10</nb_visits>
<nb_events>10</nb_events>
diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
index ca2eb265664534bd37395b310788e7dfc54d26fc..672bc648cc44e1dfdfafce81c7120373b9022447 100644
GIT binary patch
delta 49
wcmbPZGskAbE&*-@hFpeBhCBuZ2E)z$T*j=Ee~A7-5;U3I&!xFpMf?XF0B3s+3jhEB
delta 49
wcmbPZGskAbE&=WZ47m)M40#L-7z{V}a~ZQv{vrAUNzi0+KbPia74aWz0GxXe3jhEB
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml
index 3752727571..70117fb4d3 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsCategory__API.getProcessedReport_day.xml
@@ -40,7 +40,7 @@
<quantity>3</quantity>
<orders>2</orders>
<nb_visits>3</nb_visits>
- <avg_price>1000</avg_price>
+ <avg_price>$ 1000</avg_price>
<avg_quantity>1.5</avg_quantity>
<conversion_rate>66.67%</conversion_rate>
</row>
@@ -50,7 +50,7 @@
<quantity>2</quantity>
<orders>1</orders>
<nb_visits>1</nb_visits>
- <avg_price>500</avg_price>
+ <avg_price>$ 500</avg_price>
<avg_quantity>2</avg_quantity>
<conversion_rate>100%</conversion_rate>
</row>
@@ -60,7 +60,7 @@
<quantity>2</quantity>
<orders>1</orders>
<nb_visits>1</nb_visits>
- <avg_price>500</avg_price>
+ <avg_price>$ 500</avg_price>
<avg_quantity>2</avg_quantity>
<conversion_rate>100%</conversion_rate>
</row>
@@ -70,7 +70,7 @@
<quantity>2</quantity>
<orders>1</orders>
<nb_visits>1</nb_visits>
- <avg_price>500</avg_price>
+ <avg_price>$ 500</avg_price>
<avg_quantity>2</avg_quantity>
<conversion_rate>100%</conversion_rate>
</row>
@@ -80,7 +80,7 @@
<quantity>2</quantity>
<orders>1</orders>
<nb_visits>1</nb_visits>
- <avg_price>500</avg_price>
+ <avg_price>$ 500</avg_price>
<avg_quantity>2</avg_quantity>
<conversion_rate>100%</conversion_rate>
</row>
@@ -90,14 +90,14 @@
<quantity>7</quantity>
<orders>2</orders>
<nb_visits>3</nb_visits>
- <avg_price>55.61</avg_price>
+ <avg_price>$ 55.61</avg_price>
<avg_quantity>3.5</avg_quantity>
<conversion_rate>66.67%</conversion_rate>
</row>
<row>
<label>Category TWO LEFT in cart</label>
<nb_visits>2</nb_visits>
- <avg_price>0</avg_price>
+ <avg_price>$ 0</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
<revenue>$ 0</revenue>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml
index ea59fc1287..20079eb4c4 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_ItemsSku__API.getProcessedReport_day.xml
@@ -40,7 +40,7 @@
<quantity>1</quantity>
<orders>1</orders>
<nb_visits>1</nb_visits>
- <avg_price>1500</avg_price>
+ <avg_price>$ 1500</avg_price>
<avg_quantity>1</avg_quantity>
<conversion_rate>100%</conversion_rate>
</row>
@@ -50,7 +50,7 @@
<quantity>3</quantity>
<orders>2</orders>
<nb_visits>3</nb_visits>
- <avg_price>255.61</avg_price>
+ <avg_price>$ 255.61</avg_price>
<avg_quantity>1.5</avg_quantity>
<conversion_rate>66.67%</conversion_rate>
</row>
@@ -59,7 +59,7 @@
<revenue>$ 600</revenue>
<quantity>6</quantity>
<orders>1</orders>
- <avg_price>100</avg_price>
+ <avg_price>$ 100</avg_price>
<avg_quantity>6</avg_quantity>
<conversion_rate>0%</conversion_rate>
<nb_visits>0</nb_visits>
@@ -67,7 +67,7 @@
<row>
<label>SKU IN ABANDONED CART TWO</label>
<nb_visits>2</nb_visits>
- <avg_price>0</avg_price>
+ <avg_price>$ 0</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
<revenue>$ 0</revenue>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index a9d0428a72..1092815ed4 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -203,31 +203,31 @@ label,nb_conversions
Product SKU
label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate
-SKU2,$ 1500,1,1,1,1500,1,100%
-SKU VERY nice indeed,$ 1011.22,3,2,4,255.61,1.5,50%
-ANOTHER SKU HERE,$ 600,6,1,0,100,6,0%
-TRIPOD SKU,$ 200,2,1,0,100,2,0%
-SKU IN ABANDONED CART TWO,$ 0,0,0,3,0,0,0%
+SKU2,$ 1500,1,1,1,$ 1500,1,100%
+SKU VERY nice indeed,$ 1011.22,3,2,4,$ 255.61,1.5,50%
+ANOTHER SKU HERE,$ 600,6,1,0,$ 100,6,0%
+TRIPOD SKU,$ 200,2,1,0,$ 100,2,0%
+SKU IN ABANDONED CART TWO,$ 0,0,0,3,$ 0,0,0%
Product Name
label,revenue,quantity,orders,avg_price,avg_quantity,conversion_rate,nb_visits
-Canon SLR,$ 1500,1,1,1500,1,0%,0
-PRODUCT name,$ 1011.22,3,2,255.61,1.5,100%,2
-PRODUCT name BIS,$ 600,6,1,100,6,0%,0
-TRIPOD - bought day after,$ 200,2,1,100,2,0%,0
-PRODUCT THREE LEFT in cart,$ 0,0,0,1332,0,0%,3
-PRODUCT TWO LEFT in cart,$ 0,0,0,0,0,0%,3
+Canon SLR,$ 1500,1,1,$ 1500,1,0%,0
+PRODUCT name,$ 1011.22,3,2,$ 255.61,1.5,100%,2
+PRODUCT name BIS,$ 600,6,1,$ 100,6,0%,0
+TRIPOD - bought day after,$ 200,2,1,$ 100,2,0%,0
+PRODUCT THREE LEFT in cart,$ 0,0,0,$ 1332,0,0%,3
+PRODUCT TWO LEFT in cart,$ 0,0,0,$ 0,0,0%,3
Product Category
label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate
-Electronics & Cameras,$ 2500,3,2,3,1000,1.5,66.67%
-Multiple Category 1,$ 1000,2,1,1,500,2,100%
-Multiple Category 2,$ 1000,2,1,1,500,2,100%
-Multiple Category 4,$ 1000,2,1,1,500,2,100%
-Multiple Category 5,$ 1000,2,1,1,500,2,100%
-Product Category not defined,$ 611.22,7,2,4,55.61,3.5,50%
-Tools,$ 200,2,1,0,100,2,0%
-Category TWO LEFT in cart,$ 0,0,0,3,0,0,0%
+Electronics & Cameras,$ 2500,3,2,3,$ 1000,1.5,66.67%
+Multiple Category 1,$ 1000,2,1,1,$ 500,2,100%
+Multiple Category 2,$ 1000,2,1,1,$ 500,2,100%
+Multiple Category 4,$ 1000,2,1,1,$ 500,2,100%
+Multiple Category 5,$ 1000,2,1,1,$ 500,2,100%
+Product Category not defined,$ 611.22,7,2,4,$ 55.61,3.5,50%
+Tools,$ 200,2,1,0,$ 100,2,0%
+Category TWO LEFT in cart,$ 0,0,0,3,$ 0,0,0%
Actions - Main metrics
nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index c2452282d2..e51c812c77 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -3527,7 +3527,7 @@
1
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1500
+ $ 1500
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
1
@@ -3553,7 +3553,7 @@
4
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 255.61
+ $ 255.61
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
1.5
@@ -3579,7 +3579,7 @@
0
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 100
+ $ 100
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
6
@@ -3605,7 +3605,7 @@
0
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 100
+ $ 100
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
2
@@ -3631,7 +3631,7 @@
3
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
+ $ 0
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
@@ -3697,7 +3697,7 @@
0
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1500
+ $ 1500
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
1
@@ -3723,7 +3723,7 @@
2
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 255.61
+ $ 255.61
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
1.5
@@ -3749,7 +3749,7 @@
0
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 100
+ $ 100
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
6
@@ -3775,7 +3775,7 @@
0
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 100
+ $ 100
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
2
@@ -3801,7 +3801,7 @@
3
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1332
+ $ 1332
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
@@ -3827,7 +3827,7 @@
3
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
+ $ 0
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
@@ -3893,7 +3893,7 @@
3
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 1000
+ $ 1000
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
1.5
@@ -3919,7 +3919,7 @@
1
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 500
+ $ 500
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
2
@@ -3945,7 +3945,7 @@
1
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 500
+ $ 500
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
2
@@ -3971,7 +3971,7 @@
1
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 500
+ $ 500
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
2
@@ -3997,7 +3997,7 @@
1
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 500
+ $ 500
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
2
@@ -4023,7 +4023,7 @@
4
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 55.61
+ $ 55.61
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
3.5
@@ -4049,7 +4049,7 @@
0
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 100
+ $ 100
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
2
@@ -4075,7 +4075,7 @@
3
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 0
+ $ 0
</td>
<td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
0
--
GitLab