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-01-07 02:41:29 +0300
committerGitHub <noreply@github.com>2018-01-07 02:41:29 +0300
commit390edc755a4ae1f5e88542189a8e19d5c5155dfd (patch)
tree9c36de1402bcb89207c5fbcacc9972deb4fce78b /tests/PHPUnit
parent48864a124789b665a649e6e5bd75692048fcba76 (diff)
Adds segment for device model (#12298)
* Adds segment for device model and segmented visitor log link to device model report * update tests * submodule update
Diffstat (limited to 'tests/PHPUnit')
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml7
-rw-r--r--tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml12
-rw-r--r--tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml1
-rw-r--r--tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml1
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml7
6 files changed, 32 insertions, 0 deletions
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml
new file mode 100644
index 0000000000..75cef6bae6
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <row>GALAXY Note 3</row>
+ <row>Nexus 4</row>
+ <row>Desire</row>
+ <row>Xperia Tablet S</row>
+</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml
new file mode 100644
index 0000000000..0e04d3f6d9
--- /dev/null
+++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_deviceModel__VisitsSummary.get_range.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+ <nb_visits>2</nb_visits>
+ <nb_actions>6</nb_actions>
+ <nb_visits_converted>2</nb_visits_converted>
+ <bounce_count>1</bounce_count>
+ <sum_visit_length>1621</sum_visit_length>
+ <max_actions>5</max_actions>
+ <bounce_rate>50%</bounce_rate>
+ <nb_actions_per_visit>3</nb_actions_per_visit>
+ <avg_time_on_site>811</avg_time_on_site>
+</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
index 085d51d878..6dd1e6a37c 100644
--- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
+++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml
@@ -19,6 +19,7 @@
<sum_daily_nb_uniq_visitors>38</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>2</sum_daily_nb_users>
<nb_visits_converted>0</nb_visits_converted>
+ <segment>deviceBrand==Unknown;deviceModel==</segment>
</row>
<row>
<label>HTC - Vision</label>
@@ -38,6 +39,7 @@
<revenue>10</revenue>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>deviceBrand==HTC;deviceModel==Vision</segment>
</row>
<row>
<label>Apple - iPhone</label>
@@ -57,6 +59,7 @@
<revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>0</sum_daily_nb_users>
+ <segment>deviceBrand==Apple;deviceModel==iPhone</segment>
</row>
<row>
<label>Samsung - GALAXY S5</label>
@@ -76,5 +79,6 @@
<revenue>5</revenue>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
<sum_daily_nb_users>1</sum_daily_nb_users>
+ <segment>deviceBrand==Samsung;deviceModel==GALAXY+S5</segment>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml
index faf5f2c061..3cb56dd1d6 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getModel_day.xml
@@ -22,5 +22,6 @@
</goals>
<nb_conversions>2</nb_conversions>
<revenue>43</revenue>
+ <segment>deviceBrand==Unknown;deviceModel==</segment>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml
index da61c550e1..e8d76d31f4 100644
--- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml
+++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getModel_day.xml
@@ -23,5 +23,6 @@
</goals>
<nb_conversions>2</nb_conversions>
<revenue>43</revenue>
+ <segment>deviceBrand==Unknown;deviceModel==</segment>
</row>
</result> \ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
index 240f8fa562..0f31a40f7b 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
@@ -104,6 +104,13 @@
<row>
<type>dimension</type>
<category>Visitors</category>
+ <name>Device model</name>
+ <segment>deviceModel</segment>
+ <acceptedValues>iPad, Nexus 5, Galaxy S5, Fire TV, etc.</acceptedValues>
+ </row>
+ <row>
+ <type>dimension</type>
+ <category>Visitors</category>
<name>Device type</name>
<segment>deviceType</segment>
<acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display, camera, portable media player, phablet</acceptedValues>