Skip to content

Commit

Permalink
Chrome isn't using WebKit anymore (#18252)
Browse files Browse the repository at this point in the history 
* Chrome isn't using WebKit anymore

* updates expected test files

* updates expected ui tests

Co-authored-by: sgiehl <stefan@matomo.org>
  • Loading branch information
@Findus23 @sgiehl
Findus23 and sgiehl authored Nov 24, 2021
1 parent c73fc4b commit ad9095d
Show file tree
Hide file tree
Showing 28 changed files with 104 additions and 100 deletions.
10 changes: 5 additions & 5 deletions ...ns/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions ...ted/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_day.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions ...ed/test_ArchiveCronTest_preArchivedSegment0_noOptions__Live.getLastVisitsDetails_year.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions ...ted/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_day.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions ...ed/test_ArchiveCronTest_preArchivedSegment1_noOptions__Live.getLastVisitsDetails_year.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion plugins/DevicesDetection/functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
);

Expand Down
6 changes: 3 additions & 3 deletions plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_allSitesAllDates.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_anonymizeUserId.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictDate.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions plugins/PrivacyManager/tests/System/expected/anonymizeVisitInformation_restrictSites.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
14 changes: 7 additions & 7 deletions plugins/PrivacyManager/tests/System/expected/exportDataSubject_allVisits.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion plugins/PrivacyManager/tests/System/expected/exportDataSubject_oneVisitGiven.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Loading

0 comments on commit ad9095d

Please sign in to comment.