diff --git a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
index b2b6060740c8964cdc3c1988bf440fabfbd70a84..b499959f782c68e89734b7384510eb0ec89b7847 100644
--- a/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
+++ b/tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
@@ -188,6 +188,7 @@ class ManyVisitsWithGeoIP extends Fixture
$t->setLongitude(2);
$t->setUrl("http://piwik.net/grue/lair");
$t->setUrlReferrer('http://google.com/?q=Wikileaks FTW');
+ $t->setUserAgent("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-GB; rv:1.9.2.6) AppleWebKit/522+ (KHTML, like Gecko) Safari/419.3 (.NET CLR 3.5.30729)");
self::checkResponse($t->doTrackPageView('It\'s pitch black...'));
}
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 6d211f017272e437135aea2ed51400492e21e122..188f7cb3c254e8364e056e002a57dc6c4111c1e4 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -60,10 +60,10 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
- <browserCode>FF</browserCode>
- <browserVersion>3.6</browserVersion>
+ <browserName>Safari </browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserCode>SF</browserCode>
+ <browserVersion />
<screenType>normal</screenType>
<resolution>1024x768</resolution>
<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -79,8 +79,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<continent>North America</continent>
<continentCode>amn</continentCode>
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
index 8626ac313be041a3481887e776a6c5b6cee02b55..5ffae0691ebe1530488a0886c6a44e2ca7056249 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__API.getSuggestedValuesForSegment.xml
@@ -2,4 +2,5 @@
<result>
<row>FF</row>
<row>UNK</row>
+ <row>SF</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
index 5d07770e4ef0bcb20ddf062d1525342947c48868..e2373a1ef1de687f3f8126f4e7d097f4188cb469 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserCode__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>28</nb_visits>
- <nb_actions>48</nb_actions>
- <nb_visits_converted>28</nb_visits_converted>
- <bounce_count>15</bounce_count>
+ <nb_visits>27</nb_visits>
+ <nb_actions>47</nb_actions>
+ <nb_visits_converted>27</nb_visits_converted>
+ <bounce_count>14</bounce_count>
<sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>54%</bounce_rate>
+ <bounce_rate>52%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>585</avg_time_on_site>
+ <avg_time_on_site>607</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
index d8bcdace18e8112b2726ba46257b048d489879f9..dfa3a2062361e1f2127a84e9e33202e73a513ee2 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>0</nb_visits>
- <nb_actions>0</nb_actions>
- <nb_visits_converted>0</nb_visits_converted>
- <bounce_count>0</bounce_count>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <nb_visits_converted>1</nb_visits_converted>
+ <bounce_count>1</bounce_count>
<sum_visit_length>0</sum_visit_length>
- <max_actions>0</max_actions>
- <bounce_rate>0%</bounce_rate>
- <nb_actions_per_visit>0</nb_actions_per_visit>
+ <max_actions>1</max_actions>
+ <bounce_rate>100%</bounce_rate>
+ <nb_actions_per_visit>1</nb_actions_per_visit>
<avg_time_on_site>0</avg_time_on_site>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
index 5d07770e4ef0bcb20ddf062d1525342947c48868..e2373a1ef1de687f3f8126f4e7d097f4188cb469 100644
--- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserVersion__VisitsSummary.get_range.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <nb_visits>28</nb_visits>
- <nb_actions>48</nb_actions>
- <nb_visits_converted>28</nb_visits_converted>
- <bounce_count>15</bounce_count>
+ <nb_visits>27</nb_visits>
+ <nb_actions>47</nb_actions>
+ <nb_visits_converted>27</nb_visits_converted>
+ <bounce_count>14</bounce_count>
<sum_visit_length>16393</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>54%</bounce_rate>
+ <bounce_rate>52%</bounce_rate>
<nb_actions_per_visit>1.7</nb_actions_per_visit>
- <avg_time_on_site>585</avg_time_on_site>
+ <avg_time_on_site>607</avg_time_on_site>
</result>
\ No newline at end of file
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 aefb7fd5a5f79d8b23e18d078a4d151ae172dad9..46e7e63638d5a572e63c43791c7ab0e8d6b481c0 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
@@ -60,10 +60,10 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
- <browserCode>FF</browserCode>
- <browserVersion>3.6</browserVersion>
+ <browserName>Safari </browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserCode>SF</browserCode>
+ <browserVersion />
<screenType>normal</screenType>
<resolution>1024x768</resolution>
<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -79,8 +79,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<continent>North America</continent>
<continentCode>amn</continentCode>
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 04e4cca4b757e90e7517c4f9023e28d9f84eed76..aa243bc1016477d1229c05a2b05c5143abfe880e 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
@@ -886,10 +886,10 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
- <browserCode>FF</browserCode>
- <browserVersion>3.6</browserVersion>
+ <browserName>Safari </browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserCode>SF</browserCode>
+ <browserVersion />
<screenType>normal</screenType>
<resolution>1024x768</resolution>
<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -905,8 +905,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<continent>North America</continent>
<continentCode>amn</continentCode>
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 aefb7fd5a5f79d8b23e18d078a4d151ae172dad9..46e7e63638d5a572e63c43791c7ab0e8d6b481c0 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
@@ -60,10 +60,10 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
- <browserCode>FF</browserCode>
- <browserVersion>3.6</browserVersion>
+ <browserName>Safari </browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserCode>SF</browserCode>
+ <browserVersion />
<screenType>normal</screenType>
<resolution>1024x768</resolution>
<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -79,8 +79,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<continent>North America</continent>
<continentCode>amn</continentCode>
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 30ea0c1565d6bc490fa7b164c522038b8289ba2e..51741a69bc7f01704e5ee1d6b5c8ad9f45b696e8 100644
--- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -60,10 +60,10 @@
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemShortName>Win XP</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
- <browserName>Firefox 3.6</browserName>
- <browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
- <browserCode>FF</browserCode>
- <browserVersion>3.6</browserVersion>
+ <browserName>Safari </browserName>
+ <browserIcon>plugins/UserSettings/images/browsers/SF.gif</browserIcon>
+ <browserCode>SF</browserCode>
+ <browserVersion />
<screenType>normal</screenType>
<resolution>1024x768</resolution>
<screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon>
@@ -79,8 +79,8 @@
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType>
- <browserFamily>Gecko</browserFamily>
- <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
+ <browserFamily>WebKit</browserFamily>
+ <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<events>0</events>
<continent>North America</continent>
<continentCode>amn</continentCode>