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/UserId
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/UserId')
-rw-r--r--plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml6
-rw-r--r--plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml6
-rw-r--r--plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml6
-rw-r--r--plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml6
-rw-r--r--plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml4
-rw-r--r--plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml4
-rw-r--r--plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml2
-rw-r--r--plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml2
8 files changed, 18 insertions, 18 deletions
diff --git a/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml
index 19e7d78d39..5ef64951ca 100644
--- a/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml
+++ b/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml
@@ -10,7 +10,7 @@
<sum_visit_length>1</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <idvisitor>b3daa77b4c04a955</idvisitor>
+
</row>
<row>
<label>user2</label>
@@ -22,7 +22,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <idvisitor>a1881c06eec96db9</idvisitor>
+
</row>
<row>
<label>user3</label>
@@ -34,6 +34,6 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <idvisitor>0b7f849446d33835</idvisitor>
+
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml
index 184a718ff4..9ea8701a8b 100644
--- a/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml
@@ -10,7 +10,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>30</sum_daily_nb_users>
- <idvisitor>0b7f849446d33835</idvisitor>
+
</row>
<row>
<label>user2</label>
@@ -22,7 +22,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
- <idvisitor>a1881c06eec96db9</idvisitor>
+
</row>
<row>
<label>user1</label>
@@ -34,6 +34,6 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>10</sum_daily_nb_users>
- <idvisitor>b3daa77b4c04a955</idvisitor>
+
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml
index 9cf17c8b03..8c564d45eb 100644
--- a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml
+++ b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml
@@ -10,7 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <idvisitor>0b7f849446d33835</idvisitor>
+
</row>
<row>
<label>user2</label>
@@ -22,7 +22,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <idvisitor>a1881c06eec96db9</idvisitor>
+
</row>
<row>
<label>user1</label>
@@ -34,6 +34,6 @@
<sum_visit_length>1</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <idvisitor>b3daa77b4c04a955</idvisitor>
+
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml
index 99aa12454a..15683a3709 100644
--- a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml
@@ -10,7 +10,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>10</sum_daily_nb_users>
- <idvisitor>b3daa77b4c04a955</idvisitor>
+
</row>
<row>
<label>user2</label>
@@ -22,7 +22,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
- <idvisitor>a1881c06eec96db9</idvisitor>
+
</row>
<row>
<label>user3</label>
@@ -34,6 +34,6 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>30</sum_daily_nb_users>
- <idvisitor>0b7f849446d33835</idvisitor>
+
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml
index 52fcd98131..df266da1fa 100644
--- a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml
+++ b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml
@@ -10,7 +10,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <idvisitor>a1881c06eec96db9</idvisitor>
+
</row>
<row>
<label>user3</label>
@@ -22,6 +22,6 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <idvisitor>0b7f849446d33835</idvisitor>
+
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml
index 9545aadbb7..81fc70ff6f 100644
--- a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml
@@ -10,7 +10,7 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
- <idvisitor>a1881c06eec96db9</idvisitor>
+
</row>
<row>
<label>user1</label>
@@ -22,6 +22,6 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>10</sum_daily_nb_users>
- <idvisitor>b3daa77b4c04a955</idvisitor>
+
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml
index ac2a60152a..f0596f12ca 100644
--- a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml
+++ b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml
@@ -10,6 +10,6 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <idvisitor>a1881c06eec96db9</idvisitor>
+
</row>
</result> \ No newline at end of file
diff --git a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml
index ec3854dfb3..dff804011e 100644
--- a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml
+++ b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml
@@ -10,6 +10,6 @@
<nb_visits_converted>0</nb_visits_converted>
<sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>20</sum_daily_nb_users>
- <idvisitor>a1881c06eec96db9</idvisitor>
+
</row>
</result> \ No newline at end of file