diff options
| author | diosmosis <benaka@piwik.pro> | 2014-11-18 04:22:18 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2014-11-18 04:22:18 +0300 |
| commit | 17eee45ea6d1eebb78bbd4cef67580b17fa89493 (patch) | |
| tree | c1699570b1afa7d3e9dfc94620ac3fc6c34a3e2c | |
| parent | 92546e1ec54ec967dedbf5dfbe28020dd18ad6f5 (diff) | |
Fixing System tests (and reverting SafeDecodeLabel change).
33 files changed, 137 insertions, 137 deletions
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index b7a2b4a74e..368e7d54fb 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -19,7 +19,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's pitch black...</pageTitle> + <pageTitle>It&#039;s pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>61</pageId> @@ -282,7 +282,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>29</pageId> @@ -546,7 +546,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>26</pageId> @@ -827,7 +827,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>22</pageId> @@ -1091,7 +1091,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>19</pageId> @@ -1372,7 +1372,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>15</pageId> @@ -1767,7 +1767,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>12</pageId> @@ -1892,7 +1892,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>51</pageId> @@ -2321,7 +2321,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>8</pageId> @@ -2446,7 +2446,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>47</pageId> @@ -3119,7 +3119,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>5</pageId> @@ -3244,7 +3244,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>37</pageId> @@ -3369,7 +3369,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>44</pageId> @@ -3494,7 +3494,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>58</pageId> @@ -4235,7 +4235,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>1</pageId> @@ -4360,7 +4360,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>33</pageId> @@ -4485,7 +4485,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>40</pageId> @@ -4610,7 +4610,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>54</pageId> 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 588fe06efe..15678442b5 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'eau</label> + <label>La fiancée de l&#039;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 39d8225809..26752bbd7b 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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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 48a1c22649..9868947268 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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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 60c5633e2a..9461eeb42e 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'eau</label> + <label>La fiancée de l&#039;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 1d5fd32cfd..5f8de9463f 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'eau</label> + <label>La fiancée de l&#039;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__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index a0f97d2da2..469e4d6471 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -518,7 +518,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -537,7 +537,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -556,7 +556,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -575,7 +575,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -594,7 +594,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -613,7 +613,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <eventValue>9</eventValue> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> @@ -633,7 +633,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <eventValue>10</eventValue> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> @@ -1315,7 +1315,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1334,7 +1334,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1353,7 +1353,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1372,7 +1372,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1391,7 +1391,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1410,7 +1410,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <eventValue>9</eventValue> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> @@ -1430,7 +1430,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <eventValue>10</eventValue> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index a0f97d2da2..469e4d6471 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -518,7 +518,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -537,7 +537,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -556,7 +556,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -575,7 +575,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -594,7 +594,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -613,7 +613,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <eventValue>9</eventValue> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> @@ -633,7 +633,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <eventValue>10</eventValue> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> @@ -1315,7 +1315,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1334,7 +1334,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1353,7 +1353,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1372,7 +1372,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1391,7 +1391,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <timeSpent>30</timeSpent> <timeSpentPretty>30s</timeSpentPretty> <icon>plugins/Morpheus/images/event.png</icon> @@ -1410,7 +1410,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <eventValue>9</eventValue> <timeSpent>1</timeSpent> <timeSpentPretty>1s</timeSpentPretty> @@ -1430,7 +1430,7 @@ <customVariablePageValue1>should not appear in events report</customVariablePageValue1> </row> </customVariables> - <eventName>La fiancée de l'eau</eventName> + <eventName>La fiancée de l&#039;eau</eventName> <eventValue>10</eventValue> <timeSpent>1499</timeSpent> <timeSpentPretty>24 min 59s</timeSpentPretty> 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 f0338f0380..d70e8c2950 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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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 8dcc330ab2..71ccc3d69b 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'eau</label> + <label>La fiancée de l&#039;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 60c5633e2a..9461eeb42e 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'eau</label> + <label>La fiancée de l&#039;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 1d5fd32cfd..5f8de9463f 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'eau</label> + <label>La fiancée de l&#039;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 ed806b85af..03b5718c7b 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'eau</label> + <label>La fiancée de l&#039;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 8595e16fba..54676e7511 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'eau</label> + <label>La fiancée de l&#039;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 39d8225809..26752bbd7b 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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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 48a1c22649..9868947268 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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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 26b6cd6621..d6f7a63bbe 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'eau</label> + <label>La fiancée de l&#039;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 8139515e3f..835e7cc629 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'eau</label> + <label>La fiancée de l&#039;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 66a7dc04c6..609b2b8d6c 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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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'eau</label> + <label>La fiancée de l&#039;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 5b804860db..e1aa570c57 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'eau</label> + <label>La fiancée de l&#039;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_LabelFilter_thisiscool__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml index bbd4f6792d..cd19ebdea0 100644 --- a/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml +++ b/tests/PHPUnit/System/expected/test_LabelFilter_thisiscool__Actions.getPageUrls_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>/ééé"'... <this is cool>!</label> + <label>/ééé"&#039;... <this is cool>!</label> <nb_visits>1</nb_visits> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_hits>1</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index 403004b58a..b20e40002c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -147,7 +147,7 @@ <pageId>2</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -164,7 +164,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -209,7 +209,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -424,7 +424,7 @@ <pageId>34</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -441,7 +441,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -486,7 +486,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -701,7 +701,7 @@ <pageId>41</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -718,7 +718,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -763,7 +763,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 46e7e63638..d8d596799c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -131,7 +131,7 @@ <pageId>30</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -148,7 +148,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -193,7 +193,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -412,7 +412,7 @@ <pageId>27</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -457,7 +457,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> @@ -676,7 +676,7 @@ <pageId>23</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -693,7 +693,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -738,7 +738,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index aa243bc101..668f5347a8 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -24,7 +24,7 @@ <pageId>30</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -41,7 +41,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -86,7 +86,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -305,7 +305,7 @@ <pageId>23</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -322,7 +322,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -367,7 +367,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -461,7 +461,7 @@ <pageId>27</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -506,7 +506,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 46e7e63638..d8d596799c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -131,7 +131,7 @@ <pageId>30</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -148,7 +148,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -193,7 +193,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> @@ -412,7 +412,7 @@ <pageId>27</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -457,7 +457,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>0</searches> <actions>2</actions> <referrerType>direct</referrerType> @@ -676,7 +676,7 @@ <pageId>23</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -693,7 +693,7 @@ </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -738,7 +738,7 @@ <daysSinceFirstVisit>100</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder> <visitDuration>1261</visitDuration> - <visitDurationPretty>21 min 1s</visitDurationPretty> + <visitDurationPretty>21 min 1s</visitDurationPretty> <searches>1</searches> <actions>3</actions> <referrerType>direct</referrerType> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 5e81b9e8d3..e38cadcaad 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -19,7 +19,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's pitch black...</pageTitle> + <pageTitle>It&#039;s pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>61</pageId> @@ -282,7 +282,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>29</pageId> @@ -546,7 +546,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>26</pageId> @@ -827,7 +827,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>22</pageId> @@ -1091,7 +1091,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It's <script> pitch black...</pageTitle> + <pageTitle>It&#039;s <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>19</pageId> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml index 9c8bbddbf2..c9eb98ffda 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getCity_day.xml @@ -18,7 +18,7 @@ <logo>plugins/UserCountry/images/flags/au.png</logo> </row> <row> - <label>Nice, Provence-Alpes-Cote d'Azur, France</label> + <label>Nice, Provence-Alpes-Cote d&#039;Azur, France</label> <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml index c6aca6fe68..50888ce069 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__UserCountry.getRegion_day.xml @@ -17,7 +17,7 @@ <logo>plugins/UserCountry/images/flags/au.png</logo> </row> <row> - <label>Provence-Alpes-Cote d'Azur, France</label> + <label>Provence-Alpes-Cote d&#039;Azur, France</label> <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml index 9c8bbddbf2..c9eb98ffda 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml @@ -18,7 +18,7 @@ <logo>plugins/UserCountry/images/flags/au.png</logo> </row> <row> - <label>Nice, Provence-Alpes-Cote d'Azur, France</label> + <label>Nice, Provence-Alpes-Cote d&#039;Azur, France</label> <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml index c6aca6fe68..50888ce069 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml @@ -17,7 +17,7 @@ <logo>plugins/UserCountry/images/flags/au.png</logo> </row> <row> - <label>Provence-Alpes-Cote d'Azur, France</label> + <label>Provence-Alpes-Cote d&#039;Azur, France</label> <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>20</nb_visits> <nb_actions>20</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml index d9774fd211..c92fc50036 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml @@ -236,7 +236,7 @@ <nb_actions>1</nb_actions> <subtable> <row> - <label>'looking at "\profile page"'</label> + <label>&#039;looking at "\profile page"&#039;</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> </row> diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml index ef24f3a29e..60639711b9 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml @@ -250,7 +250,7 @@ <nb_actions>1</nb_actions> <subtable> <row> - <label>'looking at "\profile page"'</label> + <label>&#039;looking at "\profile page"&#039;</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject c50b2f20931782a8aef10fceb1c5f90f2f547b3 +Subproject 06f31df855f764978a35ad64c318ea57e09f384 |