From d524f2de9021e29ed64e0e4ccdab1b0c7f26e1cd Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Sun, 28 Sep 2014 20:33:26 +0200
Subject: [PATCH] fixing even more tests
---
...vents__Live.getLastVisitsDetails_month.xml | 2 +-
...tLogs__Live.getLastVisitsDetails_range.xml | 140 +++++------
...itAsc__Live.getLastVisitsDetails_month.xml | 28 +--
...Visit__Live.getLastVisitsDetails_month.xml | 28 +--
...Count__Live.getLastVisitsDetails_month.xml | 28 +--
...tDesc__Live.getLastVisitsDetails_month.xml | 28 +--
...eTest__Live.getLastVisitsDetails_month.xml | 40 +--
...Support__Live.getLastVisitsDetails_day.xml | 8 +-
...ecified__Live.getLastVisitsDetails_day.xml | 8 +-
...eDays__Live.getLastVisitsDetails_month.xml | 12 +-
...nesTest__Live.getLastVisitsDetails_day.xml | 4 +-
...dReports.generateReport_month.original.csv | 12 +-
...Reports.generateReport_month.original.html | 234 +++++++++---------
...Reports.generateReport_month.original.html | 222 ++++++++---------
...thItems__Live.getLastVisitsDetails_day.xml | 8 +-
...edReports.generateReport_week.original.csv | 8 +-
...dReports.generateReport_week.original.html | 142 +++++------
...dReports.generateReport_week.original.html | 130 +++++-----
...alAPI__Live.getLastVisitsDetails_range.xml | 12 +-
...taAndNormalAPI__Live.getVisitorProfile.xml | 8 +-
20 files changed, 551 insertions(+), 551 deletions(-)
diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index bd1da27205..2c741a31b0 100644
--- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -45,9 +45,9 @@
<customVariableValue1>should not appear in events report Bis</customVariableValue1>
</row>
</customVariables>
+ <deviceType>Desktop</deviceType>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <deviceType>Desktop</deviceType>
<events>1</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index 020dbfef10..dfb3d76736 100644
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -62,6 +62,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Blink</browserFamily>
+ <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -89,8 +91,6 @@
<operatingSystemCode>W81</operatingSystemCode>
<operatingSystemShortName>W81</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/W81.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 33.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -200,6 +200,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -227,8 +229,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>ie</browserFamily>
- <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 8.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
@@ -313,6 +313,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Blink</browserFamily>
+ <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -340,8 +342,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 34.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -459,6 +459,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -486,8 +488,6 @@
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemShortName>Mac OS</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Safari 7.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
@@ -574,6 +574,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Blink</browserFamily>
+ <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -601,8 +603,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 33.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -700,6 +700,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Blink</browserFamily>
+ <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -727,8 +729,6 @@
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemShortName>Mac OS</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 33.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -833,6 +833,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -860,8 +862,6 @@
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemShortName>Mac OS</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Safari 7.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
@@ -1356,6 +1356,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Blink</browserFamily>
+ <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1383,8 +1385,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 33.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -1482,6 +1482,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Blink</browserFamily>
+ <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1509,8 +1511,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 33.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -1766,6 +1766,8 @@
<customVariables>
</customVariables>
<deviceType>Unknown</deviceType>
+ <browserFamily />
+ <browserFamilyDescription>Unknown</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1793,8 +1795,6 @@
<operatingSystemCode>UNK</operatingSystemCode>
<operatingSystemShortName>Unknown</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -1882,6 +1882,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -1909,8 +1911,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>ie</browserFamily>
- <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 6.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
@@ -1999,6 +1999,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -2026,8 +2028,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 11.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -2132,6 +2132,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -2159,8 +2161,6 @@
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemShortName>Mac OS</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
@@ -2257,6 +2257,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -2284,8 +2286,6 @@
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemShortName>Mac OS</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
@@ -2389,6 +2389,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -2416,8 +2418,6 @@
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemShortName>Mac OS</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
@@ -2497,6 +2497,8 @@
</row>
</customVariables>
<deviceType>Unknown</deviceType>
+ <browserFamily />
+ <browserFamilyDescription>Unknown</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -2524,8 +2526,6 @@
<operatingSystemCode>BOT</operatingSystemCode>
<operatingSystemShortName>BOT</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -2605,6 +2605,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -2632,8 +2634,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>ie</browserFamily>
- <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 9.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
@@ -2703,6 +2703,8 @@
</row>
</customVariables>
<deviceType>Unknown</deviceType>
+ <browserFamily />
+ <browserFamilyDescription>Unknown</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -2730,8 +2732,6 @@
<operatingSystemCode>UNK</operatingSystemCode>
<operatingSystemShortName>Unknown</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -2811,6 +2811,8 @@
</row>
</customVariables>
<deviceType>Smartphone</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -2838,8 +2840,6 @@
<operatingSystemCode>AND</operatingSystemCode>
<operatingSystemShortName>Android</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Android Browser </browserName>
<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
<browserCode>AN</browserCode>
@@ -2919,6 +2919,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -2946,8 +2948,6 @@
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemShortName>Mac OS</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
@@ -3023,6 +3023,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -3050,8 +3052,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 20.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -3127,6 +3127,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -3154,8 +3156,6 @@
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemShortName>Linux</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Epiphany 2.30</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
@@ -3231,6 +3231,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -3258,8 +3260,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 20.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -3335,6 +3335,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -3362,8 +3364,6 @@
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemShortName>Linux</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Epiphany 2.30</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
@@ -3439,6 +3439,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -3466,8 +3468,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>ie</browserFamily>
- <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 9.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
@@ -3543,6 +3543,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -3570,8 +3572,6 @@
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemShortName>Linux</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Epiphany 2.30</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
@@ -3647,6 +3647,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -3674,8 +3676,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>ie</browserFamily>
- <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 9.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
@@ -3751,6 +3751,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -3778,8 +3780,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>ie</browserFamily>
- <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 9.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
@@ -3855,6 +3855,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -3882,8 +3884,6 @@
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemShortName>Mac OS</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 19.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -4063,6 +4063,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -4090,8 +4092,6 @@
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemShortName>Linux</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 19.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
@@ -4167,6 +4167,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -4194,8 +4196,6 @@
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemShortName>Linux</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Epiphany 2.30</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
@@ -4271,6 +4271,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -4298,8 +4300,6 @@
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemShortName>Win 7</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
- <browserFamily>ie</browserFamily>
- <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 9.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
@@ -4479,6 +4479,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -4506,8 +4508,6 @@
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemShortName>Linux</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
- <browserFamily>webkit</browserFamily>
- <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Epiphany 2.30</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
@@ -4583,6 +4583,8 @@
<customVariables>
</customVariables>
<deviceType>Smartphone</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -4610,8 +4612,6 @@
<operatingSystemCode>AND</operatingSystemCode>
<operatingSystemShortName>Android</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Android Browser </browserName>
<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
<browserCode>AN</browserCode>
@@ -4687,6 +4687,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -4714,8 +4716,6 @@
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemShortName>Mac OS</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
index 418323f2da..050f358af4 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
@@ -70,8 +70,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -91,6 +89,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -226,8 +226,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -247,6 +245,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -351,8 +351,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -372,6 +370,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -507,8 +507,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -528,6 +526,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -632,8 +632,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -653,6 +651,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>North America</continent>
<continentCode>amn</continentCode>
@@ -788,8 +788,6 @@
<operatingSystemCode>UNK</operatingSystemCode>
<operatingSystemShortName>Unknown</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -809,6 +807,8 @@
</row>
</pluginsIcons>
<deviceType>Unknown</deviceType>
+ <browserFamily />
+ <browserFamilyDescription>Unknown</browserFamilyDescription>
<events>1</events>
<continent>North America</continent>
<continentCode>amn</continentCode>
@@ -905,8 +905,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -926,6 +924,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index 4a139199b8..6f86215248 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -60,8 +60,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -81,6 +79,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>North America</continent>
<continentCode>amn</continentCode>
@@ -208,8 +208,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -229,6 +227,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
@@ -333,8 +333,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -354,6 +352,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
@@ -472,8 +472,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -493,6 +491,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -597,8 +597,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -618,6 +616,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -753,8 +753,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -774,6 +772,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -878,8 +878,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -899,6 +897,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
index 2eca0be188..e9caa3ba66 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
@@ -101,8 +101,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -122,6 +120,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
@@ -226,8 +226,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -247,6 +245,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
@@ -382,8 +382,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -403,6 +401,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -521,8 +521,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -542,6 +540,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -646,8 +646,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -667,6 +665,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -771,8 +771,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -792,6 +790,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -886,8 +886,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -907,6 +905,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>North America</continent>
<continentCode>amn</continentCode>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index 4a139199b8..6f86215248 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -60,8 +60,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -81,6 +79,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>North America</continent>
<continentCode>amn</continentCode>
@@ -208,8 +208,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -229,6 +227,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
@@ -333,8 +333,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -354,6 +352,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
@@ -472,8 +472,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -493,6 +491,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -597,8 +597,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -618,6 +616,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -753,8 +753,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -774,6 +772,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -878,8 +878,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -899,6 +897,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index e61cd4312d..fc8478d9b3 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -60,8 +60,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -81,6 +79,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>North America</continent>
<continentCode>amn</continentCode>
@@ -208,8 +208,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -229,6 +227,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
@@ -333,8 +333,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -354,6 +352,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
@@ -472,8 +472,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -493,6 +491,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -597,8 +597,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -618,6 +616,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -753,8 +753,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -774,6 +772,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -878,8 +878,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -899,6 +897,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -1017,8 +1017,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1038,6 +1036,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -1142,8 +1142,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1163,6 +1161,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -1298,8 +1298,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -1319,6 +1317,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>1</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index 1d25407bb8..d8a06d259e 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
@@ -52,6 +52,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -79,8 +81,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -240,6 +240,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -267,8 +269,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
index a7fdbfae5e..d6cf0ea497 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
@@ -50,8 +50,6 @@
<operatingSystemCode>BOT</operatingSystemCode>
<operatingSystemShortName>BOT</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Inconnu</browserFamilyDescription>
<browserName>Inconnu</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -71,6 +69,8 @@
</row>
</pluginsIcons>
<deviceType>Inconnu</deviceType>
+ <browserFamily />
+ <browserFamilyDescription>Inconnu</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
@@ -157,8 +157,6 @@
<operatingSystemCode>BOT</operatingSystemCode>
<operatingSystemShortName>BOT</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
- <browserFamily>unknown</browserFamily>
- <browserFamilyDescription>Inconnu</browserFamilyDescription>
<browserName>Inconnu</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -178,6 +176,8 @@
</row>
</pluginsIcons>
<deviceType>Inconnu</deviceType>
+ <browserFamily />
+ <browserFamilyDescription>Inconnu</browserFamilyDescription>
<events>0</events>
<continent>Europe</continent>
<continentCode>eur</continentCode>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
index 6b02eec11b..d40e18c7d9 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
@@ -46,6 +46,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -73,8 +75,6 @@
<operatingSystemCode>WVI</operatingSystemCode>
<operatingSystemShortName>Win Vista</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
- <browserFamily>ie</browserFamily>
- <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 7.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
@@ -139,6 +139,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -166,8 +168,6 @@
<operatingSystemCode>WVI</operatingSystemCode>
<operatingSystemShortName>Win Vista</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
- <browserFamily>ie</browserFamily>
- <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 7.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
@@ -232,6 +232,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Trident</browserFamily>
+ <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -259,8 +261,6 @@
<operatingSystemCode>WVI</operatingSystemCode>
<operatingSystemShortName>Win Vista</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
- <browserFamily>ie</browserFamily>
- <browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 7.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
index 5296c6ff47..35533fdac6 100644
--- a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
@@ -41,6 +41,8 @@
<customVariables>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -68,8 +70,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index cb454743aa..07c7ec672a 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -88,12 +88,6 @@ 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%
-Browser Family
-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%
-Gecko (Firefox),1,2,0%,2,00:06:01,0%
-Presto (Opera),1,1,0%,1,00:00:00,100%
-
Browser Plugins
label,nb_visits,nb_visits_percentage
Cookie,10,100%
@@ -363,3 +357,9 @@ 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%
+Browser engines
+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%
+Gecko (Firefox),1,2,0%,2,00:06:01,0%
+Presto (Opera),1,1,0%,1,00:00:00,100%
+
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
index 46ba01f039..25de6d9057 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html
@@ -58,11 +58,6 @@
<a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);">
Browser Version
</a>
- </li>
- <li>
- <a href="#UserSettings_getBrowserType" style="text-decoration:none; color: rgb(68,68,68);">
- Browser Family
- </a>
</li>
<li>
<a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
@@ -303,6 +298,11 @@
<a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
Browser versions
</a>
+ </li>
+ <li>
+ <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: rgb(68,68,68);">
+ Browser engines
+ </a>
</li>
</ul>
<h2 id="MultiSites_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
@@ -2214,118 +2214,6 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="UserSettings_getBrowserType" style="color: rgb(126,115,99); font-size: 11pt;">
- Browser Family
-</h2>
-
- <img alt=""
- src="data:image/png;base64,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"
- height="200"
- width="700"/>
-
- <br/>
- <br/>
-
- <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 family
- </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;">
- 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;">
- Gecko (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;">
- Presto (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%
- </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="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;">
Browser Plugins
</h2>
@@ -5809,5 +5697,117 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
+<h2 id="DevicesDetection_getBrowserEngines" style="color: rgb(126,115,99); font-size: 11pt;">
+ Browser engines
+</h2>
+
+ <img alt=""
+ src="data:image/png;base64,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"
+ height="200"
+ width="700"/>
+
+ <br/>
+ <br/>
+
+ <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 engine
+ </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;">
+ 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;">
+ Gecko (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;">
+ Presto (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%
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <br/>
+ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+ Back to top
+ </a>
</body>
</html>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index 8e8c6e7cd1..c90b14ec26 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -58,11 +58,6 @@
<a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);">
Browser Version
</a>
- </li>
- <li>
- <a href="#UserSettings_getBrowserType" style="text-decoration:none; color: rgb(68,68,68);">
- Browser Family
- </a>
</li>
<li>
<a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
@@ -313,6 +308,11 @@
<a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
Browser versions
</a>
+ </li>
+ <li>
+ <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: rgb(68,68,68);">
+ Browser engines
+ </a>
</li>
</ul>
<h2 id="MultiSites_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
@@ -2176,112 +2176,6 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="UserSettings_getBrowserType" style="color: rgb(126,115,99); font-size: 11pt;">
- Browser Family
-</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;">
- Browser family
- </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;">
- 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;">
- Gecko (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;">
- Presto (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%
- </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="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;">
Browser Plugins
</h2>
@@ -5559,5 +5453,111 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
+<h2 id="DevicesDetection_getBrowserEngines" style="color: rgb(126,115,99); font-size: 11pt;">
+ Browser engines
+</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;">
+ Browser engine
+ </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;">
+ 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;">
+ Gecko (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;">
+ Presto (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%
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <br/>
+ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+ Back to top
+ </a>
</body>
</html>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index 67f66e5d18..db2945b307 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -155,8 +155,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -485,8 +485,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index bf003f9781..69bb6fd4f6 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -83,10 +83,6 @@ 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%
-Browser Family
-label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
-Gecko (Firefox),5,16,80%,3.2,00:22:49,20%
-
Browser Plugins
label,nb_visits,nb_visits_percentage
Cookie,5,100%
@@ -508,3 +504,7 @@ Browser versions
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%
+Browser engines
+label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
+Gecko (Firefox),5,16,80%,3.2,00:22:49,20%
+
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
index 1afd49dd9c..b92f3087c5 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html
@@ -58,11 +58,6 @@
<a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);">
Browser Version
</a>
- </li>
- <li>
- <a href="#UserSettings_getBrowserType" style="text-decoration:none; color: rgb(68,68,68);">
- Browser Family
- </a>
</li>
<li>
<a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
@@ -363,6 +358,11 @@
<a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
Browser versions
</a>
+ </li>
+ <li>
+ <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: rgb(68,68,68);">
+ Browser engines
+ </a>
</li>
</ul>
<h2 id="MultiSites_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
@@ -2151,72 +2151,6 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="UserSettings_getBrowserType" style="color: rgb(126,115,99); font-size: 11pt;">
- Browser Family
-</h2>
-
- <img alt=""
- src="data:image/png;base64,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"
- height="200"
- width="700"/>
-
- <br/>
- <br/>
-
- <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 family
- </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;">
- Gecko (Firefox) </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;">
- 16
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 3.2
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 00:22:49
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 20%
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 80%
- </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="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;">
Browser Plugins
</h2>
@@ -7309,5 +7243,71 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
+<h2 id="DevicesDetection_getBrowserEngines" style="color: rgb(126,115,99); font-size: 11pt;">
+ Browser engines
+</h2>
+
+ <img alt=""
+ src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArwAAADICAIAAACF9KXqAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAGT0lEQVR4nO3dPW4jZQDHYQclTSSUEq0CilZzA9gWij0AEgegokeioeAAiI4TcApajkBOgEYpIEEgGkBKk2IojJzJzNj+j7/eSfw8xSqOx+N3k0zeX+bDPmmaZgYAsM47pQcAADwPogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIadqyqqsFPDn5+9aMAYFJEw4HUdZ3fqyEAmKDT0gN4Zr794efOZ7754k37Zl3XVVW1I6BzEwCeKdEwzi+//vPw8LC4eXZ2dnt7e3l5ufaB/ZJYfNzpjPldiwXm97YX3u5/AAAbEg2j3d/fLz6+uLi4u7tLoqFtRUDMhhrCfgsApsA5DbvX3jeQzPGjIkAxAFCKaChgXhXh2Y6jFgaA/XF4YrTz8/PtVzLfYTBPgXBXRLgwAOyJaBjns7fV3e3t2sUWRyiSKy3zXQ4z5zQAUI5oGOfTT65ms6stVzJq4lcJAEyEaCigfxXl4AUUyxY+zCABoOOkaZrSYwAAngFXTwAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBAxCtCPvLCi1CQDRCKa78Y8eACouF/nbd48I4PcEg2QCgu2e4cngDKkwhQVljq9jQAANEhQtEATMXa46nA/iSHCEUDMBWLX1LOaYBpck4DABARDUB57YOpwGSdNE1TegxT4TJxKMgGCGUl26BoAAAiDk8AABHRAABERAMAEBENAEBENAAAEdEAAEREQ9f19XXpIcDxsgFCQWs3QNEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQOS09ACm6Lc//i09BDhSf/39YANk595/793SQ3ghRMOAL7/7qfQQ4Ij9+HvpEfDSfP/126tXF6VH8RI4PAEAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQEQ0AAAR0QAARHYQDVVVHfiB/fXkq9rVkwLAsTnt3G7PqXVd7++Jq6qar78zi9d1vbhr1HpCY9cPAMw9iYbObHqwybXzLGZ0AHauv6fZdDPWYzT0E2Fxs7/7YdlO/sH9B/3vyuocaa+kvWNg2TDm/86XbC/Qfpb2x3Y2ABwnv/m31D080dff/TB7+nVfTNWdyX7ZGkZZvc5OUvQX6GQHALCx4WhYdMD+zi0YfLr+M5rsAdiVg52391INR0PncMDaKw62/FM+fOwGFz7YzQDAXGcuMDtsYP3hidnQF7q/wAG++hus3+EJANiVx9dp6JxIuMyyZcKH74qXWwCAA3uyp2Fw4u9flTBbMmcv/qYffMjgkvlAw3UOPsWKKykAOBJ++W+ve3hi8As6OEMPrq59WWM4ghUrT06KbH9yxfJ+UACO3No/PlkrOqdhH0qdaqA0AY6W3/9bKvmGVUW+eX5iAGAz3uUSAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgIhoAgIhoAAAiogEAiIgGACAiGgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAgclp6AFP01edvSg8BjtTNzc3r169Lj4KX5urVRekhvBCiYcDHH35QeghwpM6bPz+yAcJUOTwBAEREAwAQEQ0AQEQ0AAAR0QAAREQDABARDQBARDQAABHRAABERAMAEBENAEBENAAAEdEAAEREAwAQEQ0AQOSkaZrSYwAAngF7GgCAiGgAACKiAQCIiAYAICIaAICIaAAAIqIBAIiIBgAg8h9EvxDrqNKeOwAAAABJRU5ErkJggg=="
+ height="200"
+ width="700"/>
+
+ <br/>
+ <br/>
+
+ <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 engine
+ </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;">
+ Gecko (Firefox) </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;">
+ 16
+ </td>
+ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+ 3.2
+ </td>
+ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+ 00:22:49
+ </td>
+ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+ 20%
+ </td>
+ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+ 80%
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <br/>
+ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+ Back to top
+ </a>
</body>
</html>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index 8283259e33..9e378969e3 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -58,11 +58,6 @@
<a href="#UserSettings_getBrowserVersion" style="text-decoration:none; color: rgb(68,68,68);">
Browser Version
</a>
- </li>
- <li>
- <a href="#UserSettings_getBrowserType" style="text-decoration:none; color: rgb(68,68,68);">
- Browser Family
- </a>
</li>
<li>
<a href="#UserSettings_getPlugin" style="text-decoration:none; color: rgb(68,68,68);">
@@ -373,6 +368,11 @@
<a href="#DevicesDetection_getBrowserVersions" style="text-decoration:none; color: rgb(68,68,68);">
Browser versions
</a>
+ </li>
+ <li>
+ <a href="#DevicesDetection_getBrowserEngines" style="text-decoration:none; color: rgb(68,68,68);">
+ Browser engines
+ </a>
</li>
</ul>
<h2 id="MultiSites_getAll" style="color: rgb(126,115,99); font-size: 11pt;">
@@ -2113,66 +2113,6 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
-<h2 id="UserSettings_getBrowserType" style="color: rgb(126,115,99); font-size: 11pt;">
- Browser Family
-</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;">
- Browser family
- </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;">
- Gecko (Firefox) </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;">
- 16
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 3.2
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 00:22:49
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 20%
- </td>
- <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
- 80%
- </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="UserSettings_getPlugin" style="color: rgb(126,115,99); font-size: 11pt;">
Browser Plugins
</h2>
@@ -6981,5 +6921,65 @@
<a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
Back to top
</a>
+<h2 id="DevicesDetection_getBrowserEngines" style="color: rgb(126,115,99); font-size: 11pt;">
+ Browser engines
+</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;">
+ Browser engine
+ </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;">
+ Gecko (Firefox) </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;">
+ 16
+ </td>
+ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+ 3.2
+ </td>
+ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+ 00:22:49
+ </td>
+ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+ 20%
+ </td>
+ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
+ 80%
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <br/>
+ <a style="text-decoration:none; color: rgb(126,115,99); font-size: 9pt;" href="#reportTop">
+ Back to top
+ </a>
</body>
</html>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index 01a4eafd3a..b5052f4f74 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -49,6 +49,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -76,8 +78,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -164,6 +164,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -191,8 +193,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -339,6 +339,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -366,8 +368,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.6</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index 92fc87dd8c..0725631cd9 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -92,6 +92,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -119,8 +121,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
@@ -208,6 +208,8 @@
</row>
</customVariables>
<deviceType>Desktop</deviceType>
+ <browserFamily>Gecko</browserFamily>
+ <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<events>0</events>
<provider>Unknown</provider>
<providerName>Unknown</providerName>
@@ -235,8 +237,6 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 3.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
--
GitLab