diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-04-20 08:23:32 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-04-20 08:23:32 +0300 |
| commit | de96be1f00c9afd1b3d3c41afea45be2b3957deb (patch) | |
| tree | c3987a1494b190ed7547bb976623f0e2ac9cbedd /tests | |
| parent | c054e0dc41b967fcc92ca9b58bee47ede82b457c (diff) | |
fix tests after adding new userid feature
Diffstat (limited to 'tests')
22 files changed, 254 insertions, 135 deletions
diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index 075de8ff6a..845407cb4e 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -38,7 +38,7 @@ class WidgetsListTest extends IntegrationTestCase $numberOfWidgets = array( 'VisitsSummary_VisitsSummary' => 6, 'Live!' => 4, - 'General_Visitors' => 11, + 'General_Visitors' => 12, 'General_VisitorSettings' => 5, 'General_Actions' => 10, 'Events_Events' => 3, diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml index 649376535a..0c41e93fe8 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml @@ -172,57 +172,57 @@ <row> <segment>eventAction==playTrailer</segment> - <idsubdatatable>848</idsubdatatable> + <idsubdatatable>856</idsubdatatable> </row> <row> <segment>eventAction==Search</segment> - <idsubdatatable>841</idsubdatatable> + <idsubdatatable>849</idsubdatatable> </row> <row> <segment>eventAction==play25%25</segment> - <idsubdatatable>843</idsubdatatable> + <idsubdatatable>851</idsubdatatable> </row> <row> <segment>eventAction==play50%25</segment> - <idsubdatatable>844</idsubdatatable> + <idsubdatatable>852</idsubdatatable> </row> <row> <segment>eventAction==play75%25</segment> - <idsubdatatable>845</idsubdatatable> + <idsubdatatable>853</idsubdatatable> </row> <row> <segment>eventAction==playEnd</segment> - <idsubdatatable>846</idsubdatatable> + <idsubdatatable>854</idsubdatatable> </row> <row> <segment>eventAction==rating</segment> - <idsubdatatable>847</idsubdatatable> + <idsubdatatable>855</idsubdatatable> </row> <row> <segment>eventAction==clickBuyNow</segment> - <idsubdatatable>849</idsubdatatable> + <idsubdatatable>857</idsubdatatable> </row> <row> <segment>eventAction==event+action+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - <idsubdatatable>851</idsubdatatable> + <idsubdatatable>859</idsubdatatable> </row> <row> <segment>eventAction==play</segment> - <idsubdatatable>842</idsubdatatable> + <idsubdatatable>850</idsubdatatable> </row> <row> <segment>eventAction==playStart</segment> - <idsubdatatable>850</idsubdatatable> + <idsubdatatable>858</idsubdatatable> </row> <row> <segment>eventAction==Purchase</segment> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml index f95203c60b..5673a4a57d 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml @@ -91,22 +91,22 @@ <row> <segment>eventCategory==Movie</segment> - <idsubdatatable>784</idsubdatatable> + <idsubdatatable>792</idsubdatatable> </row> <row> <segment>eventCategory==Music</segment> - <idsubdatatable>785</idsubdatatable> + <idsubdatatable>793</idsubdatatable> </row> <row> <segment>eventCategory==event+category+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - <idsubdatatable>786</idsubdatatable> + <idsubdatatable>794</idsubdatatable> </row> <row> <segment>eventCategory==CategoryTriggersGoal+here</segment> - <idsubdatatable>787</idsubdatatable> + <idsubdatatable>795</idsubdatatable> </row> </result> <result prettyDate="Monday, January 4, 2010" /> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml index ac0f1dd702..87f51c4a2b 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml @@ -118,36 +118,36 @@ <row> <segment>eventName==Spirited+Away+%28%E5%8D%83%E3%81%A8%E5%8D%83%E5%B0%8B%E3%81%AE%E7%A5%9E%E9%9A%A0%E3%81%97%29</segment> - <idsubdatatable>914</idsubdatatable> + <idsubdatatable>922</idsubdatatable> </row> <row> <segment>eventName==La+fianc%C3%A9e+de+l%26%23039%3Beau</segment> - <idsubdatatable>913</idsubdatatable> + <idsubdatatable>921</idsubdatatable> </row> <row> - <idsubdatatable>912</idsubdatatable> + <idsubdatatable>920</idsubdatatable> </row> <row> <segment>eventName==event+name+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+Extremely+long+---%26gt%3B+SHOULD+APPEAR+IN+TEST+OUTPUT+NOT+TRUNCATED+%26lt%3B---</segment> - <idsubdatatable>918</idsubdatatable> + <idsubdatatable>926</idsubdatatable> </row> <row> <segment>eventName==Ponyo+%28%E5%B4%96%E3%81%AE%E4%B8%8A%E3%81%AE%E3%83%9D%E3%83%8B%E3%83%A7%29</segment> - <idsubdatatable>916</idsubdatatable> + <idsubdatatable>924</idsubdatatable> </row> <row> <segment>eventName==Princess+Mononoke+%28%E3%82%82%E3%81%AE%E3%81%AE%E3%81%91%E5%A7%AB%29</segment> - <idsubdatatable>915</idsubdatatable> + <idsubdatatable>923</idsubdatatable> </row> <row> <segment>eventName==Search+query+here</segment> - <idsubdatatable>917</idsubdatatable> + <idsubdatatable>925</idsubdatatable> </row> </result> <result prettyDate="Monday, January 4, 2010" /> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml new file mode 100644 index 0000000000..5ae68e2624 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserId.getUsers_month.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>commonuser</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <idvisitor>c7a1daa770a8e43a</idvisitor> + </row> + <row> + <label>user1</label> + <nb_visits>1</nb_visits> + <nb_actions>3</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>2</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <idvisitor>b3daa77b4c04a955</idvisitor> + </row> + <row> + <label>user2</label> + <nb_visits>1</nb_visits> + <nb_actions>2</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>1</sum_visit_length> + <bounce_count>0</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <idvisitor>c515c2f2350e7b1a</idvisitor> + </row> +</result>
\ No newline at end of file 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 8ba7f648bd..4aa0b2be0a 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 @@ -60,11 +60,11 @@ <reportMetadata> <row> - <idsubdatatable>2711</idsubdatatable> + <idsubdatatable>2745</idsubdatatable> </row> <row> - <idsubdatatable>2712</idsubdatatable> + <idsubdatatable>2746</idsubdatatable> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserId.getUsers_day.xml new file mode 100644 index 0000000000..c234bed59e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__UserId.getUsers_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result />
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml index 52aca7f701..815cb85880 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml @@ -45,7 +45,7 @@ <reportMetadata> <row> - <idsubdatatable>5119</idsubdatatable> + <idsubdatatable>5149</idsubdatatable> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml index c5f4f6b6a5..d4a04cf034 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml @@ -54,7 +54,7 @@ <reportMetadata> <row> - <idsubdatatable>5123</idsubdatatable> + <idsubdatatable>5153</idsubdatatable> </row> </reportMetadata> <reportTotal> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml index 04b14932b5..5318e8e98a 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml @@ -119,7 +119,7 @@ </slots> <segment>customVariableName==_pk_scount</segment> - <idsubdatatable>3173</idsubdatatable> + <idsubdatatable>3205</idsubdatatable> </row> <row> <slots> @@ -130,7 +130,7 @@ </slots> <segment>customVariableName==_pk_scat</segment> - <idsubdatatable>3172</idsubdatatable> + <idsubdatatable>3204</idsubdatatable> </row> </result> <result prettyDate="Monday, January 4, 2010"> @@ -143,7 +143,7 @@ </slots> <segment>customVariableName==_pk_scount</segment> - <idsubdatatable>3176</idsubdatatable> + <idsubdatatable>3208</idsubdatatable> </row> <row> <slots> @@ -154,7 +154,7 @@ </slots> <segment>customVariableName==_pk_scat</segment> - <idsubdatatable>3175</idsubdatatable> + <idsubdatatable>3207</idsubdatatable> </row> </result> <result prettyDate="Tuesday, January 5, 2010" /> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml index 0d9935f4ed..e99885b8e6 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml @@ -88,7 +88,7 @@ </slots> <segment>customVariableName==_pk_scount</segment> - <idsubdatatable>3198</idsubdatatable> + <idsubdatatable>3230</idsubdatatable> </row> <row> <slots> @@ -99,7 +99,7 @@ </slots> <segment>customVariableName==_pk_scat</segment> - <idsubdatatable>3197</idsubdatatable> + <idsubdatatable>3229</idsubdatatable> </row> </result> <result prettyDate="February 2010" /> 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 1dcf5c1e94..13e9dc4d44 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 @@ -171,51 +171,51 @@ <result prettyDate="Tuesday, January 5, 2010"> <row> - <idsubdatatable>1956</idsubdatatable> + <idsubdatatable>1990</idsubdatatable> </row> <row> - <idsubdatatable>1955</idsubdatatable> + <idsubdatatable>1989</idsubdatatable> </row> </result> <result prettyDate="Wednesday, January 6, 2010"> <row> - <idsubdatatable>1960</idsubdatatable> + <idsubdatatable>1994</idsubdatatable> </row> <row> - <idsubdatatable>1959</idsubdatatable> + <idsubdatatable>1993</idsubdatatable> </row> </result> <result prettyDate="Thursday, January 7, 2010"> <row> - <idsubdatatable>1964</idsubdatatable> + <idsubdatatable>1998</idsubdatatable> </row> <row> - <idsubdatatable>1963</idsubdatatable> + <idsubdatatable>1997</idsubdatatable> </row> </result> <result prettyDate="Friday, January 8, 2010"> <row> - <idsubdatatable>1968</idsubdatatable> + <idsubdatatable>2002</idsubdatatable> </row> <row> - <idsubdatatable>1967</idsubdatatable> + <idsubdatatable>2001</idsubdatatable> </row> </result> <result prettyDate="Saturday, January 9, 2010"> <row> - <idsubdatatable>1972</idsubdatatable> + <idsubdatatable>2006</idsubdatatable> </row> <row> - <idsubdatatable>1971</idsubdatatable> + <idsubdatatable>2005</idsubdatatable> </row> </result> </reportMetadata> 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 21f4942fd1..65aa9a3808 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 @@ -115,14 +115,14 @@ <row> <segment>referrerName==referrer.com</segment> - <idsubdatatable>1907</idsubdatatable> + <idsubdatatable>1941</idsubdatatable> </row> </result> <result prettyDate="Monday, January 4, 2010"> <row> <segment>referrerName==referrer.com</segment> - <idsubdatatable>1909</idsubdatatable> + <idsubdatatable>1943</idsubdatatable> </row> </result> <result prettyDate="Tuesday, January 5, 2010" /> @@ -132,14 +132,14 @@ <row> <segment>referrerName==referrer.com</segment> - <idsubdatatable>1914</idsubdatatable> + <idsubdatatable>1948</idsubdatatable> </row> </result> <result prettyDate="Saturday, January 9, 2010"> <row> <segment>referrerName==referrer.com</segment> - <idsubdatatable>1916</idsubdatatable> + <idsubdatatable>1950</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 440caf0135..12c556686b 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 @@ -236,6 +236,9 @@ City label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue Unknown,11,43,3.9,00:10:55,27%,$ 0 +Users +No data available + Custom Variables No data available @@ -309,16 +312,16 @@ label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site Unknown,8,40,0%,5,00:15:01,0% Desktop,3,3,0%,1,00:00:00,100% +Device brand +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% + Visitor Browser label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,8,40,0%,5,00:15:01,0% Firefox,2,2,0%,1,00:00:00,100% Opera,1,1,0%,1,00:00:00,100% -Device brand -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% - Device model 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% 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 9038446a12..8e64daec1c 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 @@ -236,6 +236,11 @@ </a> </li> <li> + <a href="#UserId_getUsers" style="text-decoration:none; color: rgb(13,13,13);"> + Users + </a> + </li> + <li> <a href="#CustomVariables_getCustomVariables" style="text-decoration:none; color: rgb(13,13,13);"> Custom Variables </a> @@ -271,13 +276,13 @@ </a> </li> <li> - <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(13,13,13);"> - Visitor Browser + <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);"> + Device brand </a> </li> <li> - <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);"> - Device brand + <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(13,13,13);"> + Visitor Browser </a> </li> <li> @@ -3751,6 +3756,11 @@ <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> Back to top </a> +<h2 id="UserId_getUsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> + Users +</h2> + + There is no data for this report. <h2 id="CustomVariables_getCustomVariables" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> Custom Variables </h2> @@ -4454,6 +4464,68 @@ <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> Back to top </a> +<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> + Device brand +</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;"> + Device brand + </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;"> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> + + Unknown </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="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> Visitor Browser </h2> @@ -4566,68 +4638,6 @@ <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> - Device brand -</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;"> - Device brand - </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;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> - - Unknown </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="DevicesDetection_getModel" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> Device model </h2> 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 df6c40e9c4..2e7c66166a 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -1705,6 +1705,36 @@ </row> <row> <category>Visitors</category> + <name>Users</name> + <module>UserId</module> + <action>getUsers</action> + <dimension>UserId</dimension> + <metrics> + <label>Label</label> + <nb_visits>Visits</nb_visits> + <nb_actions>Actions</nb_actions> + <nb_visits_converted>Visits with Conversions</nb_visits_converted> + </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_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> + <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=UserId&apiAction=getUsers&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserId&apiAction=getUsers&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>UserId_getUsers</uniqueId> + </row> + <row> + <category>Visitors</category> <name>Custom Variables</name> <module>CustomVariables</module> <action>getCustomVariables</action> 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 dd20771473..149892a6f5 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 @@ -391,6 +391,9 @@ City label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,5,16,$ 13361.11,3.2,00:22:49,20% +Users +No data available + Custom Variables label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate ValueIsZero,5,16,$ 13361.11,3.2,00:22:49,20% @@ -466,14 +469,14 @@ Device type label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Desktop,5,16,80%,3.2,00:22:49,20% -Visitor Browser -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Firefox,5,16,80%,3.2,00:22:49,20% - Device brand 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% +Visitor Browser +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Firefox,5,16,80%,3.2,00:22:49,20% + Browser version label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Firefox 3.6,5,16,80%,3.2,00:22:49,20% 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 ecf0881055..76efc98ba9 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 @@ -296,6 +296,11 @@ </a> </li> <li> + <a href="#UserId_getUsers" style="text-decoration:none; color: rgb(13,13,13);"> + Users + </a> + </li> + <li> <a href="#CustomVariables_getCustomVariables" style="text-decoration:none; color: rgb(13,13,13);"> Custom Variables </a> @@ -331,13 +336,13 @@ </a> </li> <li> - <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(13,13,13);"> - Visitor Browser + <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);"> + Device brand </a> </li> <li> - <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(13,13,13);"> - Device brand + <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(13,13,13);"> + Visitor Browser </a> </li> <li> @@ -5337,6 +5342,11 @@ <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> Back to top </a> +<h2 id="UserId_getUsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> + Users +</h2> + + There is no data for this report. <h2 id="CustomVariables_getCustomVariables" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> Custom Variables </h2> @@ -6116,8 +6126,8 @@ <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> - Visitor Browser +<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> + Device brand </h2> @@ -6125,7 +6135,7 @@ <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;"> - Browser + Device brand </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> Visits @@ -6150,9 +6160,9 @@ <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;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> - Firefox </td> + Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 5 </td> @@ -6178,8 +6188,8 @@ <a style="text-decoration:none; color: rgb(13,13,13); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrand" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> - Device brand +<h2 id="DevicesDetection_getBrowsers" style="color: rgb(13,13,13); font-size: 24pt; font-weight:normal;"> + Visitor Browser </h2> @@ -6187,7 +6197,7 @@ <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;"> - Device brand + Browser </th> <th style="font-weight: normal; font-size:10px; text-align:left; padding: 6px 0;"> Visits @@ -6212,9 +6222,9 @@ <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;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> - Unknown </td> + Firefox </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> 5 </td> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_day.xml new file mode 100644 index 0000000000..106f23f16b --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_day.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" ?> +<results> + <result date="2009-01-04" /> + <result date="2009-01-05" /> + <result date="2009-01-06" /> + <result date="2009-01-07" /> + <result date="2009-01-08" /> + <result date="2009-01-09" /> + <result date="2009-01-10" /> +</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_week.xml new file mode 100644 index 0000000000..5cfb246edc --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__UserId.getUsers_week.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" ?> +<results> + <result date="From 2008-12-29 to 2009-01-04" /> + <result date="From 2009-01-05 to 2009-01-11" /> + <result date="From 2009-01-12 to 2009-01-18" /> + <result date="From 2009-01-19 to 2009-01-25" /> + <result date="From 2009-01-26 to 2009-02-01" /> + <result date="From 2009-02-02 to 2009-02-08" /> + <result date="From 2009-02-09 to 2009-02-15" /> +</results>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit__UserId.getUsers_day.xml b/tests/PHPUnit/System/expected/test_noVisit__UserId.getUsers_day.xml new file mode 100644 index 0000000000..c234bed59e --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit__UserId.getUsers_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result />
\ No newline at end of file diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots -Subproject 270cd5fa48a36a13d658f7bd538cc16d5d393ec +Subproject efdf37166df977a737ff5aa68dd4871ee354b33 |