diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-01-06 23:14:22 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-01-07 06:35:40 +0300 |
| commit | 8d84cfad2b9151b9f988cfe7b636352ac8155d54 (patch) | |
| tree | 9681f8cee333035a043d687c14d27513fc035610 | |
| parent | 65be56d1e5665224d105b0ba9f18c647a1db6455 (diff) | |
fixed some system tests. the order change of some device reports changed as they have sometimes same orderid and as we moved some ecommerce reports it results in a different order now
5 files changed, 184 insertions, 184 deletions
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 83edf5cf0e..18ea02d6f8 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 @@ -312,26 +312,26 @@ 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,2,3,0%,1.5,00:03:01,50% -Device brand -label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,10,43,0%,4.3,00:12:37,10% - 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,1,2,0%,2,00:06:01,0% Opera,1,1,0%,1,00:00:00,100% -Browser version +Device brand 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 3.6,1,2,0%,2,00:06:01,0% -Opera 9.63,1,1,0%,1,00:00:00,100% +Unknown,10,43,0%,4.3,00:12:37,10% Device model label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Unknown,10,43,0%,4.3,00:12:37,10% +Browser version +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 3.6,1,2,0%,2,00:06:01,0% +Opera 9.63,1,1,0%,1,00:00:00,100% + Operating System families 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% 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 dc5c3ecda4..2116d8e99a 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 @@ -275,18 +275,13 @@ </a> </li> <li> - <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(68,68,68);"> - Device brand - </a> - </li> - <li> <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Browser </a> </li> <li> - <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> - Browser version + <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(68,68,68);"> + Device brand </a> </li> <li> @@ -295,6 +290,11 @@ </a> </li> <li> + <a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);"> + Browser version + </a> + </li> + <li> <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);"> Operating System families </a> @@ -4509,8 +4509,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrand" style="color: rgb(126,115,99); font-size: 11pt;"> - Device brand +<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;"> + Visitor Browser </h2> @@ -4518,7 +4518,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Device brand + Browser </th> <th style="padding: 6px 0;"> Visits @@ -4543,23 +4543,73 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/brand/Unknown.ico'> + <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10 + 8 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 43 + 40 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.3 + 5 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:12:37 + 00:15:01 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10% + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + + <tr style="background-color: rgb(249,250,250)"> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> + + Firefox </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 2 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:06:01 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 0% + </td> + </tr> + + <tr style=""> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + <img src='plugins/DevicesDetection/images/browsers/OP.gif'> + + Opera </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 1 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 00:00:00 + </td> + <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> + 100% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -4571,8 +4621,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;"> - Visitor Browser +<h2 id="DevicesDetection_getBrand" style="color: rgb(126,115,99); font-size: 11pt;"> + Device brand </h2> @@ -4580,7 +4630,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser + Device brand </th> <th style="padding: 6px 0;"> Visits @@ -4605,73 +4655,83 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/browsers/UNK.gif'> + <img src='plugins/DevicesDetection/images/brand/Unknown.ico'> Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 40 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 5 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:15:01 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - - <tr style="background-color: rgb(249,250,250)"> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/browsers/FF.gif'> - - Firefox </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 10 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 + 43 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 + 4.3 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:06:01 + 00:12:37 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% + 10% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% </td> </tr> - + </tbody> + </table> + <br/> + <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> + Back to top + </a> +<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> + Device model +</h2> + + + + <table style="border-collapse:collapse; margin-left: 5px;"> + <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> + <th style="padding: 6px 0;"> + Device model + </th> + <th style="padding: 6px 0;"> + Visits + </th> + <th style="padding: 6px 0;"> + Actions + </th> + <th style="padding: 6px 0;"> + Actions per Visit + </th> + <th style="padding: 6px 0;"> + Avg. Time on Website + </th> + <th style="padding: 6px 0;"> + Bounce Rate + </th> + <th style="padding: 6px 0;"> + Conversion Rate + </th> + </thead> + <tbody> + <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/browsers/OP.gif'> - - Opera </td> + Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 10 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 43 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 + 4.3 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:00:00 + 00:12:37 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 100% + 10% </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0% @@ -4795,66 +4855,6 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> - Device model -</h2> - - - - <table style="border-collapse:collapse; margin-left: 5px;"> - <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> - <th style="padding: 6px 0;"> - Device model - </th> - <th style="padding: 6px 0;"> - Visits - </th> - <th style="padding: 6px 0;"> - Actions - </th> - <th style="padding: 6px 0;"> - Actions per Visit - </th> - <th style="padding: 6px 0;"> - Avg. Time on Website - </th> - <th style="padding: 6px 0;"> - Bounce Rate - </th> - <th style="padding: 6px 0;"> - Conversion Rate - </th> - </thead> - <tbody> - - <tr style=""> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Unknown </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 43 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 4.3 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 00:12:37 - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10% - </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0% - </td> - </tr> - </tbody> - </table> - <br/> - <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> - Back to top - </a> <h2 id="DevicesDetection_getOsFamilies" style="color: rgb(126,115,99); font-size: 11pt;"> Operating System families </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 298051f251..c358cad903 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -1808,11 +1808,10 @@ </row> <row> <category>Visitor Devices</category> - <name>Visitor Browser</name> + <name>Device brand</name> <module>DevicesDetection</module> - <action>getBrowsers</action> - <dimension>Browser</dimension> - <documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation> + <action>getBrand</action> + <dimension>Device brand</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -1831,16 +1830,17 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getBrowsers</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getBrand</uniqueId> </row> <row> <category>Visitor Devices</category> - <name>Device brand</name> + <name>Visitor Browser</name> <module>DevicesDetection</module> - <action>getBrand</action> - <dimension>Device brand</dimension> + <action>getBrowsers</action> + <dimension>Browser</dimension> + <documentation>This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -1859,16 +1859,16 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrand&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getBrand</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowsers&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getBrowsers</uniqueId> </row> <row> <category>Visitor Devices</category> - <name>Device model</name> + <name>Browser version</name> <module>DevicesDetection</module> - <action>getModel</action> - <dimension>Device model</dimension> + <action>getBrowserVersions</action> + <dimension>Browser version</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -1887,16 +1887,16 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getModel</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getBrowserVersions</uniqueId> </row> <row> <category>Visitor Devices</category> - <name>Browser version</name> + <name>Device model</name> <module>DevicesDetection</module> - <action>getBrowserVersions</action> - <dimension>Browser version</dimension> + <action>getModel</action> + <dimension>Device model</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -1915,9 +1915,9 @@ <bounce_rate>Bounce Rate</bounce_rate> <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getBrowserVersions&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>DevicesDetection_getBrowserVersions</uniqueId> + <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2009-01-04</imageGraphUrl> + <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=DevicesDetection&apiAction=getModel&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> + <uniqueId>DevicesDetection_getModel</uniqueId> </row> <row> <category>Visitor Devices</category> 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 f4403f36cf..cc59cc4ac5 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 @@ -470,15 +470,11 @@ 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% -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% -Device model +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% @@ -486,6 +482,10 @@ 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% +Device model +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% + Operating System families label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate Windows,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 cf3ef6a1e6..22592be6dc 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 @@ -335,18 +335,13 @@ </a> </li> <li> - <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(68,68,68);"> - Device brand - </a> - </li> - <li> <a href="#DevicesDetection_getBrowsers" style="text-decoration:none; color: rgb(68,68,68);"> Visitor Browser </a> </li> <li> - <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> - Device model + <a href="#DevicesDetection_getBrand" style="text-decoration:none; color: rgb(68,68,68);"> + Device brand </a> </li> <li> @@ -355,6 +350,11 @@ </a> </li> <li> + <a href="#DevicesDetection_getModel" style="text-decoration:none; color: rgb(68,68,68);"> + Device model + </a> + </li> + <li> <a href="#DevicesDetection_getOsFamilies" style="text-decoration:none; color: rgb(68,68,68);"> Operating System families </a> @@ -6190,8 +6190,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrand" style="color: rgb(126,115,99); font-size: 11pt;"> - Device brand +<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;"> + Visitor Browser </h2> @@ -6199,7 +6199,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Device brand + Browser </th> <th style="padding: 6px 0;"> Visits @@ -6224,9 +6224,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/brand/Unknown.ico'> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> - Unknown </td> + Firefox </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -6252,8 +6252,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowsers" style="color: rgb(126,115,99); font-size: 11pt;"> - Visitor Browser +<h2 id="DevicesDetection_getBrand" style="color: rgb(126,115,99); font-size: 11pt;"> + Device brand </h2> @@ -6261,7 +6261,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser + Device brand </th> <th style="padding: 6px 0;"> Visits @@ -6286,9 +6286,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/browsers/FF.gif'> + <img src='plugins/DevicesDetection/images/brand/Unknown.ico'> - Firefox </td> + Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -6314,8 +6314,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> - Device model +<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> + Browser version </h2> @@ -6323,7 +6323,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Device model + Browser version </th> <th style="padding: 6px 0;"> Visits @@ -6348,7 +6348,9 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - Unknown </td> + <img src='plugins/DevicesDetection/images/browsers/FF.gif'> + + Firefox 3.6 </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -6374,8 +6376,8 @@ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop"> Back to top </a> -<h2 id="DevicesDetection_getBrowserVersions" style="color: rgb(126,115,99); font-size: 11pt;"> - Browser version +<h2 id="DevicesDetection_getModel" style="color: rgb(126,115,99); font-size: 11pt;"> + Device model </h2> @@ -6383,7 +6385,7 @@ <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb(228,226,215); color: rgb(37,87,146); font-size: 11pt;"> <th style="padding: 6px 0;"> - Browser version + Device model </th> <th style="padding: 6px 0;"> Visits @@ -6408,9 +6410,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/DevicesDetection/images/browsers/FF.gif'> - - Firefox 3.6 </td> + Unknown </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> |