Fix integration tests and updated UI submodule.

2 files changed, 330 insertions, 0 deletions

diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
new file mode 100644
index 0000000000..7461f43fb4
--- /dev/null
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -0,0 +1,330 @@
+All Websites dashboard
+label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders,orders_evolution,ecommerce_revenue,ecommerce_revenue_evolution
+Site 1,10,43,43,$ 0,0,100%,100%,100%,0%,0%,0,0,$ 0,0
+Site 2,1,3,3,$ 0,0,100%,100%,100%,0%,0%,0,0,$ 0,0
+
+Visits Summary
+nb_uniq_visitors,nb_visits,nb_actions,max_actions,bounce_rate,nb_actions_per_visit,avg_time_on_site
+2,10,43,5,10%,4.3,00:12:37
+
+Visits by Server Time
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
+0h,1,2,2,00:06:01,0%,$ 0
+1h,0,0,0,00:00:00,0%,$ 0
+2h,0,0,0,00:00:00,0%,$ 0
+3h,0,0,0,00:00:00,0%,$ 0
+4h,0,0,0,00:00:00,0%,$ 0
+5h,0,0,0,00:00:00,0%,$ 0
+6h,0,0,0,00:00:00,0%,$ 0
+7h,0,0,0,00:00:00,0%,$ 0
+8h,0,0,0,00:00:00,0%,$ 0
+9h,0,0,0,00:00:00,0%,$ 0
+10h,0,0,0,00:00:00,0%,$ 0
+11h,8,40,5,00:15:01,0%,$ 0
+12h,1,1,1,00:00:00,100%,$ 0
+13h,0,0,0,00:00:00,0%,$ 0
+14h,0,0,0,00:00:00,0%,$ 0
+15h,0,0,0,00:00:00,0%,$ 0
+16h,0,0,0,00:00:00,0%,$ 0
+17h,0,0,0,00:00:00,0%,$ 0
+18h,0,0,0,00:00:00,0%,$ 0
+19h,0,0,0,00:00:00,0%,$ 0
+20h,0,0,0,00:00:00,0%,$ 0
+21h,0,0,0,00:00:00,0%,$ 0
+22h,0,0,0,00:00:00,0%,$ 0
+23h,0,0,0,00:00:00,0%,$ 0
+
+Visits by Local Time
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+0h,0,0,0,00:00:00,0%,0%
+1h,0,0,0,00:00:00,0%,0%
+2h,0,0,0,00:00:00,0%,0%
+3h,0,0,0,00:00:00,0%,0%
+4h,0,0,0,00:00:00,0%,0%
+5h,0,0,0,00:00:00,0%,0%
+6h,0,0,0,00:00:00,0%,0%
+7h,0,0,0,00:00:00,0%,0%
+8h,0,0,0,00:00:00,0%,0%
+9h,0,0,0,00:00:00,0%,0%
+10h,0,0,0,00:00:00,0%,0%
+11h,0,0,0,00:00:00,0%,0%
+12h,10,43,4.3,00:12:37,10%,0%
+13h,0,0,0,00:00:00,0%,0%
+14h,0,0,0,00:00:00,0%,0%
+15h,0,0,0,00:00:00,0%,0%
+16h,0,0,0,00:00:00,0%,0%
+17h,0,0,0,00:00:00,0%,0%
+18h,0,0,0,00:00:00,0%,0%
+19h,0,0,0,00:00:00,0%,0%
+20h,0,0,0,00:00:00,0%,0%
+21h,0,0,0,00:00:00,0%,0%
+22h,0,0,0,00:00:00,0%,0%
+23h,0,0,0,00:00:00,0%,0%
+
+Visits by Day of Week
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Monday,2,7,3.5,00:10:31,0%,0%
+Tuesday,2,10,5,00:15:01,0%,0%
+Wednesday,1,5,5,00:15:01,0%,0%
+Thursday,1,5,5,00:15:01,0%,0%
+Friday,1,5,5,00:15:01,0%,0%
+Saturday,1,5,5,00:15:01,0%,0%
+Sunday,2,6,3,00:07:31,50%,0%
+
+Actions - Main metrics
+nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords,avg_time_generation
+43,27,0,0,0,0,0,0,0.3s
+
+Page URLs
+label,nb_visits,nb_hits,avg_time_on_page,bounce_rate,exit_rate,avg_time_generation
+/index.htm,9,9,00:05:20,0%,0%,0.3s
+Page URL not defined,9,17,00:00:00,0%,0%,0.22s
+/thankyou,8,16,00:06:00,0%,100%,0.31s
+/products,1,1,00:00:00,100%,100%,0.15s
+
+Entry pages
+label,entry_nb_visits,entry_bounce_count,bounce_rate
+/index.htm,8,0,0%
+/products,1,1,100%
+
+Exit pages
+label,nb_visits,exit_nb_visits,exit_rate
+/thankyou,8,8,100%
+/products,1,1,100%
+
+Page titles
+label,nb_visits,nb_hits,avg_time_on_page,bounce_rate,exit_rate,avg_time_generation
+second visitor,16,16,00:07:30,0%,0%,0.25s
+Checkout,8,8,00:00:00,0%,100%,0.45s
+ first page view,2,2,00:00:00,100%,50%,0.14s
+Page Name not defined,1,1,00:00:00,0%,0%,0.22s
+
+Entry page titles
+label,entry_nb_visits,entry_bounce_count,bounce_rate
+second visitor,8,0,0%
+ first page view,1,1,100%
+
+Exit page titles
+label,nb_visits,exit_nb_visits,exit_rate
+Checkout,8,8,100%
+ first page view,2,1,50%
+
+Outlinks
+No data available
+
+Downloads
+No data available
+
+Referrer Type
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
+Websites,9,42,4.67,00:14:01,0%,$ 0
+Direct Entry,1,1,1,00:00:00,100%,$ 0
+
+All Referrers
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+referrer.com,9,42,4.67,00:14:01,0%,0%
+
+Keywords
+No data available
+
+Websites
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
+referrer.com,9,42,4.67,00:14:01,0%,$ 0
+
+Search Engines
+No data available
+
+Campaigns
+No data available
+
+Social Networks
+No data available
+
+Goals
+nb_conversions,nb_visits_converted,conversion_rate,revenue
+0,0,0%,$ 0
+
+Visits to Conversion
+No data available
+
+Days to Conversion
+No data available
+
+Country
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
+France,10,43,4.3,00:12:37,10%,$ 0
+
+Continent
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
+Europe,10,43,4.3,00:12:37,10%,$ 0
+
+Region
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
+Unknown,10,43,4.3,00:12:37,10%,$ 0
+
+City
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
+Unknown,10,43,4.3,00:12:37,10%,$ 0
+
+Custom Variables
+No data available
+
+Length of Visits
+label,nb_visits
+0-10s,1
+11-30s,0
+31-60s,0
+1-2 min,0
+2-4 min,0
+4-7 min,1
+7-10 min,0
+10-15 min,0
+15-30 min,8
+30+ min,0
+
+Pages per Visit
+label,nb_visits
+1 page,1
+2 pages,1
+3 pages,0
+4 pages,0
+5 pages,8
+6-7 pages,0
+8-10 pages,0
+11-14 pages,0
+15-20 pages,0
+21+ pages,0
+
+Visits by Visit Number
+label,nb_visits,nb_visits_percentage
+1 visit,2,20%
+2 visits,8,80%
+3 visits,0,0%
+4 visits,0,0%
+5 visits,0,0%
+6 visits,0,0%
+7 visits,0,0%
+8 visits,0,0%
+9-14 visits,0,0%
+15-25 visits,0,0%
+26-50 visits,0,0%
+51-100 visits,0,0%
+101-200 visits,0,0%
+201+ visits,0,0%
+
+Visits by days since last visit
+label,nb_visits
+New visits,2
+0 days,0
+1 day,0
+2 days,1
+3 days,1
+4 days,1
+5 days,1
+6 days,1
+7 days,1
+8-14 days,2
+15-30 days,0
+31-60 days,0
+61-120 days,0
+121-364 days,0
+365+ days,0
+
+Returning Visits
+nb_uniq_visitors_returning,nb_visits_returning,nb_actions_returning,bounce_rate_returning,nb_actions_per_visit_returning,avg_time_on_site_returning
+1,8,40,0%,5,00:15:01
+
+Provider
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Unknown,10,43,4.3,00:12:37,10%,0%
+
+Device type
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Desktop,10,43,4.3,00:12:37,10%,0%
+
+Device brand
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Unknown,10,43,4.3,00:12:37,10%,0%
+
+Device model
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Unknown,10,43,4.3,00:12:37,10%,0%
+
+Operating System families
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Windows,10,43,4.3,00:12:37,10%,0%
+
+Operating System versions
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Windows XP,10,43,4.3,00:12:37,10%,0%
+
+Browser families
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Opera,9,41,4.56,00:13:21,11.11%,0%
+Firefox,1,2,2,00:06:01,0%,0%
+
+Browser versions
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Opera 9.63,9,41,4.56,00:13:21,11.11%,0%
+Firefox 3.6,1,2,2,00:06:01,0%,0%
+
+Screen Resolution
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+800x300,9,41,4.56,00:13:21,11.11%,0%
+1024x768,1,2,2,00:06:01,0%,0%
+
+Visitor Browser
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Opera,9,41,4.56,00:13:21,11.11%,0%
+Firefox,1,2,2,00:06:01,0%,0%
+
+Browser Version
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Opera 9.63,9,41,4.56,00:13:21,11.11%,0%
+Firefox 3.6,1,2,2,00:06:01,0%,0%
+
+Browser Family
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Presto (Opera),9,41,4.56,00:13:21,11.11%,0%
+Gecko (Firefox),1,2,2,00:06:01,0%,0%
+
+Browser Plugins
+label,nb_visits,nb_visits_percentage
+Cookie,10,100%
+Flash,10,100%
+Java,10,100%
+Director,0,0%
+Gears,0,0%
+Pdf,0,0%
+Quicktime,0,0%
+Realplayer,0,0%
+Silverlight,0,0%
+Windowsmedia,0,0%
+
+Normal / Widescreen
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Dual,9,41,4.56,00:13:21,11.11%,0%
+Normal,1,2,2,00:06:01,0%,0%
+
+Operating System
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Windows XP,10,43,4.3,00:12:37,10%,0%
+
+Visitor Configuration
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Windows XP / Opera / 800x300,9,41,4.56,00:13:21,11.11%,0%
+Windows XP / Firefox / 1024x768,1,2,2,00:06:01,0%,0%
+
+Operating system family
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Windows,10,43,4.3,00:12:37,10%,0%
+
+Mobile vs Desktop
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+Desktop,10,43,4.3,00:12:37,10%,0%
+Mobile,0,0,0,00:00:00,0%,0%
+
+Browser language
+label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,conversion_rate
+French,10,43,4.3,00:12:37,10%,0%
+
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject afec1d6ec57295aafc67199a47a00d10de9d7e2
+Subproject 9531b019cbcaedc1bbf613d14032e7bd0b839ff