diff options
28 files changed, 104 insertions, 100 deletions
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 3b09527be0..d837c1cfd8 100644 --- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -93,7 +93,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> @@ -4034,7 +4034,7 @@ <operatingSystemCode>MLD</operatingSystemCode> <operatingSystemVersion>8.0</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> @@ -4782,7 +4782,7 @@ <operatingSystemCode>MLD</operatingSystemCode> <operatingSystemVersion>8.0</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> @@ -6164,7 +6164,7 @@ <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>QQ Browser 5.0</browser> <browserName>QQ Browser</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/QQ.png</browserIcon> @@ -6772,7 +6772,7 @@ <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>QQ Browser 5.0</browser> <browserName>QQ Browser</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/QQ.png</browserIcon> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml index 6f4d6d5e7b..3be216dd9a 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml @@ -99,7 +99,7 @@ <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>GNOME Web 2.30</browser> <browserName>GNOME Web</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> @@ -224,7 +224,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -349,7 +349,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml index a76d0016f5..f6681fee01 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml @@ -449,7 +449,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -578,7 +578,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -707,7 +707,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -832,7 +832,7 @@ <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>GNOME Web 2.30</browser> <browserName>GNOME Web</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> @@ -957,7 +957,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -1082,7 +1082,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml index 6f4d6d5e7b..3be216dd9a 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml @@ -99,7 +99,7 @@ <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>GNOME Web 2.30</browser> <browserName>GNOME Web</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> @@ -224,7 +224,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -349,7 +349,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml index a76d0016f5..f6681fee01 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml @@ -449,7 +449,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -578,7 +578,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -707,7 +707,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -832,7 +832,7 @@ <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>GNOME Web 2.30</browser> <browserName>GNOME Web</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> @@ -957,7 +957,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -1082,7 +1082,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index 970e27f72d..053668c66f 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b47341c3334e2e4dcbb9b7616b77e558b39430675dfc440ee6058f3aec9f4ce7 -size 743582 +oid sha256:5b2d70d1fc339caf961b9372fb33d3b48a472e26ea0fd6e08dbcb6e9c50e1647 +size 742857 diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index b1f499e102..cfd735ca96 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -395,7 +395,7 @@ function getBrowserEngineName($engineName) { 'Gecko' => 'Gecko (Firefox)', 'KHTML' => 'KHTML (Konqueror)', 'Presto' => 'Presto (Opera)', - 'WebKit' => 'WebKit (Safari, Chrome)', + 'WebKit' => 'WebKit (Safari)', 'Blink' => 'Blink (Chrome, Opera)' ); diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json index d7798e8c37..b2fb4685b8 100755 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json @@ -1,7 +1,7 @@ { "log_visit": [ { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -1704,7 +1704,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -3410,7 +3410,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json index cbb846da04..56cd43eca9 100755 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json @@ -1,7 +1,7 @@ { "log_visit": [ { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json index a0e21a694a..7bfd99da00 100755 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json @@ -1,7 +1,7 @@ { "log_visit": [ { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -1686,7 +1686,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -3346,7 +3346,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", diff --git a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json index 0756d2e5a8..5bd57a980d 100755 --- a/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json +++ b/plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json @@ -1,7 +1,7 @@ { "log_visit": [ { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -1704,7 +1704,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -3410,7 +3410,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", diff --git a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json index d4ad464d50..17aeb7df75 100755 --- a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json +++ b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json @@ -1,7 +1,7 @@ { "log_visit": [ { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -1658,7 +1658,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -3318,7 +3318,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -4978,7 +4978,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -6638,7 +6638,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -8295,7 +8295,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", @@ -9952,7 +9952,7 @@ "visitor_seconds_since_order": "3,600" }, { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", diff --git a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json index 53ad9eb45a..58402e67d0 100755 --- a/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json +++ b/plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json @@ -1,7 +1,7 @@ { "log_visit": [ { - "config_browser_engine": "WebKit (Safari, Chrome)", + "config_browser_engine": "WebKit (Safari)", "config_browser_name": "Chrome", "config_browser_version": "17.0", "config_client_type": "Browser", diff --git a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml index 32886b417f..5c0ed98918 100644 --- a/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml +++ b/plugins/PrivacyManager/tests/System/expected/test_allSites__Live.getLastVisitsDetails_year.xml @@ -310,7 +310,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -1866,7 +1866,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -3422,7 +3422,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -18825,7 +18825,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -24958,7 +24958,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -26514,7 +26514,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -37224,7 +37224,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> diff --git a/plugins/PrivacyManager/tests/System/expected/test_allSites_noActions__Live.getLastVisitsDetails_year.xml b/plugins/PrivacyManager/tests/System/expected/test_allSites_noActions__Live.getLastVisitsDetails_year.xml index cda8a61f95..4995acbf03 100644 --- a/plugins/PrivacyManager/tests/System/expected/test_allSites_noActions__Live.getLastVisitsDetails_year.xml +++ b/plugins/PrivacyManager/tests/System/expected/test_allSites_noActions__Live.getLastVisitsDetails_year.xml @@ -61,7 +61,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -953,7 +953,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -1845,7 +1845,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -10789,7 +10789,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -14365,7 +14365,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -15257,7 +15257,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -21517,7 +21517,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 17.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml index 75a5b776fe..0b4babc650 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserEngines_month.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>WebKit (Safari, Chrome)</label> + <label>WebKit (Safari)</label> <nb_visits>23</nb_visits> <nb_actions>26</nb_actions> <max_actions>3</max_actions> 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 6c5798e073..900b0135a9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -590,7 +590,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> @@ -1039,7 +1039,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> @@ -2472,7 +2472,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -3552,7 +3552,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 11.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -4185,7 +4185,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -4316,7 +4316,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -4472,7 +4472,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -4638,7 +4638,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -5147,7 +5147,7 @@ <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> @@ -5278,7 +5278,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -5409,7 +5409,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -5536,7 +5536,7 @@ <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>GNOME Web 2.30</browser> <browserName>GNOME Web</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> @@ -5663,7 +5663,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -5790,7 +5790,7 @@ <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>GNOME Web 2.30</browser> <browserName>GNOME Web</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> @@ -6044,7 +6044,7 @@ <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>GNOME Web 2.30</browser> <browserName>GNOME Web</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> @@ -6425,7 +6425,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -6552,7 +6552,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -6679,7 +6679,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.8</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -6933,7 +6933,7 @@ <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -7060,7 +7060,7 @@ <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>GNOME Web 2.30</browser> <browserName>GNOME Web</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> @@ -7441,7 +7441,7 @@ <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>GNOME Web 2.30</browser> <browserName>GNOME Web</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/EP.png</browserIcon> @@ -7568,7 +7568,7 @@ <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/AN.png</browserIcon> @@ -7695,7 +7695,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -7822,7 +7822,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> @@ -7949,7 +7949,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/RM.png</browserIcon> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 5e7e9b62f1..668b2331eb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -530,7 +530,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> @@ -949,7 +949,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> @@ -1947,7 +1947,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Chrome 11.0</browser> <browserName>Chrome</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/CH.png</browserIcon> @@ -2142,7 +2142,7 @@ <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari 5.0</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index c373141e0f..5b035591af 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -559,7 +559,7 @@ <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>QQ Browser 5.0</browser> <browserName>QQ Browser</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/QQ.png</browserIcon> 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 da9d69289f..403fc379a9 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 @@ -93,7 +93,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> 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 da9d69289f..403fc379a9 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 @@ -93,7 +93,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> 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 44460078ae..ff8cf7b66a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -93,7 +93,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml index 7114b5ff48..1903a87241 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_pageurlNotContainsSegment__Live.getLastVisitsDetails_month.xml @@ -93,7 +93,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml index 2ab5eb163c..666b90e135 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_siteSearchCategoryNotEqualsSegment__Live.getLastVisitsDetails_month.xml @@ -93,7 +93,7 @@ <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> - <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> + <browserFamilyDescription>WebKit (Safari)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> <browserIcon>plugins/Morpheus/icons/dist/browsers/SF.png</browserIcon> diff --git a/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml b/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml index ecd14db85a..eccf657358 100644 --- a/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimitingdimension_2_rankingQuery__CustomDimensions.getCustomDimension_day.xml @@ -81,6 +81,8 @@ <avg_time_on_dimension>0</avg_time_on_dimension> + + </row> <row> @@ -121,6 +123,8 @@ <avg_time_on_dimension>0</avg_time_on_dimension> + + </row> </subtable> </row> diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index 393c5bfc3d..012bc48d62 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab5fc839a540a2c023dec57419eddce1226b20ef87abfdea2ade4ed81a9e035c -size 735836 +oid sha256:02301c0f6ca92260949c1fd295f6fedc4f8f26ce5e7bcb415e8325d7af5636db +size 735179 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index 60a35720b2..063802a2c3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42843ddaac8a5330b06d849fc51ecaf2dc4771754829a4fffdd3ced6322f1183 -size 662443 +oid sha256:e79c58d93b04fd180a00df211a56343a37ab354353c96184b759bb4f52b9af18 +size 661894 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png index 6817fd2b39..8d5eb55162 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:979bd9aeb5cdefef76d9455d8342c3ea3764d052a06fe6241808991c05a94354 -size 150063 +oid sha256:da556d5286c1389f6a9ea43496e5ec987619149a62c0f9460997745ce7a2f9ea +size 149443 |
