diff options
author | Stefan Giehl <stefan@piwik.org> | 2018-06-07 01:29:46 +0300 |
---|---|---|
committer | diosmosis <diosmosis@users.noreply.github.com> | 2018-06-07 01:29:46 +0300 |
commit | 5076bd6bfdc32b969f122a5ef65c02fb1ab3c5b2 (patch) | |
tree | b2785397e5506f8c305761025ddcd91aa2a6453c /plugins/Live | |
parent | d8c98711edd6eebc16f1be3b87dac798d118b78c (diff) |
Use generic device model names if device type is known (#13015)
* Use generic device model names
* updates tests
* Update screenshots
Diffstat (limited to 'plugins/Live')
8 files changed, 44 insertions, 44 deletions
diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml index 18da814167..66e6fdb408 100644 --- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml @@ -82,7 +82,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -198,7 +198,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -314,7 +314,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -430,7 +430,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -546,7 +546,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -662,7 +662,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -778,7 +778,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -894,7 +894,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1010,7 +1010,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1126,7 +1126,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1237,7 +1237,7 @@ <icon>plugins/Morpheus/icons/dist/devices/desktop.png</icon> <devices> <row> - <name>Unknown</name> + <name>Generic Desktop</name> <count>1</count> </row> </devices> diff --git a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml index 5be7c380ab..44d231a035 100644 --- a/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml @@ -63,7 +63,7 @@ <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Generic Desktop</deviceModel> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> @@ -179,7 +179,7 @@ <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Generic Desktop</deviceModel> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml index e692dcad74..308bf08952 100644 --- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml @@ -82,7 +82,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -198,7 +198,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -314,7 +314,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -430,7 +430,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -546,7 +546,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -662,7 +662,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -778,7 +778,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -894,7 +894,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1010,7 +1010,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1126,7 +1126,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1242,7 +1242,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1358,7 +1358,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1474,7 +1474,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1590,7 +1590,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1706,7 +1706,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1822,7 +1822,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -1938,7 +1938,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -2054,7 +2054,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -2170,7 +2170,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -2286,7 +2286,7 @@ <deviceType>Unknown</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Unknown</deviceModel> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/UNK.png</operatingSystemIcon> @@ -2397,7 +2397,7 @@ <icon>plugins/Morpheus/icons/dist/devices/desktop.png</icon> <devices> <row> - <name>Unknown</name> + <name>Generic Desktop</name> <count>1</count> </row> </devices> diff --git a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml index 5be7c380ab..44d231a035 100644 --- a/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml +++ b/plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml @@ -63,7 +63,7 @@ <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Generic Desktop</deviceModel> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> @@ -179,7 +179,7 @@ <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> - <deviceModel /> + <deviceModel>Generic Desktop</deviceModel> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> <operatingSystemIcon>plugins/Morpheus/icons/dist/os/WIN.png</operatingSystemIcon> diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png index b49d8d8c32..0a8e653e4d 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:030ac555a08cc92f21a0e307d4fc948eb15be328a5a189b711813e84b088ad78 -size 435506 +oid sha256:4b950eae2824619181f0ea012bb7fc79d62afbc51424c33cafa8145c7ae79705 +size 439639 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png index 94f7b5ae73..68a89ccb88 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_action_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ade5353cb8b3cee8a84537529db366ec89fecf7aa08f61eac4a4cd7e30db584b -size 296275 +oid sha256:ee44dfe5bac31e2f34d9e506d479acde4b863fa712431282b06fed5dffb9b326 +size 301298 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png index 41dcd147da..1b0149ff04 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_actions_hidden.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c1c905fcbf5015a07008841e5cd6d7ea2ff3c002f37a6d0f9fedced980fa5952 -size 261207 +oid sha256:91c0b6e66c8a2ebe9ac10374676982b8606c7ee99896e974e61475b62760ec8a +size 266536 diff --git a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png index 546d1d52ca..e450119e87 100644 --- a/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png +++ b/plugins/Live/tests/UI/expected-screenshots/Live_visitor_profile_visit_details.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf5c6c09e705b09e83717ed6855aabf3e327e6a95a49c8401e6c2994078cc04d -size 271465 +oid sha256:dc4f80496ee1bc171b8cfbaff89c297e9b6853e30727b5fd6b4a9fbb45b7e326 +size 277026 |