diff --git a/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml b/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml
index 56bd97f797dc984931960eb55a5a0fb5873f84e3..edc1bd40ffbb221a650009e23e2edb633604c786 100644
--- a/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml
+++ b/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml
@@ -4,6 +4,7 @@
<prettyDate>January 1 – March 10, 2010</prettyDate>
<metadata>
<category>Referrers</category>
+ <subcategory>All Referrers</subcategory>
<name>Referrer Type</name>
<module>Referrers</module>
<action>getReferrerType</action>
diff --git a/plugins/Widgetize/tests/System/WidgetTest.php b/plugins/Widgetize/tests/System/WidgetTest.php
index 2425ed3c9a895633f25449ade468c3224870790d..005491630aa17f7ed62f0a769d0037ca94b0c6d5 100644
--- a/plugins/Widgetize/tests/System/WidgetTest.php
+++ b/plugins/Widgetize/tests/System/WidgetTest.php
@@ -266,11 +266,11 @@ class WidgetTest extends SystemTestCase
),
),array (
'name' => 'Visitor Log',
- 'uniqueId' => 'widgetLivegetLastVisitsDetailsforceView1viewDataTablePiwik%5CPlugins%5CLive%5CVisitorLogsmall1',
+ 'uniqueId' => 'widgetLivegetLastVisitsDetailsforceView1viewDataTableVisitorLogsmall1',
'parameters' =>
array (
'forceView' => 1,
- 'viewDataTable' => 'Piwik\\Plugins\\Live\\VisitorLog',
+ 'viewDataTable' => 'VisitorLog',
'module' => 'Live',
'action' => 'getLastVisitsDetails',
'small' => 1,
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 80f33ae6678eeb097c75590a56b8cf26f021ae7b..9ffc2e6e9e94ff8aa7cfb6432cab27d86e97f555 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
@@ -61,11 +61,11 @@
<reportMetadata>
<row>
- <idsubdatatable>2722</idsubdatatable>
+ <idsubdatatable>2688</idsubdatatable>
</row>
<row>
- <idsubdatatable>2721</idsubdatatable>
+ <idsubdatatable>2687</idsubdatatable>
</row>
</reportMetadata>
<reportTotal>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
index 4e2a2ee8649fc7e0cbbde1f09b47104ed5abbfe4..3391cb25979d2b0d7488e68dc64ff5e816bf9402 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Actions.getPageTitles_firstSite_lastN__API.getProcessedReport_day.xml
@@ -242,4 +242,4 @@
<exit_nb_visits>7</exit_nb_visits>
<exit_nb_uniq_visitors>2</exit_nb_uniq_visitors>
</reportTotal>
-</result>
+</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
index 488d220297addfbe16f7af26bee02318a06261e1..50478b59fc740099526c50a73e757c3669f65b1f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml
@@ -116,14 +116,14 @@
<row>
<segment>referrerName==referrer.com</segment>
- <idsubdatatable>17099</idsubdatatable>
+ <idsubdatatable>1907</idsubdatatable>
</row>
</result>
<result prettyDate="Monday, January 4, 2010">
<row>
<segment>referrerName==referrer.com</segment>
- <idsubdatatable>17101</idsubdatatable>
+ <idsubdatatable>1909</idsubdatatable>
</row>
</result>
<result prettyDate="Tuesday, January 5, 2010" />
@@ -133,14 +133,14 @@
<row>
<segment>referrerName==referrer.com</segment>
- <idsubdatatable>17106</idsubdatatable>
+ <idsubdatatable>1914</idsubdatatable>
</row>
</result>
<result prettyDate="Saturday, January 9, 2010">
<row>
<segment>referrerName==referrer.com</segment>
- <idsubdatatable>17108</idsubdatatable>
+ <idsubdatatable>1916</idsubdatatable>
</row>
</result>
</reportMetadata>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index 8d071ce80afdcbb61ea41c3520164b2c8982f69a..f0e58ae957ecb313d5b2de2d785c29accbf0267a 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -103,10 +103,6 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site
Unknown (xx),8,40,0%,5,00:15:01,0%
French (fr),3,3,0%,1,00:00:00,100%
-Provider
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,11,43,0%,3.9,00:10:55,27%
-
Length of Visits
label,nb_visits
0-10s,3
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 6808cc596eba4410b29139ce1d7948639342cb49..3ffd998150087c59b748bb8289cd7ea0dcbd10cc 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -119,11 +119,6 @@
<a href="#UserLanguage_getLanguageCode" style="text-decoration:none; color: rgb(13,13,13);">
Language code
</a>
- </li>
- <li>
- <a href="#Provider_getProvider" style="text-decoration:none; color: rgb(13,13,13);">
- Provider
- </a>
</li>
<li>
<a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: rgb(13,13,13);">
@@ -2023,68 +2018,6 @@
<a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="Provider_getProvider" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
- Provider
-</h2>
-
-
-
- <table style="border-collapse:collapse; margin-left: 5px;">
- <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Provider
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Visits
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Actions
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Actions per Visit
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Avg. Time on Website
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Bounce Rate
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Conversion Rate
- </th>
- </thead>
- <tbody>
-
- <tr style="background-color: rgb(242,242,242);line-height: 22px;">
- <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- <a style="color: rgb(13,13,13);" href='http://'>
- Unknown </a>
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 11
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 43
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 3.9
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:10:55
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 27%
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
- </td>
- </tr>
- </tbody>
- </table>
- <br/>
- <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
- Back to top
- </a>
<h2 id="VisitorInterest_getNumberOfVisitsPerVisitDuration" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
Length of Visits
</h2>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml
index 79e489aa71807038f053563254d998664465cfc9..2bb327912b663bb819f6ab968f77f8c16772a554 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <name>% Search Exits (Site Search)</name>
+ <name>% Search Exits (Actions)</name>
<id>exit_rate</id>
<documentation>The percentage of visits that left the website after searching for this Keyword on your Site Search engine.</documentation>
</row>
@@ -16,7 +16,7 @@
<documentation>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</documentation>
</row>
<row>
- <name>Avg. Time on Website</name>
+ <name>Avg. Visit Duration (in seconds)</name>
<id>avg_time_on_site</id>
<documentation>The average duration of a visit.</documentation>
</row>
@@ -111,7 +111,7 @@
<documentation>The number of visits that searched for this keyword on your website's search engine.</documentation>
</row>
<row>
- <name>Searches (Site Search)</name>
+ <name>Searches (Actions)</name>
<id>nb_visits</id>
<documentation>The number of visits that searched for this keyword on your website's search engine.</documentation>
</row>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
index 5b802dbc6ce903b00ac16fb63b5f71977c3aa0f3..190aeeea80c9e407dd6d32fdb53c315a6ce4fe38 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
@@ -5,13 +5,17 @@
<documentation>This report shows all your Referrers in one unified report, listing all Websites, Search keywords and Campaigns used by your visitors to find your website.</documentation>
</row>
<row>
- <name>Browser Plugins (Visitor Settings)</name>
+ <name>Browser Plugins (Visitors)</name>
<documentation>This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content.</documentation>
</row>
<row>
- <name>Browser engines (Visitor Devices)</name>
+ <name>Browser engines (Visitors)</name>
<documentation>This report shows your visitors' browsers broken down into browser engines. <br /> The most important information for web developers is what kind of rendering engine their visitors are using. The labels contain the names of the engines followed by the most common browser using that engine in brackets.</documentation>
</row>
+ <row>
+ <name>Browsers (Visitors)</name>
+ <documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
+ </row>
<row>
<name>Campaigns (Referrers)</name>
<documentation>This report shows which campaigns led visitors to your website. <br /> For more information about tracking campaigns, read the <a href="http://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">campaigns documentation on piwik.org</a></documentation>
@@ -20,6 +24,10 @@
<name>City (Visitors)</name>
<documentation>This report shows the cities your visitors were in when they accessed your website.<br/>In order to see data for this report, you must setup GeoIP in the Geolocation admin tab. The commercial <a rel="noreferrer" target="_blank" href="http://www.maxmind.com/?rId=piwik">Maxmind</a> GeoIP databases are more accurate than the free ones. To see how accurate they are, click <a rel="noreferrer" target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">here</a>.</documentation>
</row>
+ <row>
+ <name>Configurations (Visitors)</name>
+ <documentation>This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.</documentation>
+ </row>
<row>
<name>Continent (Visitors)</name>
<documentation>This report shows which continent your visitors were in when they accessed your website.</documentation>
@@ -65,7 +73,7 @@
<documentation>This report shows a hierarchical list of outlink URLs that were clicked by your visitors. An outlink is a link that leads the visitor away from your website (to another domain).<br />Use the plus and minus icons on the left to navigate.</documentation>
</row>
<row>
- <name>Page Titles Following a Site Search (Site Search)</name>
+ <name>Page Titles Following a Site Search (Actions)</name>
<documentation>When visitors search on your website, they are looking for a particular page, content, product, or service. This report lists the pages that were clicked the most after an internal search. In other words, the list of pages the most searched for by visitors already on your website.<br/>Use the plus and minus icons on the left to navigate.</documentation>
</row>
<row>
@@ -77,7 +85,7 @@
<documentation>This report contains information about the titles of the pages that have been visited. <br /> The page title is the HTML <title> Tag that most browsers show in their window title.</documentation>
</row>
<row>
- <name>Pages Following a Site Search (Site Search)</name>
+ <name>Pages Following a Site Search (Actions)</name>
<documentation>When visitors search on your website, they are looking for a particular page, content, product, or service. This report lists the pages that were clicked the most after an internal search. In other words, the list of pages the most searched for by visitors already on your website.<br/>Use the plus and minus icons on the left to navigate.</documentation>
</row>
<row>
@@ -93,7 +101,7 @@
<documentation>This report shows which region your visitors were in when they accessed your website.<br/>In order to see data for this report, you must setup GeoIP in the Geolocation admin tab. The commercial <a rel="noreferrer" target="_blank" href="http://www.maxmind.com/?rId=piwik">Maxmind</a> GeoIP databases are more accurate than the free ones. To see how accurate they are, click <a rel="noreferrer" target="_blank" href="http://www.maxmind.com/en/city_accuracy?rId=piwik">here</a>.</documentation>
</row>
<row>
- <name>Search Categories (Site Search)</name>
+ <name>Search Categories (Actions)</name>
<documentation>This report lists the Categories that visitors selected when they made a Search on your website.<br/>For example, Ecommerce websites typically have a "Category" selector so that visitors can restrict their searches to all products in a specific Category.</documentation>
</row>
<row>
@@ -101,11 +109,11 @@
<documentation>This report shows which search engines referred users to your website. <br /> By clicking on a row in the table, you can see what users were searching for using a specific search engine.</documentation>
</row>
<row>
- <name>Search Keywords with No Results (Site Search)</name>
+ <name>Search Keywords with No Results (Actions)</name>
<documentation>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br /><br />This report lists the Search Keywords that did not return any Search result: maybe the search engine algorithm can be improved, or maybe your visitors are looking for content that is not (yet) on your website?</documentation>
</row>
<row>
- <name>Site Search Keywords (Site Search)</name>
+ <name>Site Search Keywords (Actions)</name>
<documentation>This report lists the Search Keywords that visitors searched for on your internal Search Engine.<br/><br/>Tracking searches that visitors make on your website is a very effective way to learn more about what your audience is looking for, it can help find ideas for new content, new Ecommerce products that potential customers might be searching for, and generally improve the visitors' experience on your website.<br/><br/><a href="http://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">Learn more about Tracking how your visitors use your Search engine.</a></documentation>
</row>
<row>
@@ -113,33 +121,25 @@
<documentation>In this table, you can see which websites referred visitors to your site. <br /> By clicking on a row in the table, you can see which URLs the links to your website were on.</documentation>
</row>
<row>
- <name>Visitor Browser (Visitor Devices)</name>
- <documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation>
+ <name>Visits by Day of Week (Visitors)</name>
+ <documentation>This graph shows the number of visits your website received on each day of the week.</documentation>
</row>
<row>
- <name>Visitor Configuration (Visitor Settings)</name>
- <documentation>This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.</documentation>
+ <name>Visits by Visit Number (Visitors)</name>
+ <documentation>In this report, you can see the number of visits who were the Nth visit, ie. visitors who visited your website at least N times.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation>
</row>
<row>
- <name>Visits by Day of Week (Visits Summary)</name>
- <documentation>This graph shows the number of visits your website received on each day of the week.</documentation>
+ <name>Visits by days since last visit (Visitors)</name>
+ <documentation>In this report, you can see how many visits were from visitors whose last visit was a certain number of days ago.</documentation>
</row>
<row>
- <name>Visits by Local Time (Visits Summary)</name>
+ <name>Visits per local time (Visitors)</name>
<documentation>This graph shows what time it was in the <strong> visitors' time zones </strong> during their visits.</documentation>
</row>
<row>
- <name>Visits by Server Time (Visits Summary)</name>
+ <name>Visits per server time (Visitors)</name>
<documentation>This graph shows what time it was in the <strong> server's time zone </strong> during the visits.</documentation>
</row>
- <row>
- <name>Visits by Visit Number (Visitors)</name>
- <documentation>In this report, you can see the number of visits who were the Nth visit, ie. visitors who visited your website at least N times.<br />Please note, that you can view the report in other ways than as a tag cloud. Use the controls at the bottom of the report to do so.</documentation>
- </row>
- <row>
- <name>Visits by days since last visit (Visitors)</name>
- <documentation>In this report, you can see how many visits were from visitors whose last visit was a certain number of days ago.</documentation>
- </row>
<row>
<name>Websites (Referrers)</name>
<documentation>In this table, you can see which websites referred visitors to your site. <br /> By clicking on a row in the table, you can see which URLs the links to your website were on.</documentation>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index 75cc04d44b3a38b667764405b0b572a81d5aac99..700c9c5d342ffae3e10cf105b57866ad0fd2692f 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -766,40 +766,6 @@
<imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserLanguage&apiAction=getLanguageCode&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
<uniqueId>UserLanguage_getLanguageCode</uniqueId>
</row>
- <row>
- <category>Visitors</category>
- <subcategory>Locations</subcategory>
- <name>Provider</name>
- <module>Provider</module>
- <action>getProvider</action>
- <dimension>Provider</dimension>
- <documentation>This report shows which Internet Service Providers your visitors used to access the website. You can click on a provider name for more details. <br /> If Piwik can't determine a visitor's provider, it is listed as IP.</documentation>
- <metrics>
- <nb_visits>Visits</nb_visits>
- <nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
- <nb_actions>Actions</nb_actions>
- <nb_users>Users</nb_users>
- </metrics>
- <metricsDocumentation>
- <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits>
- <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors>
- <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
- <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
- <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <avg_time_on_site>The average duration of a visit.</avg_time_on_site>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
- <conversion_rate>The percentage of visits that triggered a goal conversion.</conversion_rate>
- </metricsDocumentation>
- <processedMetrics>
- <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
- <avg_time_on_site>Avg. Time on Website</avg_time_on_site>
- <bounce_rate>Bounce Rate</bounce_rate>
- <conversion_rate>Conversion Rate</conversion_rate>
- </processedMetrics>
- <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Provider&apiAction=getProvider&period=day&date=2009-01-04</imageGraphUrl>
- <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Provider&apiAction=getProvider&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl>
- <uniqueId>Provider_getProvider</uniqueId>
- </row>
<row>
<category>Visitors</category>
<subcategory>Engagement</subcategory>
@@ -1501,7 +1467,7 @@
<metricsDocumentation>
<entry_nb_visits>Number of visits that started on this page.</entry_nb_visits>
<entry_bounce_count>Number of visits that started and ended on this page. This means that the visitor left the website after viewing only this page.</entry_bounce_count>
- <bounce_rate>Percentage of visits that started and ended on this page.</bounce_rate>
+ <bounce_rate>The percentage of visits that started on this page and left the website straight away.</bounce_rate>
<avg_time_generation>The average time it took to generate the page. This metric includes the time it took the server to generate the web page, plus the time it took for the visitor to download the response from the server. A lower 'Avg. generation time' means a faster website for your visitors!</avg_time_generation>
</metricsDocumentation>
<processedMetrics>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
index efd59d9e85e16b840ffa280c77b7fc7f9564bf3e..44418ed36f87dc08eebf08bcdd119b28b6048f8a 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportPagesMetadata.xml
@@ -897,19 +897,6 @@
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
- <row>
- <name>Providers</name>
- <module>Provider</module>
- <action>getProvider</action>
- <order>150</order>
- <parameters>
- <module>Provider</module>
- <action>getProvider</action>
- </parameters>
- <uniqueId>widgetProvidergetProvider</uniqueId>
- <viewDataTable>table</viewDataTable>
- <isReport>1</isReport>
- </row>
</widgets>
</row>
<row>
@@ -1015,13 +1002,13 @@
<order>10</order>
<parameters>
<forceView>1</forceView>
- <viewDataTable>Piwik\Plugins\Live\VisitorLog</viewDataTable>
+ <viewDataTable>VisitorLog</viewDataTable>
<module>Live</module>
<action>getLastVisitsDetails</action>
<small>1</small>
</parameters>
- <uniqueId>widgetLivegetLastVisitsDetailsforceView1viewDataTablePiwik%5CPlugins%5CLive%5CVisitorLogsmall1</uniqueId>
- <viewDataTable>Piwik\Plugins\Live\VisitorLog</viewDataTable>
+ <uniqueId>widgetLivegetLastVisitsDetailsforceView1viewDataTableVisitorLogsmall1</uniqueId>
+ <viewDataTable>VisitorLog</viewDataTable>
<isReport>1</isReport>
</row>
</widgets>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
index 5ac9f04dd75145749b97eb04e3be5282a2ae410b..b5424bf029715e4952845e67423b5ae1a8f0b8b6 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getWidgetMetadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
- <name>Real Time Visitor Count</name>
+ <name>Visitors in Real-time</name>
<category>
<id>Live!</id>
<name>Live!</name>
@@ -9,18 +9,16 @@
</category>
<subcategory />
<module>Live</module>
- <action>getSimpleLastVisitCount</action>
- <order>15</order>
+ <action>widget</action>
+ <order>20</order>
<parameters>
<module>Live</module>
- <action>getSimpleLastVisitCount</action>
+ <action>widget</action>
</parameters>
- <uniqueId>widgetLivegetSimpleLastVisitCount</uniqueId>
- <viewDataTable>table</viewDataTable>
- <isReport>1</isReport>
+ <uniqueId>widgetLivewidget</uniqueId>
</row>
<row>
- <name>Visitors in Real-time</name>
+ <name>Real Time Visitor Count</name>
<category>
<id>Live!</id>
<name>Live!</name>
@@ -28,16 +26,18 @@
</category>
<subcategory />
<module>Live</module>
- <action>widget</action>
- <order>20</order>
+ <action>getSimpleLastVisitCount</action>
+ <order>15</order>
<parameters>
<module>Live</module>
- <action>widget</action>
+ <action>getSimpleLastVisitCount</action>
</parameters>
- <uniqueId>widgetLivewidget</uniqueId>
+ <uniqueId>widgetLivegetSimpleLastVisitCount</uniqueId>
+ <viewDataTable>table</viewDataTable>
+ <isReport>1</isReport>
</row>
<row>
- <name>Visits Overview</name>
+ <name>Visits Over Time</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -49,20 +49,20 @@
<order>2</order>
</subcategory>
<module>VisitsSummary</module>
- <action>get</action>
- <order>10</order>
+ <action>getEvolutionGraph</action>
+ <order>5</order>
<parameters>
<forceView>1</forceView>
- <viewDataTable>sparklines</viewDataTable>
+ <viewDataTable>graphEvolution</viewDataTable>
<module>VisitsSummary</module>
- <action>get</action>
+ <action>getEvolutionGraph</action>
</parameters>
- <uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
- <viewDataTable>sparklines</viewDataTable>
+ <uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+ <viewDataTable>graphEvolution</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Visits Over Time</name>
+ <name>Visits Overview</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -74,16 +74,16 @@
<order>2</order>
</subcategory>
<module>VisitsSummary</module>
- <action>getEvolutionGraph</action>
- <order>5</order>
+ <action>get</action>
+ <order>10</order>
<parameters>
<forceView>1</forceView>
- <viewDataTable>graphEvolution</viewDataTable>
+ <viewDataTable>sparklines</viewDataTable>
<module>VisitsSummary</module>
- <action>getEvolutionGraph</action>
+ <action>get</action>
</parameters>
- <uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
- <viewDataTable>graphEvolution</viewDataTable>
+ <uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
+ <viewDataTable>sparklines</viewDataTable>
<isReport>1</isReport>
</row>
<row>
@@ -103,13 +103,13 @@
<order>10</order>
<parameters>
<forceView>1</forceView>
- <viewDataTable>Piwik\Plugins\Live\VisitorLog</viewDataTable>
+ <viewDataTable>VisitorLog</viewDataTable>
<module>Live</module>
<action>getLastVisitsDetails</action>
<small>1</small>
</parameters>
- <uniqueId>widgetLivegetLastVisitsDetailsforceView1viewDataTablePiwik%5CPlugins%5CLive%5CVisitorLogsmall1</uniqueId>
- <viewDataTable>Piwik\Plugins\Live\VisitorLog</viewDataTable>
+ <uniqueId>widgetLivegetLastVisitsDetailsforceView1viewDataTableVisitorLogsmall1</uniqueId>
+ <viewDataTable>VisitorLog</viewDataTable>
<isReport>1</isReport>
</row>
<row>
@@ -159,7 +159,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Device type</name>
+ <name>Device brand</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -171,18 +171,18 @@
<order>15</order>
</subcategory>
<module>DevicesDetection</module>
- <action>getType</action>
- <order>100</order>
+ <action>getBrand</action>
+ <order>104</order>
<parameters>
<module>DevicesDetection</module>
- <action>getType</action>
+ <action>getBrand</action>
</parameters>
- <uniqueId>widgetDevicesDetectiongetType</uniqueId>
+ <uniqueId>widgetDevicesDetectiongetBrand</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Device brand</name>
+ <name>Device type</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -194,13 +194,13 @@
<order>15</order>
</subcategory>
<module>DevicesDetection</module>
- <action>getBrand</action>
- <order>104</order>
+ <action>getType</action>
+ <order>100</order>
<parameters>
<module>DevicesDetection</module>
- <action>getBrand</action>
+ <action>getType</action>
</parameters>
- <uniqueId>widgetDevicesDetectiongetBrand</uniqueId>
+ <uniqueId>widgetDevicesDetectiongetType</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -228,7 +228,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Browsers</name>
+ <name>Operating System versions</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -240,18 +240,18 @@
<order>20</order>
</subcategory>
<module>DevicesDetection</module>
- <action>getBrowsers</action>
- <order>105</order>
+ <action>getOsVersions</action>
+ <order>102</order>
<parameters>
<module>DevicesDetection</module>
- <action>getBrowsers</action>
+ <action>getOsVersions</action>
</parameters>
- <uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId>
+ <uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Operating System versions</name>
+ <name>Browsers</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -263,18 +263,18 @@
<order>20</order>
</subcategory>
<module>DevicesDetection</module>
- <action>getOsVersions</action>
- <order>102</order>
+ <action>getBrowsers</action>
+ <order>105</order>
<parameters>
<module>DevicesDetection</module>
- <action>getOsVersions</action>
+ <action>getBrowsers</action>
</parameters>
- <uniqueId>widgetDevicesDetectiongetOsVersions</uniqueId>
+ <uniqueId>widgetDevicesDetectiongetBrowsers</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Browser version</name>
+ <name>Operating System families</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -286,13 +286,13 @@
<order>20</order>
</subcategory>
<module>DevicesDetection</module>
- <action>getBrowserVersions</action>
- <order>106</order>
+ <action>getOsFamilies</action>
+ <order>108</order>
<parameters>
<module>DevicesDetection</module>
- <action>getBrowserVersions</action>
+ <action>getOsFamilies</action>
</parameters>
- <uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId>
+ <uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -320,7 +320,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Operating System families</name>
+ <name>Configurations</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -331,14 +331,14 @@
<name>Software</name>
<order>20</order>
</subcategory>
- <module>DevicesDetection</module>
- <action>getOsFamilies</action>
- <order>108</order>
+ <module>Resolution</module>
+ <action>getConfiguration</action>
+ <order>107</order>
<parameters>
- <module>DevicesDetection</module>
- <action>getOsFamilies</action>
+ <module>Resolution</module>
+ <action>getConfiguration</action>
</parameters>
- <uniqueId>widgetDevicesDetectiongetOsFamilies</uniqueId>
+ <uniqueId>widgetResolutiongetConfiguration</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -367,7 +367,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Configurations</name>
+ <name>Browser version</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -378,19 +378,91 @@
<name>Software</name>
<order>20</order>
</subcategory>
- <module>Resolution</module>
- <action>getConfiguration</action>
- <order>107</order>
+ <module>DevicesDetection</module>
+ <action>getBrowserVersions</action>
+ <order>106</order>
<parameters>
- <module>Resolution</module>
- <action>getConfiguration</action>
+ <module>DevicesDetection</module>
+ <action>getBrowserVersions</action>
</parameters>
- <uniqueId>widgetResolutiongetConfiguration</uniqueId>
+ <uniqueId>widgetDevicesDetectiongetBrowserVersions</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Language code</name>
+ <name>Visits Overview (with graph)</name>
+ <category>
+ <id>General_Visitors</id>
+ <name>Visitors</name>
+ <order>5</order>
+ </category>
+ <subcategory />
+ <module>CoreHome</module>
+ <action>renderWidgetContainer</action>
+ <order>99</order>
+ <parameters>
+ <module>CoreHome</module>
+ <action>renderWidgetContainer</action>
+ <containerId>VisitOverviewWithGraph</containerId>
+ </parameters>
+ <uniqueId>widgetVisitOverviewWithGraph</uniqueId>
+ <layout />
+ <isContainer>1</isContainer>
+ <widgets>
+ <row>
+ <name>Visits Over Time</name>
+ <category>
+ <id>General_Visitors</id>
+ <name>Visitors</name>
+ <order>99</order>
+ </category>
+ <subcategory>
+ <id>General_Overview</id>
+ <name>Overview</name>
+ <order>99</order>
+ </subcategory>
+ <module>VisitsSummary</module>
+ <action>getEvolutionGraph</action>
+ <order>5</order>
+ <parameters>
+ <forceView>1</forceView>
+ <viewDataTable>graphEvolution</viewDataTable>
+ <module>VisitsSummary</module>
+ <action>getEvolutionGraph</action>
+ </parameters>
+ <uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+ <viewDataTable>graphEvolution</viewDataTable>
+ <isReport>1</isReport>
+ </row>
+ <row>
+ <name>Visits Overview</name>
+ <category>
+ <id>General_Visitors</id>
+ <name>Visitors</name>
+ <order>99</order>
+ </category>
+ <subcategory>
+ <id>General_Overview</id>
+ <name>Overview</name>
+ <order>99</order>
+ </subcategory>
+ <module>VisitsSummary</module>
+ <action>get</action>
+ <order>10</order>
+ <parameters>
+ <forceView>1</forceView>
+ <viewDataTable>sparklines</viewDataTable>
+ <module>VisitsSummary</module>
+ <action>get</action>
+ </parameters>
+ <uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
+ <viewDataTable>sparklines</viewDataTable>
+ <isReport>1</isReport>
+ </row>
+ </widgets>
+ </row>
+ <row>
+ <name>City</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -401,19 +473,19 @@
<name>Locations</name>
<order>25</order>
</subcategory>
- <module>UserLanguage</module>
- <action>getLanguageCode</action>
- <order>111</order>
+ <module>UserCountry</module>
+ <action>getCity</action>
+ <order>110</order>
<parameters>
- <module>UserLanguage</module>
- <action>getLanguageCode</action>
+ <module>UserCountry</module>
+ <action>getCity</action>
</parameters>
- <uniqueId>widgetUserLanguagegetLanguageCode</uniqueId>
+ <uniqueId>widgetUserCountrygetCity</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Providers</name>
+ <name>Language code</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -424,19 +496,19 @@
<name>Locations</name>
<order>25</order>
</subcategory>
- <module>Provider</module>
- <action>getProvider</action>
- <order>150</order>
+ <module>UserLanguage</module>
+ <action>getLanguageCode</action>
+ <order>111</order>
<parameters>
- <module>Provider</module>
- <action>getProvider</action>
+ <module>UserLanguage</module>
+ <action>getLanguageCode</action>
</parameters>
- <uniqueId>widgetProvidergetProvider</uniqueId>
+ <uniqueId>widgetUserLanguagegetLanguageCode</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>City</name>
+ <name>Browser language</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -447,14 +519,14 @@
<name>Locations</name>
<order>25</order>
</subcategory>
- <module>UserCountry</module>
- <action>getCity</action>
- <order>110</order>
+ <module>UserLanguage</module>
+ <action>getLanguage</action>
+ <order>108</order>
<parameters>
- <module>UserCountry</module>
- <action>getCity</action>
+ <module>UserLanguage</module>
+ <action>getLanguage</action>
</parameters>
- <uniqueId>widgetUserCountrygetCity</uniqueId>
+ <uniqueId>widgetUserLanguagegetLanguage</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
@@ -526,7 +598,7 @@
<isReport>1</isReport>
</row>
<row>
- <name>Browser language</name>
+ <name>Country</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
@@ -537,110 +609,64 @@
<name>Locations</name>
<order>25</order>
</subcategory>
- <module>UserLanguage</module>
- <action>getLanguage</action>
- <order>108</order>
+ <module>UserCountry</module>
+ <action>getCountry</action>
+ <order>105</order>
<parameters>
- <module>UserLanguage</module>
- <action>getLanguage</action>
+ <module>UserCountry</module>
+ <action>getCountry</action>
</parameters>
- <uniqueId>widgetUserLanguagegetLanguage</uniqueId>
+ <uniqueId>widgetUserCountrygetCountry</uniqueId>
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
<row>
- <name>Visits Overview (with graph)</name>
+ <name>Returning Visits Over Time</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
<order>5</order>
</category>
- <subcategory />
- <module>CoreHome</module>
- <action>renderWidgetContainer</action>
- <order>99</order>
+ <subcategory>
+ <id>VisitorInterest_Engagement</id>
+ <name>Engagement</name>
+ <order>30</order>
+ </subcategory>
+ <module>VisitFrequency</module>
+ <action>getEvolutionGraph</action>
+ <order>1</order>
<parameters>
- <module>CoreHome</module>
- <action>renderWidgetContainer</action>
- <containerId>VisitOverviewWithGraph</containerId>
+ <forceView>1</forceView>
+ <viewDataTable>graphEvolution</viewDataTable>
+ <module>VisitFrequency</module>
+ <action>getEvolutionGraph</action>
</parameters>
- <uniqueId>widgetVisitOverviewWithGraph</uniqueId>
- <layout />
- <isContainer>1</isContainer>
- <widgets>
- <row>
- <name>Visits Over Time</name>
- <category>
- <id>General_Visitors</id>
- <name>Visitors</name>
- <order>99</order>
- </category>
- <subcategory>
- <id>General_Overview</id>
- <name>Overview</name>
- <order>99</order>
- </subcategory>
- <module>VisitsSummary</module>
- <action>getEvolutionGraph</action>
- <order>5</order>
- <parameters>
- <forceView>1</forceView>
- <viewDataTable>graphEvolution</viewDataTable>
- <module>VisitsSummary</module>
- <action>getEvolutionGraph</action>
- </parameters>
- <uniqueId>widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
- <viewDataTable>graphEvolution</viewDataTable>
- <isReport>1</isReport>
- </row>
- <row>
- <name>Visits Overview</name>
- <category>
- <id>General_Visitors</id>
- <name>Visitors</name>
- <order>99</order>
- </category>
- <subcategory>
- <id>General_Overview</id>
- <name>Overview</name>
- <order>99</order>
- </subcategory>
- <module>VisitsSummary</module>
- <action>get</action>
- <order>10</order>
- <parameters>
- <forceView>1</forceView>
- <viewDataTable>sparklines</viewDataTable>
- <module>VisitsSummary</module>
- <action>get</action>
- </parameters>
- <uniqueId>widgetVisitsSummarygetforceView1viewDataTablesparklines</uniqueId>
- <viewDataTable>sparklines</viewDataTable>
- <isReport>1</isReport>
- </row>
- </widgets>
+ <uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
+ <viewDataTable>graphEvolution</viewDataTable>
+ <isReport>1</isReport>
</row>
<row>
- <name>Country</name>
+ <name>Visits per number of pages</name>
<category>
<id>General_Visitors</id>
<name>Visitors</name>
<order>5</order>
</category>
<subcategory>
- <id>UserCountry_SubmenuLocations</id>
- <name>Locations</name>
- <order>25</order>
+ <id>VisitorInterest_Engagement</id>
+ <name>Engagement</name>
+ <order>30</order>
</subcategory>
- <module>UserCountry</module>
- <action>getCountry</action>
- <order>105</order>
+ <module>VisitorInterest</module>
+ <action>getNumberOfVisitsPerPage</action>
+ <order>120</order>
<parameters>
- <module>UserCountry</module>
- <action>getCountry</action>
+ <viewDataTable>cloud</viewDataTable>
+ <module>VisitorInterest</module>
+ <action>getNumberOfVisitsPerPage</action>
</parameters>
- <uniqueId>widgetUserCountrygetCountry</uniqueId>
- <viewDataTable>table</viewDataTable>
+ <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPageviewDataTablecloud</uniqueId>
+ <viewDataTable>cloud</viewDataTable>
<isReport>1</isReport>
</row>
<row>
@@ -706,55 +732,6 @@
<viewDataTable>table</viewDataTable>
<isReport>1</isReport>
</row>
- <row>
- <name>Visits per number of pages</name>
- <category>
- <id>General_Visitors</id>
- <name>Visitors</name>
- <order>5</order>
- </category>
- <subcategory>
- <id>VisitorInterest_Engagement</id>
- <name>Engagement</name>
- <order>30</order>
- </subcategory>
- <module>VisitorInterest</module>
- <action>getNumberOfVisitsPerPage</action>
- <order>120</order>
- <parameters>
- <viewDataTable>cloud</viewDataTable>
- <module>VisitorInterest</module>
- <action>getNumberOfVisitsPerPage</action>
- </parameters>
- <uniqueId>widgetVisitorInterestgetNumberOfVisitsPerPageviewDataTablecloud</uniqueId>
- <viewDataTable>cloud</viewDataTable>
- <isReport>1</isReport>
- </row>
- <row>
- <name>Returning Visits Over Time</name>
- <category>
- <id>General_Visitors</id>
- <name>Visitors</name>
- <order>5</order>
- </category>
- <subcategory>
- <id>VisitorInterest_Engagement</id>
- <name>Engagement</name>
- <order>30</order>
- </subcategory>
- <module>VisitFrequency</module>
- <action>getEvolutionGraph</action>
- <order>1</order>
- <parameters>
- <forceView>1</forceView>
- <viewDataTable>graphEvolution</viewDataTable>
- <module>VisitFrequency</module>
- <action>getEvolutionGraph</action>
- </parameters>
- <uniqueId>widgetVisitFrequencygetEvolutionGraphforceView1viewDataTablegraphEvolution</uniqueId>
- <viewDataTable>graphEvolution</viewDataTable>
- <isReport>1</isReport>
- </row>
<row>
<name>Frequency Overview</name>
<category>
@@ -2556,7 +2533,7 @@
<uniqueId>widgetReferrersgetKeywordsForPage</uniqueId>
</row>
<row>
- <name>Movers and Shakers</name>
+ <name>Insights Overview</name>
<category>
<id>Insights_WidgetCategory</id>
<name>Insights</name>
@@ -2564,13 +2541,13 @@
</category>
<subcategory />
<module>Insights</module>
- <action>getOverallMoversAndShakers</action>
+ <action>getInsightsOverview</action>
<order>99</order>
<parameters>
<module>Insights</module>
- <action>getOverallMoversAndShakers</action>
+ <action>getInsightsOverview</action>
</parameters>
- <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
+ <uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
</row>
<row>
<name>Example Widget Name</name>
@@ -2590,21 +2567,21 @@
<uniqueId>widgetExamplePluginmyExampleWidget</uniqueId>
</row>
<row>
- <name>Piwik Changelog</name>
+ <name>Movers and Shakers</name>
<category>
- <id>Example Widgets</id>
- <name>Example Widgets</name>
+ <id>Insights_WidgetCategory</id>
+ <name>Insights</name>
<order>99</order>
</category>
<subcategory />
- <module>ExampleRssWidget</module>
- <action>rssChangelog</action>
+ <module>Insights</module>
+ <action>getOverallMoversAndShakers</action>
<order>99</order>
<parameters>
- <module>ExampleRssWidget</module>
- <action>rssChangelog</action>
+ <module>Insights</module>
+ <action>getOverallMoversAndShakers</action>
</parameters>
- <uniqueId>widgetExampleRssWidgetrssChangelog</uniqueId>
+ <uniqueId>widgetInsightsgetOverallMoversAndShakers</uniqueId>
</row>
<row>
<name>SEO Rankings</name>
@@ -2624,21 +2601,21 @@
<uniqueId>widgetSEOgetRank</uniqueId>
</row>
<row>
- <name>Insights Overview</name>
+ <name>Piwik Changelog</name>
<category>
- <id>Insights_WidgetCategory</id>
- <name>Insights</name>
+ <id>Example Widgets</id>
+ <name>Example Widgets</name>
<order>99</order>
</category>
<subcategory />
- <module>Insights</module>
- <action>getInsightsOverview</action>
+ <module>ExampleRssWidget</module>
+ <action>rssChangelog</action>
<order>99</order>
<parameters>
- <module>Insights</module>
- <action>getInsightsOverview</action>
+ <module>ExampleRssWidget</module>
+ <action>rssChangelog</action>
</parameters>
- <uniqueId>widgetInsightsgetInsightsOverview</uniqueId>
+ <uniqueId>widgetExampleRssWidgetrssChangelog</uniqueId>
</row>
<row>
<name>Welcome!</name>
diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv
index 867d8233008512fa91344db0ae852afecc7afb65..d04f027adf20bec445b0a9b95e8936255c6faff6 100644
Binary files a/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv and b/tests/PHPUnit/System/expected/test_csvExport_xp0__CustomVariables.getCustomVariables_day.csv differ
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml
index adf6066750a5ec9060be020273f80ff4e44759c7..4d8563a99e021bfeaa032f19c596523fd469c2e4 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml
@@ -31,20 +31,20 @@
<conversion_rate>0%</conversion_rate>
</row>
<row>
- <label>PRODUCT THREE LEFT in cart</label>
+ <label>PRODUCT TWO LEFT in cart</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>2</nb_visits>
- <nb_actions>4</nb_actions>
- <avg_price>666</avg_price>
+ <nb_actions>2</nb_actions>
+ <avg_price>0</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
<row>
- <label>PRODUCT TWO LEFT in cart</label>
+ <label>PRODUCT THREE LEFT in cart</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <avg_price>0</avg_price>
+ <nb_actions>4</nb_actions>
+ <avg_price>666</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml
index 735aff85e27070cb7be7c644849d8a71996d3fa6..b413464bdb76b03f7527a6b403cde1a59370fb43 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml
@@ -31,20 +31,20 @@
<conversion_rate>0%</conversion_rate>
</row>
<row>
- <label>PRODUCT THREE LEFT in cart</label>
+ <label>PRODUCT TWO LEFT in cart</label>
<nb_visits>3</nb_visits>
- <nb_actions>6</nb_actions>
+ <nb_actions>3</nb_actions>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>1332</avg_price>
+ <avg_price>0</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
<row>
- <label>PRODUCT TWO LEFT in cart</label>
+ <label>PRODUCT THREE LEFT in cart</label>
<nb_visits>3</nb_visits>
- <nb_actions>3</nb_actions>
+ <nb_actions>6</nb_actions>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
- <avg_price>0</avg_price>
+ <avg_price>1332</avg_price>
<avg_quantity>0</avg_quantity>
<conversion_rate>0%</conversion_rate>
</row>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index 16b2062830199fe6bd7055a4f4060361168078c2..50eeb9cc0e95af1d3b3eb4f64cfb52a97a4f78a8 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -93,10 +93,6 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site
Polish (pl),4,12,75%,3,00:25:32,25%
French (fr),1,4,100%,4,00:12:01,0%
-Provider
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Unknown,5,16,80%,3.2,00:22:49,20%
-
Length of Visits
label,nb_visits
0-10s,0
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 1a595b145bb017a46c57457c77ce0fbe6a8d41f9..f30d629c3dca824cd15cce6676aa50a1d9c708d1 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -119,11 +119,6 @@
<a href="#UserLanguage_getLanguageCode" style="text-decoration:none; color: rgb(13,13,13);">
Language code
</a>
- </li>
- <li>
- <a href="#Provider_getProvider" style="text-decoration:none; color: rgb(13,13,13);">
- Provider
- </a>
</li>
<li>
<a href="#VisitorInterest_getNumberOfVisitsPerVisitDuration" style="text-decoration:none; color: rgb(13,13,13);">
@@ -1871,68 +1866,6 @@
<a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="Provider_getProvider" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
- Provider
-</h2>
-
-
-
- <table style="border-collapse:collapse; margin-left: 5px;">
- <thead style="background-color: rgb(255,255,255); color: rgb(13,13,13); font-size: 11pt; text-transform: uppercase; line-height:2.5em;">
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Provider
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Visits
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Actions
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Actions per Visit
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Avg. Time on Website
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Bounce Rate
- </th>
- <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;">
- Conversion Rate
- </th>
- </thead>
- <tbody>
-
- <tr style="background-color: rgb(242,242,242);line-height: 22px;">
- <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- <a style="color: rgb(13,13,13);" href='http://'>
- Unknown </a>
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 5
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 16
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 3.2
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:22:49
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 20%
- </td>
- <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 80%
- </td>
- </tr>
- </tbody>
- </table>
- <br/>
- <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop">
- Back to top
- </a>
<h2 id="VisitorInterest_getNumberOfVisitsPerVisitDuration" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;">
Length of Visits
</h2>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
index d692d7d55199b3e19767bc1790ec3e9c9f56e979..595575819f453ed3a354311fcd71882044118909 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
@@ -23,6 +23,7 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -87,6 +88,7 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -127,6 +129,7 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -152,6 +155,7 @@
<row>
<label>Status user</label>
<nb_actions>3</nb_actions>
+ <segment>customVariableName==Status+user</segment>
<subtable>
<row>
<label>looking at "profile page"</label>
@@ -185,6 +189,7 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -210,6 +215,7 @@
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -222,6 +228,7 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
index d692d7d55199b3e19767bc1790ec3e9c9f56e979..595575819f453ed3a354311fcd71882044118909 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
@@ -23,6 +23,7 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -87,6 +88,7 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -127,6 +129,7 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -152,6 +155,7 @@
<row>
<label>Status user</label>
<nb_actions>3</nb_actions>
+ <segment>customVariableName==Status+user</segment>
<subtable>
<row>
<label>looking at "profile page"</label>
@@ -185,6 +189,7 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -210,6 +215,7 @@
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -222,6 +228,7 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
index a354856dec08708795a10f3acdbab12aee2cb120..d436493f49906c5c7e8645024cc4f523ebdbf2ec 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
@@ -20,7 +20,7 @@
<row>
<label>name</label>
<nb_actions>20</nb_actions>
- <segment>customVariableName==tweeted</segment>
+ <segment>customVariableName==name</segment>
<subtable>
<row>
<label>thing0</label>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
index a354856dec08708795a10f3acdbab12aee2cb120..d436493f49906c5c7e8645024cc4f523ebdbf2ec 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
@@ -20,7 +20,7 @@
<row>
<label>name</label>
<nb_actions>20</nb_actions>
- <segment>customVariableName==tweeted</segment>
+ <segment>customVariableName==name</segment>
<subtable>
<row>
<label>thing0</label>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
index 872005c4fd69b4f54a1ab549d1b387c0400cadd6..eec12ff4429eea0169f909a3e84155454da76a20 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
@@ -24,6 +24,7 @@
</goals>
<nb_conversions>3</nb_conversions>
<revenue>1000</revenue>
+ <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -85,6 +86,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -123,6 +125,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -147,6 +150,7 @@
<row>
<label>Status user</label>
<nb_actions>3</nb_actions>
+ <segment>customVariableName==Status+user</segment>
<subtable>
<row>
<label>looking at "profile page"</label>
@@ -177,6 +181,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>1000</revenue>
+ <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -201,6 +206,7 @@
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -212,6 +218,7 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
index a258754c6bc0a285e87e4b2696f07db39449a6fa..fe4627f8e5f97d795b86170998f871b93298ecd7 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
@@ -25,6 +25,7 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -89,6 +90,7 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -129,6 +131,7 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -154,6 +157,7 @@
<row>
<label>Status user</label>
<nb_actions>3</nb_actions>
+ <segment>customVariableName==Status+user</segment>
<subtable>
<row>
<label>looking at "profile page"</label>
@@ -187,6 +191,7 @@
<revenue>1000</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==Othercustom+value+which+should+be+truncated+abcdefghijklmnopqrstuvwxyz</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label>
@@ -212,6 +217,7 @@
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -224,6 +230,7 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
index fb99ef858ae6b4575965f498745eaac4ee3506a9..38cbd40db825195fe0083c18018c0b3c4bc6e630 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
@@ -19,6 +19,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -57,6 +58,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -100,6 +102,7 @@
</goals>
<nb_conversions>2</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -137,6 +140,7 @@
<row>
<label>Status user</label>
<nb_actions>3</nb_actions>
+ <segment>customVariableName==Status+user</segment>
<subtable>
<row>
<label>looking at "profile page"</label>
@@ -153,6 +157,7 @@
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -164,6 +169,7 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>
diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
index 6b8cd9d26ffe5954ff74efd69efd3be77b2011e4..7557e0aa02aa46f04d22451160eac1baa40eb699 100644
--- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
+++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
@@ -20,6 +20,7 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE</segment>
<subtable>
<row>
<label>Value not defined</label>
@@ -60,6 +61,7 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==Value+will+be+VERY+long+and+truncated</segment>
<subtable>
<row>
<label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label>
@@ -105,6 +107,7 @@
<revenue>0</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>customVariableName==VisitorType</segment>
<subtable>
<row>
<label>LoggedIn</label>
@@ -143,6 +146,7 @@
<row>
<label>Status user</label>
<nb_actions>3</nb_actions>
+ <segment>customVariableName==Status+user</segment>
<subtable>
<row>
<label>looking at "profile page"</label>
@@ -161,6 +165,7 @@
<row>
<label>Language</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Language</segment>
<subtable>
<row>
<label>FR</label>
@@ -173,6 +178,7 @@
<row>
<label>SET WITH EMPTY VALUE PAGE SCOPE</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==SET+WITH+EMPTY+VALUE+PAGE+SCOPE</segment>
<subtable>
<row>
<label>Value not defined</label>