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/Contents
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/Contents')
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml4
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml4
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml4
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml4
-rw-r--r--plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml4
5 files changed, 10 insertions, 10 deletions
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
index 07cbedf316..a395ac839b 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
@@ -265,7 +265,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>
@@ -583,7 +583,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/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
index 07cbedf316..a395ac839b 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
@@ -265,7 +265,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>
@@ -583,7 +583,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/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
index 07cbedf316..a395ac839b 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
@@ -265,7 +265,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>
@@ -583,7 +583,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/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
index 07cbedf316..a395ac839b 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
@@ -265,7 +265,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>
@@ -583,7 +583,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/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
index 07cbedf316..a395ac839b 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
@@ -265,7 +265,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>
@@ -583,7 +583,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>