From e2ce5cd0bc284f9cef6d337d6689b3d88c72e7e5 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Sun, 23 Nov 2014 23:38:37 +0100
Subject: [PATCH] a visitor now has a browser, browser name and browser version
attribute, so it's clear what it's containing.
---
plugins/DevicesDetection/DevicesDetection.php | 3 +-
plugins/DevicesDetection/Visitor.php | 5 +
...ITest__Live.getLastVisitsDetails_range.xml | 89 +++++++++-----
...mEvents__Live.getLastVisitsDetails_day.xml | 30 +++--
...vents__Live.getLastVisitsDetails_month.xml | 30 +++--
...icesDetection.getBrowserFamilies_month.xml | 52 ++++++---
...gs__DevicesDetection.getBrowsers_month.xml | 52 ++++++---
...tLogs__Live.getLastVisitsDetails_range.xml | 110 ++++++++++++------
...ortLogs__UserSettings.getBrowser_month.xml | 52 ++++++---
...itAsc__Live.getLastVisitsDetails_month.xml | 19 ++-
...Visit__Live.getLastVisitsDetails_month.xml | 19 ++-
...Count__Live.getLastVisitsDetails_month.xml | 19 ++-
...tDesc__Live.getLastVisitsDetails_month.xml | 19 ++-
...eTest__Live.getLastVisitsDetails_month.xml | 28 +++--
...Support__Live.getLastVisitsDetails_day.xml | 6 +-
...ecified__Live.getLastVisitsDetails_day.xml | 2 +
...eDays__Live.getLastVisitsDetails_month.xml | 9 +-
...nesTest__Live.getLastVisitsDetails_day.xml | 3 +-
...vExport__Live.getLastVisitsDetails_day.csv | Bin 7616 -> 7680 bytes
...Ordered__Live.getLastVisitsDetails_day.xml | 6 +-
...thItems__Live.getLastVisitsDetails_day.xml | 9 +-
...tadataAndNormalAPI__Live.getLastVisits.xml | 9 +-
...alAPI__Live.getLastVisitsDetails_range.xml | 9 +-
...taAndNormalAPI__Live.getVisitorProfile.xml | 6 +-
24 files changed, 409 insertions(+), 177 deletions(-)
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 59296b2fc5..312bca614f 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -54,7 +54,8 @@ class DevicesDetection extends \Piwik\Plugin
$visitor['operatingSystemIcon'] = $instance->getOperatingSystemIcon();
$visitor['browserFamily'] = $instance->getBrowserEngine();
$visitor['browserFamilyDescription'] = $instance->getBrowserEngineDescription();
- $visitor['browserName'] = $instance->getBrowser();
+ $visitor['browser'] = $instance->getBrowser();
+ $visitor['browserName'] = $instance->getBrowserName();
$visitor['browserIcon'] = $instance->getBrowserIcon();
$visitor['browserCode'] = $instance->getBrowserCode();
$visitor['browserVersion'] = $instance->getBrowserVersion();
diff --git a/plugins/DevicesDetection/Visitor.php b/plugins/DevicesDetection/Visitor.php
index a75c0c6b0d..aa5b16c2ae 100644
--- a/plugins/DevicesDetection/Visitor.php
+++ b/plugins/DevicesDetection/Visitor.php
@@ -60,6 +60,11 @@ class Visitor
}
public function getBrowser()
+ {
+ return getBrowserNameWithVersion($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']);
+ }
+
+ public function getBrowserName()
{
return getBrowserName($this->details['config_browser_name'] . ";" . $this->details['config_browser_version']);
}
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index 3d7365dfe3..121915e8e4 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -76,6 +76,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>Safari</browser>
<browserName>Safari</browserName>
<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
@@ -223,7 +224,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -347,7 +349,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -485,7 +488,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -609,7 +613,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -764,7 +769,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -888,7 +894,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1026,7 +1033,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1150,7 +1158,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1305,7 +1314,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1429,7 +1439,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1567,7 +1578,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1705,6 +1717,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -1821,7 +1834,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1945,6 +1959,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -2100,7 +2115,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -2255,6 +2271,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -2371,7 +2388,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -2495,6 +2513,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -2633,7 +2652,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -2771,7 +2791,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -2909,6 +2930,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -3039,7 +3061,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -3163,7 +3186,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -3287,7 +3311,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -3411,6 +3436,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -3535,7 +3561,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -3690,7 +3717,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -3845,7 +3873,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -4000,6 +4029,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -4147,7 +4177,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -4271,7 +4302,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -4395,7 +4427,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -4519,7 +4552,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -4643,7 +4677,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
index 86ce747a7a..9317026f72 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml
@@ -51,7 +51,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -152,7 +153,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -321,7 +323,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -422,7 +425,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -758,7 +762,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -859,7 +864,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -956,7 +962,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1121,7 +1128,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1218,7 +1226,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1550,7 +1559,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
index 86ce747a7a..9317026f72 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml
@@ -51,7 +51,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -152,7 +153,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -321,7 +323,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -422,7 +425,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -758,7 +762,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -859,7 +864,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -956,7 +962,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1121,7 +1128,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1218,7 +1226,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1550,7 +1559,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
index 77308fd9e7..8723d1a05f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml
@@ -14,27 +14,39 @@
</row>
<row>
<label>Chrome</label>
- <nb_visits>10</nb_visits>
- <nb_actions>13</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>8</bounce_count>
- <nb_visits_converted>9</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
</row>
<row>
- <label>Unknown</label>
- <nb_visits>7</nb_visits>
- <nb_actions>7</nb_actions>
+ <label>Epiphany</label>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>7</bounce_count>
- <nb_visits_converted>6</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+ </row>
+ <row>
+ <label>RockMelt</label>
+ <nb_visits>5</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>305</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>4</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
</row>
<row>
<label>Android Browser</label>
@@ -60,4 +72,16 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
</row>
+ <row>
+ <label>Unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
index 77308fd9e7..8723d1a05f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml
@@ -14,27 +14,39 @@
</row>
<row>
<label>Chrome</label>
- <nb_visits>10</nb_visits>
- <nb_actions>13</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>8</bounce_count>
- <nb_visits_converted>9</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
</row>
<row>
- <label>Unknown</label>
- <nb_visits>7</nb_visits>
- <nb_actions>7</nb_actions>
+ <label>Epiphany</label>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>7</bounce_count>
- <nb_visits_converted>6</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+ </row>
+ <row>
+ <label>RockMelt</label>
+ <nb_visits>5</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>305</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>4</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
</row>
<row>
<label>Android Browser</label>
@@ -60,4 +72,16 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
</row>
+ <row>
+ <label>Unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
index ee26c7f701..dd6812feea 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml
@@ -67,7 +67,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/W81.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
- <browserName>Chrome 33.0</browserName>
+ <browser>Chrome 33.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>33.0</browserVersion>
@@ -204,7 +205,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
- <browserName>Internet Explorer 8.0</browserName>
+ <browser>Internet Explorer 8.0</browser>
+ <browserName>Internet Explorer</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>8.0</browserVersion>
@@ -316,7 +318,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
- <browserName>Chrome 34.0</browserName>
+ <browser>Chrome 34.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>34.0</browserVersion>
@@ -461,7 +464,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Safari 7.0</browserName>
+ <browser>Safari 7.0</browser>
+ <browserName>Safari</browserName>
<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
<browserVersion>7.0</browserVersion>
@@ -575,7 +579,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
- <browserName>Chrome 33.0</browserName>
+ <browser>Chrome 33.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>33.0</browserVersion>
@@ -700,7 +705,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
- <browserName>Chrome 33.0</browserName>
+ <browser>Chrome 33.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>33.0</browserVersion>
@@ -832,7 +838,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Safari 7.0</browserName>
+ <browser>Safari 7.0</browser>
+ <browserName>Safari</browserName>
<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
<browserVersion>7.0</browserVersion>
@@ -953,7 +960,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 27.0</browserName>
+ <browser>Firefox 27.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>27.0</browserVersion>
@@ -1066,7 +1074,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 27.0</browserName>
+ <browser>Firefox 27.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>27.0</browserVersion>
@@ -1234,7 +1243,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI8.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 27.0</browserName>
+ <browser>Firefox 27.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>27.0</browserVersion>
@@ -1351,7 +1361,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
- <browserName>Chrome 33.0</browserName>
+ <browser>Chrome 33.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>33.0</browserVersion>
@@ -1476,7 +1487,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Blink</browserFamily>
<browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription>
- <browserName>Chrome 33.0</browserName>
+ <browser>Chrome 33.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>33.0</browserVersion>
@@ -1759,6 +1771,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -1874,7 +1887,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
- <browserName>Internet Explorer 6.0</browserName>
+ <browser>Internet Explorer 6.0</browser>
+ <browserName>Internet Explorer</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>6.0</browserVersion>
@@ -1990,7 +2004,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Chrome 11.0</browserName>
+ <browser>Chrome 11.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>11.0</browserVersion>
@@ -2122,7 +2137,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>RockMelt 0.9</browserName>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
@@ -2246,7 +2262,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>RockMelt 0.9</browserName>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
@@ -2377,7 +2394,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>RockMelt 0.9</browserName>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
@@ -2484,6 +2502,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -2591,7 +2610,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
- <browserName>Internet Explorer 9.0</browserName>
+ <browser>Internet Explorer 9.0</browser>
+ <browserName>Internet Explorer</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
@@ -2688,6 +2708,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -2795,6 +2816,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>Android Browser</browser>
<browserName>Android Browser</browserName>
<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
<browserCode>AN</browserCode>
@@ -2902,7 +2924,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>RockMelt 0.9</browserName>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
@@ -3005,7 +3028,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Chrome 20.0</browserName>
+ <browser>Chrome 20.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>20.0</browserVersion>
@@ -3108,7 +3132,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Epiphany 2.30</browserName>
+ <browser>Epiphany 2.30</browser>
+ <browserName>Epiphany</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
@@ -3211,7 +3236,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Chrome 20.0</browserName>
+ <browser>Chrome 20.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>20.0</browserVersion>
@@ -3314,7 +3340,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Epiphany 2.30</browserName>
+ <browser>Epiphany 2.30</browser>
+ <browserName>Epiphany</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
@@ -3417,7 +3444,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
- <browserName>Internet Explorer 9.0</browserName>
+ <browser>Internet Explorer 9.0</browser>
+ <browserName>Internet Explorer</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
@@ -3520,7 +3548,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Epiphany 2.30</browserName>
+ <browser>Epiphany 2.30</browser>
+ <browserName>Epiphany</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
@@ -3623,7 +3652,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
- <browserName>Internet Explorer 9.0</browserName>
+ <browser>Internet Explorer 9.0</browser>
+ <browserName>Internet Explorer</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
@@ -3726,7 +3756,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
- <browserName>Internet Explorer 9.0</browserName>
+ <browser>Internet Explorer 9.0</browser>
+ <browserName>Internet Explorer</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
@@ -3829,7 +3860,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Chrome 19.0</browserName>
+ <browser>Chrome 19.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>19.0</browserVersion>
@@ -3932,7 +3964,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 6.0</browserName>
+ <browser>Firefox 6.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>6.0</browserVersion>
@@ -4035,7 +4068,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Chrome 19.0</browserName>
+ <browser>Chrome 19.0</browser>
+ <browserName>Chrome</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>19.0</browserVersion>
@@ -4138,7 +4172,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Epiphany 2.30</browserName>
+ <browser>Epiphany 2.30</browser>
+ <browserName>Epiphany</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
@@ -4241,7 +4276,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
- <browserName>Internet Explorer 9.0</browserName>
+ <browser>Internet Explorer 9.0</browser>
+ <browserName>Internet Explorer</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
@@ -4344,7 +4380,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 6.0</browserName>
+ <browser>Firefox 6.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>6.0</browserVersion>
@@ -4447,7 +4484,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>Epiphany 2.30</browserName>
+ <browser>Epiphany 2.30</browser>
+ <browserName>Epiphany</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
@@ -4550,6 +4588,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>Android Browser</browser>
<browserName>Android Browser</browserName>
<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
<browserCode>AN</browserCode>
@@ -4653,7 +4692,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
- <browserName>RockMelt 0.9</browserName>
+ <browser>RockMelt 0.9</browser>
+ <browserName>RockMelt</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
index 77308fd9e7..8723d1a05f 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
@@ -14,27 +14,39 @@
</row>
<row>
<label>Chrome</label>
- <nb_visits>10</nb_visits>
- <nb_actions>13</nb_actions>
- <max_actions>3</max_actions>
- <sum_visit_length>305</sum_visit_length>
- <bounce_count>8</bounce_count>
- <nb_visits_converted>9</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
</row>
<row>
- <label>Unknown</label>
- <nb_visits>7</nb_visits>
- <nb_actions>7</nb_actions>
+ <label>Epiphany</label>
+ <nb_visits>5</nb_visits>
+ <nb_actions>5</nb_actions>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>7</bounce_count>
- <nb_visits_converted>6</nb_visits_converted>
- <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
+ <bounce_count>5</bounce_count>
+ <nb_visits_converted>5</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
- <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ <logo>plugins/UserSettings/images/browsers/EP.gif</logo>
+ </row>
+ <row>
+ <label>RockMelt</label>
+ <nb_visits>5</nb_visits>
+ <nb_actions>8</nb_actions>
+ <max_actions>3</max_actions>
+ <sum_visit_length>305</sum_visit_length>
+ <bounce_count>3</bounce_count>
+ <nb_visits_converted>4</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/UserSettings/images/browsers/CH.gif</logo>
</row>
<row>
<label>Android Browser</label>
@@ -60,4 +72,16 @@
<sum_daily_nb_users>0</sum_daily_nb_users>
<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
</row>
+ <row>
+ <label>Unknown</label>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>1</nb_visits_converted>
+ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
+ <sum_daily_nb_users>0</sum_daily_nb_users>
+ <logo>plugins/UserSettings/images/browsers/UNK.gif</logo>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
index 79315654ce..1e9d9ac92f 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml
@@ -86,7 +86,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -239,7 +240,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -361,7 +363,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -514,7 +517,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -636,7 +640,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -789,6 +794,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Unknown</browserFamilyDescription>
+ <browser>Unknown</browser>
<browserName>Unknown</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -903,7 +909,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
index 2f00d3cd77..a1a7876269 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml
@@ -76,6 +76,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>Safari</browser>
<browserName>Safari</browserName>
<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
@@ -223,7 +224,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -347,7 +349,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -485,7 +488,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -609,7 +613,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -764,7 +769,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -888,7 +894,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
index 7f8dddd7a1..d8315dbc59 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml
@@ -117,7 +117,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -241,7 +242,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -396,7 +398,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -534,7 +537,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -658,7 +662,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -782,7 +787,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -896,6 +902,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>Safari</browser>
<browserName>Safari</browserName>
<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
index 2f00d3cd77..a1a7876269 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml
@@ -76,6 +76,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>Safari</browser>
<browserName>Safari</browserName>
<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
@@ -223,7 +224,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -347,7 +349,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -485,7 +488,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -609,7 +613,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -764,7 +769,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -888,7 +894,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index 7067235f94..e5c58280d5 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -76,6 +76,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>WebKit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
+ <browser>Safari</browser>
<browserName>Safari</browserName>
<browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
<browserCode>SF</browserCode>
@@ -223,7 +224,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -347,7 +349,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -485,7 +488,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -609,7 +613,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -764,7 +769,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -888,7 +894,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1026,7 +1033,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1150,7 +1158,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -1305,7 +1314,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index 944daf39ae..b0e326e03d 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
@@ -57,7 +57,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -244,7 +245,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
index 776c8c759d..884a614a5b 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
@@ -46,6 +46,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Inconnu</browserFamilyDescription>
+ <browser>Inconnu</browser>
<browserName>Inconnu</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
@@ -152,6 +153,7 @@
<operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon>
<browserFamily />
<browserFamilyDescription>Inconnu</browserFamilyDescription>
+ <browser>Inconnu</browser>
<browserName>Inconnu</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserCode>UNK</browserCode>
diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
index 806d4dab4c..dfaee585ef 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
@@ -51,7 +51,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
- <browserName>Internet Explorer 7.0</browserName>
+ <browser>Internet Explorer 7.0</browser>
+ <browserName>Internet Explorer</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>7.0</browserVersion>
@@ -143,7 +144,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
- <browserName>Internet Explorer 7.0</browserName>
+ <browser>Internet Explorer 7.0</browser>
+ <browserName>Internet Explorer</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>7.0</browserVersion>
@@ -235,7 +237,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
<browserFamily>Trident</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
- <browserName>Internet Explorer 7.0</browserName>
+ <browser>Internet Explorer 7.0</browser>
+ <browserName>Internet Explorer</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>7.0</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
index 331525c9d8..e0516433ba 100644
--- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml
@@ -46,7 +46,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv
index d96a1ac81d674911114ef7be04dd6c9caa3d14e7..5bec541cf6bc189040282c7514e506884b58fa3c 100644
GIT binary patch
delta 91
zcmX?L-C(of0n6qKEce)X-54?%iWpKE(irj?DkeJ$Sx=JC+AP3(j1`wm5!2>XqH;`_
K(wig>umS+!2^nJm
delta 52
xcmZp$Ibglv0n6qOEa%uKrwCb0c9788Y`}Yr6^T>CwE32(91}=nvxCF|Rsa&@5@rAZ
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index 9421f37e21..76f06919db 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -84,7 +84,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -294,7 +295,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index b4b6e87d13..d12d299554 100755
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -160,7 +160,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -489,7 +490,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
@@ -704,7 +706,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
index 39f98df585..53e26b56a6 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml
@@ -54,7 +54,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.0</browserName>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
@@ -168,7 +169,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.0</browserName>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
@@ -342,7 +344,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index 39f98df585..53e26b56a6 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -54,7 +54,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.0</browserName>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
@@ -168,7 +169,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.0</browserName>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
@@ -342,7 +344,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.6</browserName>
+ <browser>Firefox 3.6</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
index 6c2054d83b..8cef8c5e23 100644
--- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
+++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml
@@ -97,7 +97,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.0</browserName>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
@@ -212,7 +213,8 @@
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
- <browserName>Firefox 3.0</browserName>
+ <browser>Firefox 3.0</browser>
+ <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.0</browserVersion>
--
GitLab