Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2018-06-07 01:29:46 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2018-06-07 01:29:46 +0300
commit5076bd6bfdc32b969f122a5ef65c02fb1ab3c5b2 (patch)
treeb2785397e5506f8c305761025ddcd91aa2a6453c /plugins/Live/tests/System
parentd8c98711edd6eebc16f1be3b87dac798d118b78c (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/tests/System')
-rw-r--r--plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml22
-rw-r--r--plugins/Live/tests/System/expected/test_allSites__Live.getLastVisitsDetails_day.xml4
-rw-r--r--plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml42
-rw-r--r--plugins/Live/tests/System/expected/test_multiSites__Live.getLastVisitsDetails_day.xml4
4 files changed, 36 insertions, 36 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>