diff options
| author | Patryk Andrzejewski <p.andrzejewski@clearcode.cc> | 2014-09-19 16:29:38 +0400 |
|---|---|---|
| committer | Patryk Andrzejewski <p.andrzejewski@clearcode.cc> | 2014-09-19 16:29:38 +0400 |
| commit | 2a37303f88912f344668080aeaf89177400c8434 (patch) | |
| tree | 9a4ad8cbde5ae9eb00d0575b10b59d64a896c823 /tests/PHPUnit/Integration/expected | |
| parent | c70befbb8d41f500565d06e521a8651ff52be3c4 (diff) | |
feedback
Diffstat (limited to 'tests/PHPUnit/Integration/expected')
12 files changed, 91 insertions, 100 deletions
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml index 15ef47ea50..824e562cbd 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguageCode_month.xml @@ -1,25 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Unknown - Unknown - (xx-xx)</label> - <nb_visits>18</nb_visits> - <nb_actions>21</nb_actions> + <label>Unknown (xx)</label> + <nb_visits>27</nb_visits> + <nb_actions>30</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>16</bounce_count> - <nb_visits_converted>16</nb_visits_converted> - <sum_daily_nb_uniq_visitors>18</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>3</sum_daily_nb_users> - </row> - <row> - <label>Unknown - Japan - (xx-jp)</label> - <nb_visits>9</nb_visits> - <nb_actions>9</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>9</bounce_count> - <nb_visits_converted>9</nb_visits_converted> - <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>1</sum_daily_nb_users> + <bounce_count>25</bounce_count> + <nb_visits_converted>25</nb_visits_converted> + <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getLanguageCode_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getLanguageCode_day.xml index 74ecc91490..b5d5e44542 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getLanguageCode_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserSettings.getLanguageCode_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>French - France - (fr-fr)</label> + <label>French (fr)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguageCode_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguageCode_day.xml index aa99ae9329..30a2a94462 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguageCode_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getLanguageCode_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>French - France - (fr-fr)</label> + <label>French (fr)</label> <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> <nb_actions>9</nb_actions> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index a9ba35c127..a7fdbfae5e 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -4,16 +4,8 @@ <idSite>1</idSite> <idVisit>2</idVisit> <visitIp>156.5.0.0</visitIp> + <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>0</visitConverted> - <visitConvertedIcon /> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>action</type> @@ -25,38 +17,27 @@ <icon /> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>0</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>0</visitDuration> - <visitDurationPretty>0s</visitDurationPretty> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>0</visitConverted> + <visitConvertedIcon /> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <provider>Inconnu</provider> - <providerName>Inconnu</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>0</visitDuration> + <visitDurationPretty>0s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>search</referrerType> <referrerTypeName>Moteurs de recherche</referrerTypeName> <referrerName>Google</referrerName> @@ -74,9 +55,8 @@ <browserName>Inconnu</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion>UNK</browserVersion> + <browserVersion /> <screenType>normal</screenType> - <deviceType>Bureau</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -90,6 +70,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Inconnu</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <provider>Inconnu</provider> + <providerName>Inconnu</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> @@ -100,16 +101,8 @@ <idSite>1</idSite> <idVisit>1</idVisit> <visitIp>156.5.0.0</visitIp> + <userId /> - <visitorType>new</visitorType> - <visitorTypeIcon /> - <visitConverted>1</visitConverted> - <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> - <visitEcommerceStatus>none</visitEcommerceStatus> - <visitEcommerceStatusIcon /> - <searches>0</searches> - <events>0</events> - <actions>1</actions> <actionDetails> <row> <type>action</type> @@ -131,38 +124,27 @@ <icon>plugins/Morpheus/images/goal.png</icon> </row> </actionDetails> - <customVariables> - </customVariables> <goalConversions>1</goalConversions> <siteCurrency>USD</siteCurrency> <siteCurrencySymbol>$</siteCurrencySymbol> - <visitLocalTime>12:34:06</visitLocalTime> - <visitLocalHour>12</visitLocalHour> - - <visitDuration>1084</visitDuration> - <visitDurationPretty>18 min 4s</visitDurationPretty> + <visitorType>new</visitorType> + <visitorTypeIcon /> + <visitConverted>1</visitConverted> + <visitConvertedIcon>plugins/Morpheus/images/goal.png</visitConvertedIcon> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + + <visitEcommerceStatus>none</visitEcommerceStatus> + <visitEcommerceStatusIcon /> <daysSinceFirstVisit>0</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> - <continent>Europe</continent> - <continentCode>eur</continentCode> - <country>France</country> - <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> - <region /> - <regionCode /> - <city /> - <location>France</location> - <latitude /> - <longitude /> - <provider>Inconnu</provider> - <providerName>Inconnu</providerName> - <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> + <visitDuration>1084</visitDuration> + <visitDurationPretty>18 min 4s</visitDurationPretty> + <searches>0</searches> + <actions>1</actions> <referrerType>search</referrerType> <referrerTypeName>Moteurs de recherche</referrerTypeName> <referrerName>Google</referrerName> @@ -180,9 +162,8 @@ <browserName>Inconnu</browserName> <browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon> <browserCode>UNK</browserCode> - <browserVersion>UNK</browserVersion> + <browserVersion /> <screenType>normal</screenType> - <deviceType>Bureau</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -196,6 +177,27 @@ <pluginName>java</pluginName> </row> </pluginsIcons> + <deviceType>Inconnu</deviceType> + <events>0</events> + <continent>Europe</continent> + <continentCode>eur</continentCode> + <country>France</country> + <countryCode>fr</countryCode> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> + <region /> + <regionCode /> + <city /> + <location>France</location> + <latitude /> + <longitude /> + <visitLocalTime>12:34:06</visitLocalTime> + <visitLocalHour>12</visitLocalHour> + <daysSinceLastVisit>0</daysSinceLastVisit> + <customVariables> + </customVariables> + <provider>Inconnu</provider> + <providerName>Inconnu</providerName> + <providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 6b0ae67a9d..25aba2864b 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -141,8 +141,8 @@ French,2,3,0%,1.5,00:03:01,50% Language code label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown - Unknown - (xx-xx),8,40,0%,5,00:15:01,0% -French - France - (fr-fr),2,3,0%,1.5,00:03:01,50% +Unknown (xx),8,40,0%,5,00:15:01,0% +French (fr),2,3,0%,1.5,00:03:01,50% Actions - Main metrics nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords,avg_time_generation diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index f4e7a9c5ce..46ba01f039 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -3090,7 +3090,7 @@ </h2> <img alt="" - src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAH3klEQVR4nO3dMW/keB3H4QnKNttsf1tc4QbqUFNQINEgpUCImpeAaOiPdl8B3VGyEgUdL4HpQEIgN4cSpTyddNssYigsvL7xjOebGY//dvw8xSmZeMa/bC7z/4ztJDe73W4DAHDK90oPAAAsg2gAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBs5UVdXBGw/ePnwvABZBNDCyuq7zj2oIgAW5LT0AM/W73/9175bf/uqH3Xfruq6qqhsBe+8C8MKIBg7717+/+fjxY/vuq1evHh4e3r59e/KO/ZJo397rjOZD7QbNR7sbX/YZADAy0cBRHz58aN9+8+bN4+NjEg1dAwGxOdQQjlsAzJlrGjhf99hAssY/KwIUA8DciAauqKmK8GrHZ20MwPScnuCo169fX/4gzQGDJgXCQxHhxgBMTDRw2P2Pq8eHh5ObtWcokp+0zA85bFzTADA/ooHDfvajzzebzy98kGct/CoBYOZEA1fU/ynKgz9AcWzjaYYEIHSz2+1KzwAALICfngAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACDilzutkd+hBH1+JykrlywNomF19p4ZPVHCJv7DKPBShUuD0xPA2klnCIkGYNUUA+ScngDWSzFAI/yTgaIBWLXuE6WGYLXCaxpEA7BeLgqGZ3FNAwAQcaRhdcITVwCsR7g03Ox2u6lGAgAWzOkJACAiGgCAiGgAACKiAQCIiAYAICIaAICIaFiv7XZbegSYBd8L0Dj5vSAaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiNyWHoCS/vDnv5ceAcp7evr6H0++F2Dz9PT13d3QBqJh1f74l3+WHgHm4W/flJ4AZuHXgx91egIAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIicEw1VVY0+x7XNcOZrjzTDTxmARfsUDf01Zv6rzhJnblRVVdf1VXdR1/VS/jUAWITb0gMAAHPUfeXZvNA9fXqiuU/1f8c+2t+m6tjb997bw7s4w9kzTzN29zBD//GP7fHYGAN3cbABgPM0S1WrWU2iIw0Di1z39r1tuoffTy5dxx7qbGfM3PyjTDx2u9P27v1bLr8LAFwuuhDy4Dq0tz6dXKvaTmmXt+6DjL7UjTLzZvKxAWC2zrymYeJXtO0r/kt2OtuZ+0cI9m7pP9TJuwDAJfZOcDfry5nRMPESNcqOZjtz/8xC/+zDc+8CAJfon6+v6/rT6Ym9pji5/Jxxkd3B0/DPeoThGa4x8+YKYwPAEn3nSEN3Tc3P9w9crNd997I5T8yQ72V41Z9m7O4MAxczHhs1v4u+AWBEN7vdrvQMazTNcj68l+12+8WXX117BgAW5P27+/bt0a5p4EITnOZwmAGAS/QXEX+wqphrr+iKAYBxiQYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAyG3pASjplz/9QekRoLyHx8e3n31Wegoo7+HxcXgD0bBqP//J90uPAOVtt9/e3flegM12++3wBk5PAAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAARf+Vy1T7+57+lR2Dz6la7A8sgGlbtF7/5U+kR2Lx/d196BICIlzgAQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEDkJURDVVWlRxhT++lUVZV8asc2e2H/LAAUdzvlzvaWsbqup9z7nlkN06qqqpmkfSPcvq+u6/BBACAxaTRsZrM2N2Y1DHRD1v+cwAxNHQ17mpfC3ZfX7Ye6L7jb249t1r3xkmfbY/MMDNOf5+yn/r39Nv9t5+kfNji5mYMNC7L3lfKFA2aocDRsjh+QP3h7u0Aee5D+45w9z+a7WXBwmP6qPMpT/8mHfdZmLIIvHDB/U0dD/1X4yefK5Mn0vCfcg4cEhh+q1DN7uF8LDwDXM69rGq5xwf/AaYuTS+x58wzf68LTKKOchWHmHDEC5qn86YmuazxRnv2Y/dMio+zxws/RWvKyHTsBBzAH8/09DS/j1wy8jM+CaTSdqhiA2ZrRkYbw5w4u+fGES+YJN7tkvNF/2MFR7gXxxQLm72a325WegU+mjIbtdvvFl1+NtS/O9v7d/ebQQSkNMZntdnt3d1d6Cijv5PfCjI40sBn1YINXrsviiwXM33yvaVitsRYPixAA4xINAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAAJHb0gNQ0vt396VHAGAxHGkAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgMjNbrcrPQMAsACONAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBA5H8U081En1xORQAAAABJRU5ErkJggg==" + src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAHIklEQVR4nO3dvY4bVQCG4Vm026RJny1STAN1qCkokGiQtkCImktANPTQ5grooCQSBR2XgDuQEGga0FpbRpGSZhGmsHCGGf98/j3jzPMUq117PD7RZn1enxnbF7PZrAIA2OSt0gMAAM6DaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIiGHdV1vfTCpZevvxUAnAXRcGBN0+TXaggAzshl6QEM1Nff/Ny55MvP3m3/2DRNXdftCOj8CABvGNGw3B9/vbi/v1/8eHV1dXt7e319vfGG/ZJYfN/pjPlViw3m17Y33u9fAAAHJhpWevXq1eL7hw8fTqfTJBra1gREtawhrFsAMGTOadhde20gmeO3igDFAMDQiIYjmldFeLbjVhsDwOk5PLHSgwcP9t/JfMFgngLhUkS4MQCcmGhY7ub9enp7u3GzxRGK5JWW+ZJD5ZwGAIZHNCz30XuPq+rxnjvZauJXCQAMnGg4ov6rKJe+gGLVxqcZJACELmazWekxAABnwKsnAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIzxzZ28hxIMkDdFhbKSyXF00dB5YPI4BUPg812hrHBydHgCKEy7w7kQDUBJigHOyOgOTwDDoRhgIMIPTRQNQEntxykNAaWE5zSIBqAYZyXDeXFOAwAQGd1KQ3jYBgDGI5wcL2az2amGBACcMYcnAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAi442GyWRSeghAVfljhMHY+Mc43mgAALYiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIpelB1DSdz/+WnoIQHV39/y3O3+MUN7d3fMnT9ZtMOpo+P6n30sPAaiqqqp+eVF6BEBVVdXna691eAIAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIjsEg11XR98HAe/64KDBIA30uto6M+yQ5t367pumibcuGmaoY0fAM7aZekBAABD1H7uPX/SvvnwxPw29X9WXdvfpm7p3Hfn+/V3sdhsPuL+flbt2WIDAOxmPu0uzOfTaKWhfVygM0O3L+9s0z6UsHHyXrWrvvnQF1+XXgIAHFx0IuTSmbgzQ2+crRedspjg2zsx2QPAwO14TkPZ5/T9RQXLDABwQJ1D/Ok5Dcm+Tqy9VrHqEgBgZ0vPaXgdDUun4TW722GSXnoiwnb/CACgkP8dnmh3QDKdr5n4ly5r7CM5/7EzHlECAAd0MZvNSo8htW0ErN9+Mpl89e2fhxgXALwhnj29WXzff/J/Tm/utNURDcsMALCP/jR6Zh9YtdXbSB91JAAwNmcWDQBAKaIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIXJYeQEmffvhO6SEA1e10ev3oUelRANXtdLp+g1FHw8cfvF16CEA1mbx88sQfI5Q3mbxcv4HDEwBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBAZNSfcnn/9z+lh8C+ri6FL8CJjDoaPvnih9JDYF/Pnt6UHgLAWHiWBgBERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAARAYXDXVdb7VZXddLbxLuBwAIXe58y86s3DTN3oPZ4q7nd7f4pq9pmjXXAgDb2j0aqtOGAqzXrlj/MwGOYa9o6Jg/s28vAyyuai8MLC5ftVn7wv6jf2f/86+L+22vLlhsGI/OL9rvHeAYDhkN1eoDB0svX8z3q3bS309bvwlMFaPl9w5wAntFQ3+RYONjd/LgvvMEYOYAgOM54jkNXr9AERacAI7kwIcn2jxwc2KrDngBcBAnep8Gqw4c23yBQTEAHM+xVhrar5KoVj/5Czfr3yTZ0jL1ePhdA5zA7tHQf4zuXBJusP5W62eC9rXmjJEr+G5jACNxxHMajidZbPDUc1T8rgFOYHCfPRE6yGs7AYDcuUYDAHBiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIhclh5ASc+e3pQeAgCcDSsNAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABC5mM1mpccAAJwBKw0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEPkX6ZGpqRoa7G8AAAAASUVORK5CYII=" height="200" width="700"/> @@ -3125,7 +3125,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Unknown - Unknown - (xx-xx) </td> + Unknown (xx) </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 8 </td> @@ -3148,7 +3148,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - French - France - (fr-fr) </td> + French (fr) </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 54e901963e..e5a35d3ce0 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -3023,7 +3023,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Unknown - Unknown - (xx-xx) </td> + Unknown (xx) </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 8 </td> @@ -3046,7 +3046,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - French - France - (fr-fr) </td> + French (fr) </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf Binary files differindex 669c35854d..5fecafa369 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index c979c85ac9..a9d7c9042f 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -128,8 +128,8 @@ French,1,4,100%,4,00:12:01,0% Language code label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Polish - Poland - (pl-pl),4,12,75%,3,00:25:32,25% -French - France - (fr-fr),1,4,100%,4,00:12:01,0% +Polish (pl),4,12,75%,3,00:25:32,25% +French (fr),1,4,100%,4,00:12:01,0% Ecommerce Orders nb_conversions,nb_visits_converted,conversion_rate,revenue,revenue_subtotal,revenue_tax,revenue_shipping,revenue_discount,items,avg_order_revenue diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 1b3b8570ff..1afd49dd9c 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -2835,7 +2835,7 @@ </h2> <img alt="" - src="data:image/png;base64,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" + src="data:image/png;base64,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" height="200" width="700"/> @@ -2870,7 +2870,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Polish - Poland - (pl-pl) </td> + Polish (pl) </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4 </td> @@ -2893,7 +2893,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - French - France - (fr-fr) </td> + French (fr) </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 </td> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index d7499fb9f1..e38b4495fc 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -2768,7 +2768,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Polish - Poland - (pl-pl) </td> + Polish (pl) </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4 </td> @@ -2791,7 +2791,7 @@ <tr style="background-color: rgb(249,250,250)"> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - French - France - (fr-fr) </td> + French (fr) </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 </td> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex 945828c8a9..0bb4a30c17 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf |