From b39357a395b480e5bb40240e79aa55d3474d3d9a Mon Sep 17 00:00:00 2001 From: diosmosis <benaka@piwik.pro> Date: Sun, 16 Nov 2014 18:32:38 -0800 Subject: [PATCH] Fixing more tests. --- ...mEvents__Live.getLastVisitsDetails_day.xml | 8 ++--- ...vents__Live.getLastVisitsDetails_month.xml | 8 ++--- ...er_thisiscool__Actions.getPageUrls_day.xml | 2 +- ...eTest__Live.getLastVisitsDetails_month.xml | 36 +++++++++---------- ...ssedMetric__API.getProcessedReport_day.xml | 16 ++++----- ...pEmptyRows__API.getProcessedReport_day.xml | 22 ++++++------ ...tsSummary.getSumVisitsLengthPretty_day.xml | 2 +- ...Support__Live.getLastVisitsDetails_day.xml | 16 ++++----- ...tsSummary.getSumVisitsLengthPretty_day.xml | 2 +- ...torId__Live.getLastVisitsDetails_month.xml | 8 ++--- ...tadataAndNormalAPI__Live.getLastVisits.xml | 6 ++-- ...alAPI__Live.getLastVisitsDetails_range.xml | 6 ++-- ...eportLimiting__UserCountry.getCity_day.xml | 2 +- ...ortLimiting__UserCountry.getRegion_day.xml | 2 +- ..._rankingQuery__UserCountry.getCity_day.xml | 2 +- ...ankingQuery__UserCountry.getRegion_day.xml | 2 +- ...CustomVariables.getCustomVariables_day.xml | 2 +- ...ustomVariables.getCustomVariables_week.xml | 2 +- 18 files changed, 72 insertions(+), 72 deletions(-) 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 dafd6523e3..a0f97d2da2 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -489,7 +489,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> - <generationTime>00:00:00.33</generationTime> + <generationTime>0.33s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -646,7 +646,7 @@ <pageIdAction>12</pageIdAction> <pageId>9</pageId> - <generationTime>00:00:00.66</generationTime> + <generationTime>0.67s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -1286,7 +1286,7 @@ <pageIdAction>2</pageIdAction> <pageId>25</pageId> - <generationTime>00:00:00.33</generationTime> + <generationTime>0.33s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -1443,7 +1443,7 @@ <pageIdAction>12</pageIdAction> <pageId>33</pageId> - <generationTime>00:00:00.66</generationTime> + <generationTime>0.67s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> 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 dafd6523e3..a0f97d2da2 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -489,7 +489,7 @@ <pageIdAction>2</pageIdAction> <pageId>1</pageId> - <generationTime>00:00:00.33</generationTime> + <generationTime>0.33s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -646,7 +646,7 @@ <pageIdAction>12</pageIdAction> <pageId>9</pageId> - <generationTime>00:00:00.66</generationTime> + <generationTime>0.67s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -1286,7 +1286,7 @@ <pageIdAction>2</pageIdAction> <pageId>25</pageId> - <generationTime>00:00:00.33</generationTime> + <generationTime>0.33s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> @@ -1443,7 +1443,7 @@ <pageIdAction>12</pageIdAction> <pageId>33</pageId> - <generationTime>00:00:00.66</generationTime> + <generationTime>0.67s</generationTime> <timeSpent>60</timeSpent> <timeSpentPretty>1 min 0s</timeSpentPretty> <icon /> 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 cd19ebdea0..bbd4f6792d 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>/ééé"&#039;... <this is cool>!</label> + <label>/ééé"'... <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_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 51741a69bc..5e81b9e8d3 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&#039;s pitch black...</pageTitle> + <pageTitle>It's pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>61</pageId> @@ -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> @@ -282,7 +282,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>29</pageId> @@ -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> @@ -546,7 +546,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>26</pageId> @@ -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> @@ -827,7 +827,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>22</pageId> @@ -957,7 +957,7 @@ <pageId>20</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -1002,7 +1002,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> @@ -1091,7 +1091,7 @@ <row> <type>action</type> <url>http://piwik.net/grue/lair</url> - <pageTitle>It&#039;s <script> pitch black...</pageTitle> + <pageTitle>It's <script> pitch black...</pageTitle> <pageIdAction>2</pageIdAction> <pageId>19</pageId> @@ -1221,7 +1221,7 @@ <pageId>16</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -1238,7 +1238,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> @@ -1283,7 +1283,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_sortByProcessedMetric__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml index 670c31b22e..5c5dea9f59 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml @@ -40,14 +40,6 @@ <exit_rate>Exit rate</exit_rate> </columns> <reportData> - <row> - <label>space</label> - <nb_visits>4</nb_visits> - <nb_hits>4</nb_hits> - <bounce_rate>0%</bounce_rate> - <avg_time_on_page>00:06:00</avg_time_on_page> - <exit_rate>0%</exit_rate> - </row> <row> <label>grue</label> <nb_visits>4</nb_visits> @@ -56,6 +48,14 @@ <avg_time_on_page>00:00:00</avg_time_on_page> <exit_rate>100%</exit_rate> </row> + <row> + <label>space</label> + <nb_visits>4</nb_visits> + <nb_hits>4</nb_hits> + <bounce_rate>0%</bounce_rate> + <avg_time_on_page>00:06:00</avg_time_on_page> + <exit_rate>0%</exit_rate> + </row> </reportData> <reportMetadata> <row> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml index 2dc60effda..3861e6c668 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml @@ -49,17 +49,6 @@ <revenue>Revenue</revenue> </columns> <reportData> - <row> - <label>11h</label> - <nb_uniq_visitors>4</nb_uniq_visitors> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> - <nb_users>0</nb_users> - <revenue>$ 20</revenue> - <nb_actions_per_visit>1</nb_actions_per_visit> - <avg_time_on_site>00:00:00</avg_time_on_site> - <bounce_rate>100%</bounce_rate> - </row> <row> <label>12h</label> <nb_uniq_visitors>4</nb_uniq_visitors> @@ -71,6 +60,17 @@ <avg_time_on_site>00:21:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> </row> + <row> + <label>11h</label> + <nb_uniq_visitors>4</nb_uniq_visitors> + <nb_visits>4</nb_visits> + <nb_actions>4</nb_actions> + <nb_users>0</nb_users> + <revenue>$ 20</revenue> + <nb_actions_per_visit>1</nb_actions_per_visit> + <avg_time_on_site>00:00:00</avg_time_on_site> + <bounce_rate>100%</bounce_rate> + </row> <row> <label>0h</label> <nb_uniq_visitors>0</nb_uniq_visitors> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml index 3912ba15a2..c7ce53bdef 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__VisitsSummary.getSumVisitsLengthPretty_day.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>27 min 1s</result> \ No newline at end of file +<result>27 min 1s</result> \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 4297f03270..dd5f7b87e6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -123,7 +123,7 @@ <pageId>1</pageId> <generationTime>0.23s</generationTime> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -135,7 +135,7 @@ <pageId>2</pageId> <generationTime>0.22s</generationTime> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -146,7 +146,7 @@ <pageId>3</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> </row> <row> @@ -157,7 +157,7 @@ <pageId>4</pageId> <timeSpent>72</timeSpent> - <timeSpentPretty>1 min 12s</timeSpentPretty> + <timeSpentPretty>1 min 12s</timeSpentPretty> <icon>plugins/Morpheus/images/download.png</icon> </row> <row> @@ -168,7 +168,7 @@ <pageId>5</pageId> <timeSpent>108</timeSpent> - <timeSpentPretty>1 min 48s</timeSpentPretty> + <timeSpentPretty>1 min 48s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> </row> <row> @@ -179,7 +179,7 @@ <pageId>6</pageId> <timeSpent>72</timeSpent> - <timeSpentPretty>1 min 12s</timeSpentPretty> + <timeSpentPretty>1 min 12s</timeSpentPretty> <icon>plugins/Morpheus/images/link.gif</icon> </row> <row> @@ -201,7 +201,7 @@ <siteSearchKeyword>Banks Own The World</siteSearchKeyword> <generationTime>0.81s</generationTime> <timeSpent>108</timeSpent> - <timeSpentPretty>1 min 48s</timeSpentPretty> + <timeSpentPretty>1 min 48s</timeSpentPretty> <icon>plugins/Morpheus/images/search_ico.png</icon> </row> <row> @@ -236,7 +236,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>1621</visitDuration> - <visitDurationPretty>27 min 1s</visitDurationPretty> + <visitDurationPretty>27 min 1s</visitDurationPretty> <customVariables> </customVariables> <deviceType>Desktop</deviceType> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml index 3912ba15a2..c7ce53bdef 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__VisitsSummary.getSumVisitsLengthPretty_day.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result>27 min 1s</result> \ No newline at end of file +<result>27 min 1s</result> \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml index cc28b360a0..551c6e66c3 100644 --- a/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_UserId_VisitorId__Live.getLastVisitsDetails_month.xml @@ -30,7 +30,7 @@ <serverTimePretty>Sat 6 Mar 11:25:33</serverTimePretty> <pageId>2</pageId> <timeSpent>180</timeSpent> - <timeSpentPretty>3 min 0s</timeSpentPretty> + <timeSpentPretty>3 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -59,7 +59,7 @@ <serverTimePretty>Sat 6 Mar 13:16:33</serverTimePretty> <pageId>4</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -70,7 +70,7 @@ <serverTimePretty>Sat 6 Mar 13:22:33</serverTimePretty> <pageId>5</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -117,7 +117,7 @@ <serverTimePretty>Sat 6 Mar 16:22:33</serverTimePretty> <pageId>8</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index e030350ae3..8e0b0b794b 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -152,7 +152,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>361</visitDuration> - <visitDurationPretty>6 min 1s</visitDurationPretty> + <visitDurationPretty>6 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName1>VisitorType</customVariableName1> @@ -244,7 +244,7 @@ <pageId>1</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -323,7 +323,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>364</visitDuration> - <visitDurationPretty>6 min 4s</visitDurationPretty> + <visitDurationPretty>6 min 4s</visitDurationPretty> <customVariables> <row> <customVariableName1>VisitorType</customVariableName1> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index e030350ae3..8e0b0b794b 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -152,7 +152,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>361</visitDuration> - <visitDurationPretty>6 min 1s</visitDurationPretty> + <visitDurationPretty>6 min 1s</visitDurationPretty> <customVariables> <row> <customVariableName1>VisitorType</customVariableName1> @@ -244,7 +244,7 @@ <pageId>1</pageId> <timeSpent>360</timeSpent> - <timeSpentPretty>6 min 0s</timeSpentPretty> + <timeSpentPretty>6 min 0s</timeSpentPretty> <icon /> </row> <row> @@ -323,7 +323,7 @@ <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <visitDuration>364</visitDuration> - <visitDurationPretty>6 min 4s</visitDurationPretty> + <visitDurationPretty>6 min 4s</visitDurationPretty> <customVariables> <row> <customVariableName1>VisitorType</customVariableName1> 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 c9eb98ffda..9c8bbddbf2 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&#039;Azur, France</label> + <label>Nice, Provence-Alpes-Cote d'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 50888ce069..c6aca6fe68 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&#039;Azur, France</label> + <label>Provence-Alpes-Cote d'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 c9eb98ffda..9c8bbddbf2 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&#039;Azur, France</label> + <label>Nice, Provence-Alpes-Cote d'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 50888ce069..c6aca6fe68 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&#039;Azur, France</label> + <label>Provence-Alpes-Cote d'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 c92fc50036..d9774fd211 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>&#039;looking at "\profile page"&#039;</label> + <label>'looking at "\profile page"'</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 60639711b9..ef24f3a29e 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>&#039;looking at "\profile page"&#039;</label> + <label>'looking at "\profile page"'</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> -- GitLab